Commits · 9a2f31256377b07d1d4435fc6ec50960a8d1dfd6 · abook_android / abook_check · GitLab

21 May, 2021 9 commits
- Merge commit 'ca47105f ' into communication/develop · 9a2f3125
  Kim Peace committed May 21, 2021
  
  9a2f3125 Browse Files
- 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
- Updated submodule commit · 8d75575a
  Kim Peace committed May 21, 2021
  
  8d75575a Browse Files
- Task #42647 OS10 で THETAが認識されない。 · 4a4dfd74
  onuma committed May 21, 2021
  
  4a4dfd74 Browse Files
- Merge branch 'communication/feature/android6以下の対応' into 'communication/develop' · c19797ce
```
アンドロイド８以下バージョンでの処理追加。

See merge request !154
```
  Lee Munkyeong committed May 21, 2021
  c19797ce Browse Files
20 May, 2021 7 commits
- いらないコード削除。 · a8ab2a8b
  Lee Munkyeong committed May 20, 2021
  
  a8ab2a8b Browse Files
- 文書協業不具合対応 · a8a16c26
  Lee Munkyeong committed May 20, 2021
  
  a8a16c26 Browse Files
- アンドロイド８以下バージョンでの処理追加。 · 991b4885
  Lee Munkyeong committed May 20, 2021
  
  991b4885 Browse Files
- 設定画面の文字サイス調整 · 19ae8790
  Kim Jinsung committed May 20, 2021
  
  19ae8790 Browse Files
- Merge branch 'communication/feature/screen_capture_request' into 'communication/develop' · 7daa79f1
```
キャプチャー機能実装

See merge request !153
```
  Kim Peace committed May 20, 2021
  7daa79f1 Browse Files
- キャプチャー機能実装 · ed8465d2
  Lee Munkyeong committed May 20, 2021
  
  ed8465d2 Browse Files
- Merge branch 'communication/feature/change_collaboration' into 'communication/develop' · ce85c8bf
```
Communication/feature/change collaboration

See merge request !152
```
  Lee Munkyeong committed May 20, 2021
  ce85c8bf Browse Files
19 May, 2021 6 commits
- Task #42647 OS10 で THETAが認識されない。 · f7f0d433
  onuma committed May 19, 2021
  
  f7f0d433 Browse Files
- 協業切替API連動及び#42838対応。 · c53f122e
  Lee Munkyeong committed May 19, 2021
  
  c53f122e 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
- 文書協業への変換実装中 · e75deb32
  Lee Munkyeong committed May 19, 2021
  
  e75deb32 Browse Files
18 May, 2021 7 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
- ABCOMM-93-協業転換実装中 · 83b77e90
  Lee Munkyeong committed May 18, 2021
  
  83b77e90 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 2 commits
- Bug #42761【android10不具合対応 Check】作業一覧で、横から縦に画面を動かすと黒い帯がでることがある · 8783a220
  Kim Jinsung committed May 17, 2021
  
  8783a220 Browse Files
- Merge branch 'communication/abcomm_sp6_finish_collaboration' into 'communication/develop' · 263341ce
```
[チャットルーム]のチャット履歴から現在協業が進行中なのか終了されたのか確認できる

See merge request !147
```
  Kang Donghun committed May 17, 2021
  263341ce Browse Files
16 May, 2021 4 commits
- バグ修正 · cb06820c
  Lee Munkyeong committed May 16, 2021
  
  cb06820c Browse Files
- Merge branch 'communication/#414_board_collaboration' into 'communication/develop' · c36e0fe5
```
ボード協業実装

See merge request !148
```
  Lee Munkyeong committed May 16, 2021
  c36e0fe5 Browse Files
- Merge branch 'features/abcomm_sp6_document_collaboration' into 'communication/develop' · 17680174
```
Features/abcomm sp6 document collaboration

See merge request !146
```
  Lee Munkyeong committed May 16, 2021
  17680174 Browse Files
- コードレビュー対応。 · 2fc75b31
  Lee Munkyeong committed May 16, 2021
  
  2fc75b31 Browse Files
14 May, 2021 3 commits
- ボード協業実装 · 076e8c17
  Lee Munkyeong committed May 14, 2021
  
  076e8c17 Browse Files
- Merge branch 'communication/develop' of… · 65e462e8
```
Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into features/abcomm_sp6_document_collaboration

# Conflicts:
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
```
  Lee Munkyeong committed May 14, 2021
  65e462e8 Browse Files
- 文書協業実装 · fc73015e
  Lee Munkyeong committed May 14, 2021
  
  fc73015e Browse Files
13 May, 2021 2 commits
- 文書協業実装 · 799dc91c
  Lee Munkyeong committed May 13, 2021
  
  799dc91c Browse Files
- 文書協業実装 · f1b9f46c
  Lee Munkyeong committed May 13, 2021
  
  f1b9f46c Browse Files