Commits · b2a6d5ebe439aad29b6c20aed587bc2701365391 · abook_android / abook_check · GitLab

24 May, 2021 2 commits
- Merge branch 'features/1.3.200_42869' into 'features/1.3.200' · b2a6d5eb
```
Bug #42869 pdfプレビュー画面で画面を回転させると、スライドが行われているように見える

See merge request !159
```
  onuma committed May 24, 2021
  b2a6d5eb Browse Files
- Bug #42869 pdfプレビュー画面で画面を回転させると、スライドが行われているように見える · 2601d792
  onuma committed May 24, 2021
  
  2601d792 Browse Files
21 May, 2021 6 commits
- Merge branch 'features/1.3.200_42855' into 'features/1.3.200' · ca47105f
```
Bug #42855【android10不具合対応 Check】フォームの「日付」・「時刻」入力画面で、ボタンがあることがわからない

See merge request !157
```
  Kim Jinsung committed May 21, 2021
  ca47105f Browse Files
- Bug #42855【android10不具合対応 Check】フォームの「日付」・「時刻」入力画面で、ボタンがあることがわからない · 798ab365
  Kim Jinsung committed May 21, 2021
  
  798ab365 Browse Files
- Merge branch 'features/1.3.200' of gitlab.agentec.jp:abook_android/abook_check… · 90398862
```
Merge branch 'features/1.3.200' of gitlab.agentec.jp:abook_android/abook_check into features/1.3.200
```
  Kim Jinsung committed May 21, 2021
  90398862 Browse Files
- 閉じるボタンと戻るボタン表示問題対応 · ea86dd32
  Kim Jinsung committed May 21, 2021
  
  ea86dd32 Browse Files
- Merge branch 'features/1.2.363_42647' into features/1.3.200 · f077265b
```
# Conflicts:
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
#	gradle.properties
```
  onuma committed May 21, 2021
  f077265b Browse Files
- Task #42647 OS10 で THETAが認識されない。 · 4a4dfd74
  onuma committed May 21, 2021
  
  4a4dfd74 Browse Files
20 May, 2021 1 commit
- 設定画面の文字サイス調整 · 19ae8790
  Kim Jinsung committed May 20, 2021
  
  19ae8790 Browse Files
19 May, 2021 4 commits
- Task #42647 OS10 で THETAが認識されない。 · f7f0d433
  onuma committed May 19, 2021
  
  f7f0d433 Browse Files
- Merge branch 'features/1.3.200_41596' into features/1.3.200 · b5b73a59
  Kim Jinsung committed May 19, 2021
  
  b5b73a59 Browse Files
- Merge branch 'features/1.3.101' into 'features/1.3.200' · df73f243
```
Features/1.3.101

See merge request !151
```
  Kim Peace committed May 19, 2021
  df73f243 Browse Files
- Merge commit '96f79ab9' into features/1.3.101 · 0b0dd23a
```
# Conflicts:
#	ABVJE_Launcher_Android/assets/chat
```
  Kim Peace committed May 19, 2021
  0b0dd23a Browse Files
18 May, 2021 6 commits
- Merge branch 'features/1.3.200_42761' into 'features/1.3.200' · 96f79ab9
```
Bug #42761【android10不具合対応 Check】作業一覧で、横から縦に画面を動かすと黒い帯がでることがある

See merge request !149
```
  Kim Jinsung committed May 18, 2021
  96f79ab9 Browse Files
- アプリバージョン情報変更 1.3.100 to 1.3.101 · 3fd5430d
  Kim Peace committed May 18, 2021
  
  3fd5430d Browse Files
- Merge branch 'communication/1.3.100_update_submodule' into 'features/1.3.101' · dad102fd
```
submodule更新(サーバURL変更)

See merge request !150
```
  Kim Peace committed May 18, 2021
  dad102fd Browse Files
- Bug #41596 OZの報告入力フォームで☓をタップした際の動作がおかしい · 4b9e522f
  Kim Jinsung committed May 18, 2021
  
  4b9e522f Browse Files
