Commits · 335a2865ff3dd5bf33726e659a6b2f4e9028972c · abook_android / abook_check · GitLab

11 Jun, 2021 1 commit
- 43113追加対応。 · 335a2865
  Lee Munkyeong committed Jun 11, 2021
  
  335a2865 Browse Files
10 Jun, 2021 3 commits
- update Submodule · 78094bb1
  Lee Munkyeong committed Jun 10, 2021
  
  78094bb1 Browse Files
- Confirmメッセージ修正。 · 6d81f4e4
  Lee Munkyeong committed Jun 10, 2021
  
  6d81f4e4 Browse Files
- メッセージ追加。 · bcafd6fc
  Lee Munkyeong committed Jun 10, 2021
  
  bcafd6fc Browse Files
09 Jun, 2021 4 commits
- 43109対応。 · 71236118
  Lee Munkyeong committed Jun 09, 2021
  
  71236118 Browse Files
- 協業中のフラグ修正。 · b4611929
  Lee Munkyeong committed Jun 09, 2021
  
  b4611929 Browse Files
- Merge branch 'communication/feature/finish_all_collaboration' into 'communication/develop' · 763dba65
```
Communication/feature/finish all collaboration

See merge request !177
```
  Lee Munkyeong committed Jun 09, 2021
  763dba65 Browse Files
- コードレビュー対応 · a94c82e5
  Lee Munkyeong committed Jun 09, 2021
  
  a94c82e5 Browse Files
08 Jun, 2021 5 commits
- フールスクリーンフラグ修正。 · c73030ca
  Lee Munkyeong committed Jun 08, 2021
  
  c73030ca Browse Files
- 全協業終了対応 · ef33e662
  Lee Munkyeong committed Jun 08, 2021
  
  ef33e662 Browse Files
- 43113対応 · c91a3843
  Lee Munkyeong committed Jun 08, 2021
  
  c91a3843 Browse Files
- Merge branch 'communication/develop' of… · 7362826b
```
Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into communication/feature/finish_all_collaboration
```
  Lee Munkyeong committed Jun 08, 2021
  7362826b Browse Files
- Merge branch 'communication/feature/42996' into 'communication/develop' · 6ae3e3c6
```
43094対応

See merge request !176
```
  Lee Munkyeong committed Jun 08, 2021
  6ae3e3c6 Browse Files
07 Jun, 2021 2 commits
- 43094対応 · ee0e39b9
  Lee Munkyeong committed Jun 07, 2021
  
  ee0e39b9 Browse Files
- Updated submodule - 43084追加対応 · a168da56
  Kim Peace committed Jun 07, 2021
  
  a168da56 Browse Files
06 Jun, 2021 2 commits
- Updated submodule commit · 0c34bfb2
  Kim Peace committed Jun 06, 2021
  
  0c34bfb2 Browse Files
- Merge branch 'communication/feature/42996' into 'communication/develop' · d5e0054e
```
文書協業不具合対応。

See merge request !175
```
  Kim Peace committed Jun 06, 2021
  d5e0054e Browse Files
04 Jun, 2021 4 commits
- ソケットが切れた場合画面リロード · 966eb8ed
  Lee Munkyeong committed Jun 04, 2021
  
  966eb8ed Browse Files
- 文書協業不具合対応。 · 5b83fc48
  Lee Munkyeong committed Jun 04, 2021
  
  5b83fc48 Browse Files
- Merge branch 'communication/develop' of… · 5d94c6f5
```
Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into communication/develop
```
  Lee Munkyeong committed Jun 04, 2021
  5d94c6f5 Browse Files
- アラート対応追加。 · 0b73c58f
  Lee Munkyeong committed Jun 04, 2021
  
  0b73c58f Browse Files
03 Jun, 2021 10 commits
- Updated submodule commit · 9975ab07
  Kim Peace committed Jun 03, 2021
  
  9975ab07 Browse Files
