1. 08 Apr, 2021 2 commits
  2. 07 Apr, 2021 8 commits
  3. 06 Apr, 2021 6 commits
  4. 05 Apr, 2021 4 commits
  5. 02 Apr, 2021 16 commits
  6. 01 Apr, 2021 4 commits
    • Merge branch 'origin/develop_apply_design_chat' of… · c49dc801
      Merge branch 'origin/develop_apply_design_chat' of gitlab.agentec.jp:abookCommunication/chat_webview into origin/develop_apply_design_chat
      
      # Conflicts:
      #	public_new/css/chat.css
      Kang Donghun committed
    • cssファイル修正 · 6ef14d1b
      Kang Donghun committed
    • conflict対応。 · 20fd1044
      Lee Munkyeong committed
    • Merge branch 'origin/develop_createRoom_UI' into origin/develop_apply_design_chat · bbe64164
      # Conflicts:
      #	public/css/chat.css
      #	public/js/chat-db.js
      #	public/js/chat-ui.js
      #	public/js/language_en.js
      #	public/js/language_ja.js
      #	public/js/language_ko.js
      #	public_new/archive.html
      #	public_new/archive_detail.html
      #	public_new/chat.html
      #	public_new/chat_add_user.html
      #	public_new/chat_add_user_confirm.html
      #	public_new/chat_change_room_name.html
      #	public_new/chat_make_room.html
      #	public_new/chat_make_room_confirm.html
      #	public_new/chat_room.html
      #	public_new/collaboration_overlay_add_user_list.html
      #	public_new/contact.html
      #	public_new/css/archive.css
      #	public_new/css/chat.css
      #	public_new/css/collaboration.css
      #	public_new/css/common.css
      #	public_new/js/archive.js
      #	public_new/js/chat-db.js
      #	public_new/js/chat-ui.js
      #	public_new/js/chat-websocket.js
      #	public_new/js/chat.js
      #	public_new/js/common.js
      #	public_new/js/constant.js
      #	public_new/js/contact.js
      #	public_new/js/language_en.js
      #	public_new/js/language_ja.js
      #	public_new/js/language_ko.js
      #	public_new/js/loading.js
      #	public_new/loading.html
      #	public_new/modal_chat_profile.html
      #	public_new/modal_collabo_profile.html
      #	public_new/modal_collabo_profile2.html
      #	public_new/search_message_user_list.html
      #	public_new/template/template_group_list.html
      #	public_new/template/template_group_user_list.html
      #	public_new/template/template_my_message.html
      #	public_new/template/template_my_name_card.html
      #	public_new/template/template_room_list.html
      #	public_new/template/template_user_list.html
      #	public_new/template/template_user_message.html
      #	public_new/template/template_user_name_card.html
      Kang Donghun committed