Commits · be5a05b801d5337c169e5c632ad56476708eae49 · abookCommunication / chat_webview · GitLab

04 Aug, 2021 7 commits
- Added websocket parameter · be5a05b8
  Kim Peace committed Aug 05, 2021
  
  be5a05b8 Browse Files
- Merge branch 'develop' into debug/console_logs · 3a5f90cd
  Kim Peace committed Aug 05, 2021
  
  3a5f90cd Browse Files
- Merge branch 'develop_onuma' into 'develop' · 3ee7e398
```
startPipMode => startPIPMode スペルミス修正

See merge request !221
```
  Kim Peace committed Aug 04, 2021
  3ee7e398 Browse Files
- startPipMode => startPIPMode · 17374a4a
  onuma committed Aug 04, 2021
  
  17374a4a Browse Files
- Merge branch 'develop_onuma' into 'develop' · f8e8f67b
```
OS7 で文書協業を始めた時に、Indicatorが消えなくなる不具合を修正した。

See merge request !220
```
  Kim Peace committed Aug 04, 2021
  f8e8f67b Browse Files
- OS7 で文書協業を始めた時に、Indicatorが消えなくなる不具合を修正した。 · bdc58b69
  onuma committed Aug 04, 2021
  
  bdc58b69 Browse Files
- HotFix for not finding webkit when show loading indicator · 2a389124
  Kim Peace committed Aug 04, 2021
  
  2a389124 Browse Files
03 Aug, 2021 14 commits
- Merge branch 'develop' into debug/console_logs · df529496
  Kim Peace committed Aug 03, 2021
  
  df529496 Browse Files
- Removed temparary method · ab3b1e68
  Kim Peace committed Aug 03, 2021
  
  ab3b1e68 Browse Files
- Merge branch 'develop' into debug/console_logs · 6aee8d27
```
# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/collaboration.js
```
  Kim Peace committed Aug 03, 2021
  6aee8d27 Browse Files
- Merge branch 'feature/#43416_scroll_in_collaboration' into 'develop' · f84b5ae6
```
Fixed disable the scroll

See merge request !219
```
  Kim Peace committed Aug 03, 2021
  f84b5ae6 Browse Files
- Fixed disable the scroll · 8d4e6970
  Kim Peace committed Aug 03, 2021
  
  8d4e6970 Browse Files
- Merge branch 'feature/add_user_in_collaboration' into 'develop' · ec77a4ea
```
Feature/add user in collaboration

See merge request !218
```
  Kim Peace committed Aug 03, 2021
  ec77a4ea Browse Files
- Merge commit '454a6f9f ' into debug/console_logs · 2d2a9af5
  Kim Peace committed Aug 03, 2021
  
  2d2a9af5 Browse Files
- Fixed user confirm modal display 100 percent of height · 454a6f9f
  Kim Peace committed Aug 03, 2021
  
  454a6f9f Browse Files
- Merge branch 'feature/add_user_in_collaboration' into debug/console_logs · fa132815
```
# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js
```
  Kim Peace committed Aug 03, 2021
  fa132815 Browse Files
- Merge branch 'develop' into feature/add_user_in_collaboration · 437cb845
  Kim Peace committed Aug 03, 2021
  
  437cb845 Browse Files
- Merge branch 'feature/archive_list_order' into 'develop' · 184b35c2
```
Feature/archive list order

See merge request !216
```
  Kim Peace committed Aug 03, 2021
  184b35c2 Browse Files
- Merge branch 'fix/load_100_more_messages' into 'develop' · 4e33aa3f
```
Fix/load 100 more messages

See merge request !215
```
  Kim Peace committed Aug 03, 2021
  4e33aa3f Browse Files
- Fixed add users in collaboration ui · 214b36dc
  Kim Peace committed Aug 03, 2021
  
  214b36dc Browse Files
- Add console log for collaboration · eaec6be8
  Kim Peace committed Aug 03, 2021
  
  eaec6be8 Browse Files
02 Aug, 2021 19 commits
- Merge branch 'feature/add_user_in_collaboration' into debug/console_logs · 859ef75a
```
# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
```
  Kim Peace committed Aug 03, 2021
  859ef75a Browse Files
- Merge branch 'develop' into feature/add_user_in_collaboration · af6ab7c4
  Kim Peace committed Aug 03, 2021
  
  af6ab7c4 Browse Files
- Fixed formats · c2726ba9
  Kim Peace committed Aug 03, 2021
  
  c2726ba9 Browse Files
- Merge branch 'feature/add_user_in_collaboration' into debug/console_logs · c9e99c56
```
# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/share-event-listener.js
```
  Kim Peace committed Aug 03, 2021
  c9e99c56 Browse Files
- Merge branch 'develop' into feature/add_user_in_collaboration · 3e3da3c4
  Kim Peace committed Aug 03, 2021
  
  3e3da3c4 Browse Files
- Added user add overlay hide binding · 3dd3f9c7
  Kim Peace committed Aug 03, 2021
  
  3dd3f9c7 Browse Files
- Removed unused css and add list display and hide · d6531246
  Kim Peace committed Aug 03, 2021
  
  d6531246 Browse Files
- Fixed add user in collaobration ui · fb228a67
  Kim Peace committed Aug 02, 2021
  
  fb228a67 Browse Files
- Merge branch 'squash/socket_kim-ec' into 'develop' · bc5339ae
```
Squash/socket kim ec

See merge request !217
```
  Kim Peace committed Aug 02, 2021
  bc5339ae Browse Files
- Merge branch 'squash/socket' into 'develop' · 9868ee7e
```
Squash/socket

See merge request !206
```
  Kim Peace committed Aug 02, 2021
  9868ee7e Browse Files
- #43695 ウェブソケットの送信方式変更 · cc0c6e1f
  Kim Eunchul committed Aug 02, 2021
  
  cc0c6e1f Browse Files
- Reversed Archive list order · 96063a67
  Kim Peace committed Aug 02, 2021
  
  96063a67 Browse Files
- Fixed unbalanced div close · 0cc53fa4
  Kim Peace committed Aug 02, 2021
  
  0cc53fa4 Browse Files
- removed resolved todo comment · 2a76853d
  Kim Peace committed Aug 02, 2021
  
  2a76853d Browse Files
- Fixed to load 100 over messages · 0d0213e3
  Kim Peace committed Aug 02, 2021
  
  0d0213e3 Browse Files
- Merge branch 'squash/socket_kim-ec' of… · 29cb5e42
```
Merge branch 'squash/socket_kim-ec' of gitlab.agentec.jp:abookCommunication/chat_webview into squash/socket_kim-ec
```
  Kim Eunchul committed Aug 02, 2021
  29cb5e42 Browse Files
- #43695 ウェブソケットの送信方式変更 · 9f5c8070
  Kim Eunchul committed Aug 02, 2021
  
  9f5c8070 Browse Files
- Merge branch 'develop' into debug/console_logs · e6d5fa69
  Kim Peace committed Aug 02, 2021
  
  e6d5fa69 Browse Files
- Merge branch 'feature/#43373_roomname_placeholder' into 'develop' · 91ad8f0f
```
Feature/#43373 roomname placeholder

See merge request !213
```
  Kim Peace committed Aug 02, 2021
  91ad8f0f Browse Files