- Merge branch 'communication/feature/43036_reload_on_awake_from_sleep_mode' into… · 6dd4bdce
```
Merge branch 'communication/feature/43036_reload_on_awake_from_sleep_mode' into 'communication/develop'

スリープから起きた時画面リロード

See merge request !174
```
  Lee Munkyeong committed Jun 03, 2021
  6dd4bdce Browse Files
- スリープから起きた時画面リロード · 2221b220
  Lee Munkyeong committed Jun 03, 2021
  
  2221b220 Browse Files
- Merge branch 'communication/feature/43045' into 'communication/develop' · 37617ade
```
文書協業「Loading」表示からメッセージに修正。

See merge request !173
```
  Lee Munkyeong committed Jun 03, 2021
  37617ade Browse Files
- コードレビュー対応 · b445f65f
  Lee Munkyeong committed Jun 03, 2021
  
  b445f65f Browse Files
- Merge branch 'communication/develop' of… · 4d0f3efb
```
Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into communication/feature/43045

# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ja/strings.xml
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
#	ABVJE_Res_Default_Android/res/values/strings.xml
```
  Lee Munkyeong committed Jun 03, 2021
  4d0f3efb Browse Files
- ホスト変更文言反映。 · ff5f9273
  Lee Munkyeong committed Jun 03, 2021
  
  ff5f9273 Browse Files
- 文書協業「Loading」表示からメッセージに修正。 · 9bda7c2b
  Lee Munkyeong committed Jun 03, 2021
  
  9bda7c2b Browse Files
- Updated submodule commit · 665448d7
  Kim Peace committed Jun 03, 2021
  
  665448d7 Browse Files
- Merge branch 'communication/develop' of… · b2e86c83
```
Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into communication/feature/finish_all_collaboration
```
  Lee Munkyeong committed Jun 03, 2021
  b2e86c83 Browse Files
02 Jun, 2021 3 commits
- Update submodule · a50b86be
  Lee Munkyeong committed Jun 02, 2021
  
  a50b86be Browse Files
- #43045対応（文書協業で、他の協業に変更し、再度文書協業に切り替えると、「Loading」表示のままとなる） · 9c262c5d
  Lee Munkyeong committed Jun 02, 2021
  
  9c262c5d Browse Files
- Merge commit '9fab7701 ' into communication/develop · d72dc680
  Kim Peace committed Jun 02, 2021
  
  d72dc680 Browse Files
01 Jun, 2021 6 commits
- Updated submodule commit · 402c7523
  Kim Peace committed Jun 01, 2021
  
  402c7523 Browse Files
- Merge branch 'communication/feature/43000_ルーム開設時に、同じユーザの部屋が存在する場合のメッセージについて'… · 3210515f
```
Merge branch 'communication/feature/43000_ルーム開設時に、同じユーザの部屋が存在する場合のメッセージについて' into 'communication/develop'

同じルーム存在のメッセージ変更。

See merge request !172
```
  Lee Munkyeong committed Jun 01, 2021
  3210515f Browse Files
- コードレビュー対応 · 821f257b
  Lee Munkyeong committed Jun 01, 2021
  
  821f257b Browse Files
- 同じルーム存在のメッセージ変更。 · 44e86046
  Lee Munkyeong committed Jun 01, 2021
  
  44e86046 Browse Files
- Merge branch 'features/1.3.200_43014' into 'features/1.3.200' · 9fab7701
```
Bug #43014【android10不具合対応 Check】ビューア画面上部のアイコンが引き延ばされている

See merge request !171
```
  Kim Jinsung committed Jun 01, 2021
  9fab7701 Browse Files
- Merge branch 'features/1.3.200_43013' into 'features/1.3.200' · 6d976ba7
```
Bug #43013【android10不具合対応 Check】資料一覧でボタンが判別しづらい

See merge request !170
```
  Kim Jinsung committed Jun 01, 2021
  6d976ba7 Browse Files