Commits · fa132815ceff566b04ac4f88bedb48015bc97db3 · abookCommunication / chat_webview · GitLab

03 Aug, 2021 6 commits
- 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 23 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
- Merge branch 'feature/host_change' into 'develop' · 4cd1a0a8
```
Feature/host change

See merge request !212
```
  Kim Peace committed Aug 02, 2021
  4cd1a0a8 Browse Files
- Added l10n for join collaboration message · 31cdfeef
  Kim Peace committed Aug 02, 2021
  
  31cdfeef Browse Files
- Merge branch 'squash/socket_43367' into 'squash/socket_kim-ec' · 996f5f2c
```
#43367 【ABook Communication】チャット画面を10分間放置するとセッションが切れる

See merge request !214
```
  Kim Peace committed Aug 02, 2021
  996f5f2c Browse Files
- #43367 【ABook Communication】チャット画面を10分間放置するとセッションが切れる · d495eeda
  Kim Eunchul committed Aug 02, 2021
  
  d495eeda Browse Files
01 Aug, 2021 8 commits
- Added room name placeholder for room name change · 8c421f6c
  Kim Peace committed Aug 02, 2021
  
  8c421f6c Browse Files
- Removed some todos that confirmed · 4d823d3b
  Kim Peace committed Aug 02, 2021
  
  4d823d3b Browse Files
- Merge branch 'feature/host_change' into debug/console_logs · d98921de
```
# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
#	public_new/js/views/collaboration/fermi-web-socket-message-handler.js
```
  Kim Peace committed Aug 02, 2021
  d98921de Browse Files
- fixed show host mark and request s · f1563ade
  Kim Peace committed Aug 02, 2021
  
  f1563ade Browse Files
- Merge branch 'feature/host_change' into debug/console_logs · 6a8069c8
```
# Conflicts:
#	public_new/js/views/collaboration/share-event-listener.js
```
  Kim Peace committed Aug 02, 2021
  6a8069c8 Browse Files
- Fixed host change logics · 850dcd11
  Kim Peace committed Aug 02, 2021
  
  850dcd11 Browse Files
- Removed and Fixed chat-add-user · ac05490a
  Kim Peace committed Aug 02, 2021
  
  ac05490a Browse Files
- Added prints in chat-add-user · 3ed4b701
  Kim Peace committed Aug 02, 2021
  
  3ed4b701 Browse Files
31 Jul, 2021 3 commits
- Merge branch 'feature/host_change' into debug/console_logs · be2d9a05
```
# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
#	public_new/js/views/collaboration/share-event-listener.js
```
  Kim Peace committed Jul 31, 2021
  be2d9a05 Browse Files
- Fixed retry camera searching condition · 4fce1a70
  Kim Peace committed Jul 31, 2021
  
  4fce1a70 Browse Files
- Fixed retry camera searching condition · 317f3397
  Kim Peace committed Jul 31, 2021
  
  317f3397 Browse Files