Commits · 67aa439d5546856a55f4646718f476614c7827b3 · abook_android / abook_check · GitLab

18 May, 2021 1 commit
- 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
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 4 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
- ルームタイプによって協業中にユーザー招待ボタンを非表示にするように修正 · 4d107e23
  Kang Donghun committed May 10, 2021
  
  4d107e23 Browse Files
07 May, 2021 9 commits
- コメント追加 · 7df31a73
  Kang Donghun committed May 07, 2021
  
  7df31a73 Browse Files
- 協業中ユーザー招待機能追加実装 · 12f71e36
  Kang Donghun committed May 07, 2021
  
  12f71e36 Browse Files
- Bug #41596 OZの報告入力フォームで☓をタップした際の動作がおかしい · dec6e8ce
  Kim Jinsung committed May 07, 2021
  
  dec6e8ce Browse Files
- Merge branch 'features/abcomm_sp6' of… · 1daa74dc
```
Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/abcomm_sp6_document_collaboration
```
  Lee Munkyeong committed May 07, 2021
  1daa74dc Browse Files
- Merge branch 'features/abcomm_sp6_start_voice_from_name_card' into 'features/abcomm_sp6' · bc84c3d7
```
[ネームカード]の[音声通話]を押下すると、該当ユーザと[音声通話]を開始する

See merge request !140
```
  Kang Donghun committed May 07, 2021
  bc84c3d7 Browse Files
- インデント修正 · ff881d25
  Kang Donghun committed May 07, 2021
  
  ff881d25 Browse Files
- Merge branch 'features/abcomm_sp6_invite_user_in_collaboration' into 'features/abcomm_sp6' · 18b8c3c0
```
協業中ユーザー招待機能実装

See merge request !139
```
  Kang Donghun committed May 07, 2021
  18b8c3c0 Browse Files
- レビューされた部分のコード修正 · 367b0ea6
  Kang Donghun committed May 07, 2021
  
  367b0ea6 Browse Files
- [ネームカード]の[音声通話]を押下すると、該当ユーザと[音声通話]を開始する · 5d018bb5
  Kang Donghun committed May 07, 2021
  
  5d018bb5 Browse Files
06 May, 2021 9 commits
- Merge branch 'features/1.2.363' into features/1.3.200 · 253cd496
```
# 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/cl/util/BitmapUtil.java
```
  Kim Jinsung committed May 06, 2021
  253cd496 Browse Files
- アプリバージョン情報変更 1.3.000 to 1.3.0 · c3e9f15b
  Kim Peace committed May 06, 2021
  
  c3e9f15b Browse Files
- 協業中ユーザー招待機能実装 · 381ee4e7
  Kang Donghun committed May 06, 2021
  
  381ee4e7 Browse Files
- updated release date to 2021/05/06 · 3e35608d
  Kim Peace committed May 06, 2021
  
  3e35608d Browse Files
- Merge branch 'features/abcomm_sp6' into 'features/1.3.000' · 2b22734c
```
Features/abcomm sp6

See merge request !137
```
  Kim Peace committed May 06, 2021
  2b22734c Browse Files
- update submodule version · ed965e8c
  Lee Munkyeong committed May 06, 2021
  
  ed965e8c Browse Files
- Merge branch 'features/abcomm_sp6_bug_fix_for_user_invite' into 'features/abcomm_sp6' · 5daba5bf
```
バグ修正

See merge request !136
```
  Lee Munkyeong committed May 06, 2021
  5daba5bf Browse Files
- バグ修正 · 37f0e6c9
  Lee Munkyeong committed May 06, 2021
  
  37f0e6c9 Browse Files
- 文書協業実装 · 08b20c80
  Lee Munkyeong committed May 06, 2021
  
  08b20c80 Browse Files