- submodule更新(サーバURL変更) · 7217e848
  Lee Munkyeong committed May 18, 2021
  
  7217e848 Browse Files
- Merge branch 'features/1.3.200_42760' into 'features/1.3.200' · 67aa439d
```
Bug #42760 本文検索で改行できる

See merge request !145
```
  onuma committed May 18, 2021
  67aa439d Browse Files
17 May, 2021 1 commit
- Bug #42761【android10不具合対応 Check】作業一覧で、横から縦に画面を動かすと黒い帯がでることがある · 8783a220
  Kim Jinsung committed May 17, 2021
  
  8783a220 Browse Files
12 May, 2021 3 commits
- Bug #42760 本文検索で改行できる · 816a43b6
  onuma committed May 12, 2021
  
  816a43b6 Browse Files
- build.gradle から x86を削除 · b00e5195
  onuma committed May 12, 2021
  
  b00e5195 Browse Files
- Merge branch 'features/1.3.100' into features/1.3.200 · 534539cd
```
# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
#	ABVJE_Res_Default_Android/res/values/strings.xml
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
```
  Kim Jinsung committed May 12, 2021
  534539cd Browse Files
11 May, 2021 14 commits
- Updated submodule commit · 5436e74b
  Kim Peace committed May 11, 2021
  
  5436e74b Browse Files
- アプリバージョン情報変更 1.3.0 to 1.3.100 · 7adf20b1
  Kim Peace committed May 11, 2021
  
  7adf20b1 Browse Files
- Merge branch 'features/abcomm_sp6' into 'features/1.3.100' · 3f6889a0
```
Features/abcomm sp6

See merge request !144
```
  Kim Peace committed May 11, 2021
  3f6889a0 Browse Files
- Updated submodule commit · e9ad4810
  Kim Peace committed May 11, 2021
  
  e9ad4810 Browse Files
- Revert load ez library comment out · 3f9124be
  Kim Peace committed May 11, 2021
  
  3f9124be Browse Files
- Updated submodule commit · 69c5db7e
  Kim Peace committed May 11, 2021
  
  69c5db7e Browse Files
- Merge branch 'features/abcomm_sp6_document_collaboration' into 'features/abcomm_sp6' · f88c2e59
```
Features/abcomm sp6 document collaboration

See merge request !143
```
  Lee Munkyeong committed May 11, 2021
  f88c2e59 Browse Files
- コードレビュー対応。 · 2b11ca45
  Lee Munkyeong committed May 11, 2021
  
  2b11ca45 Browse Files
- コードミス修正。 · 4acde339
  Lee Munkyeong committed May 11, 2021
  
  4acde339 Browse Files
- コードミス修正。 · 314aa98d
  Lee Munkyeong committed May 11, 2021
  
  314aa98d Browse Files
- 文書協業実装 · 893d16ef
  Lee Munkyeong committed May 11, 2021
  
  893d16ef Browse Files
- Merge branch 'features/abcomm_sp6_invite_user_in_collaboration' into 'features/abcomm_sp6' · 5c18e2a3
```
協業中ユーザー招待機能追加実装

See merge request !141
```
  Kang Donghun committed May 11, 2021
  5c18e2a3 Browse Files
- レビューされた部分のコード修正 · 5f764931
  Kang Donghun committed May 11, 2021
  
  5f764931 Browse Files
- Merge branch 'features/abcomm_sp6_42722_android6対応' into 'features/abcomm_sp6' · 4a1fc69e
```
Android6以下バージョンでのLocale取得対応

See merge request !142
```
  Lee Munkyeong committed May 11, 2021
  4a1fc69e Browse Files
10 May, 2021 3 commits
- 文書協業実装 · 86abd366
  Lee Munkyeong committed May 10, 2021
  
  86abd366 Browse Files
- コードミス修正。 · 2a462020
  Lee Munkyeong committed May 10, 2021
  
  2a462020 Browse Files
- Android6以下バージョンでのLocale取得対応 · 37e0eb1e
  Lee Munkyeong committed May 10, 2021
  
  37e0eb1e Browse Files