Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
C
chat_webview
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abookCommunication
  • chat_webview
  • Merge Requests
  • !13

Merged
Opened Apr 01, 2021 by Lee Munkyeong@lee-mk 4 of 4 tasks completed4/4 tasks
  • Report abuse
Report abuse

Origin/develop apply design chat

  • @kim-p
  • @miura-t
  • @kang-dh
  • @lee-dh
Edited Apr 02, 2021 by Takatoshi Miura
  • Discussion 2
  • Commits 37
  • Changes 38
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Apr 01, 2021
    Last updated by Lee Munkyeong Apr 01, 2021
    public_new/template/template_user_message.html
    1 1 <div class="room_left">
    2 2 <figure>
    3 <a href="#" data-toggle="modal" data-target="#profileModal1"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'"></a>
    3 <a href="#" data-toggle="modal" data-target="#profileModal1"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'" ></a>
    • Lee Daehyun @lee-dh commented Apr 01, 2021
      Developer

      " >スペースを閉じてください

      `" >`スペースを閉じてください
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 01, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5651&start_sha=e3cf3b7fec466d611d9e105cff24d482fb7ae90d#f560bd35c8c9f5c2e87baeef44e7764c6711e8b7_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Apr 01, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Daehyun @lee-dh

    marked the task @lee-dh as completed

    Apr 01, 2021

    marked the task @lee-dh as completed

    marked the task **@lee-dh** as completed
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • c74665ad - コードレビュー対応。

    Compare with previous version

    Apr 01, 2021

    added 1 commit

    • c74665ad - コードレビュー対応。

    Compare with previous version

    added 1 commit * c74665ad - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5651&start_sha=e3cf3b7fec466d611d9e105cff24d482fb7ae90d)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Apr 01, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 01, 2021
    Last updated by Kang Donghun Apr 02, 2021
    public_new/js/chat.js
    350 $('.overlay_src_msg').empty();
    351 var keyword = $('#chat .search_form input[type="search"]').val();
    352 if (keyword == '' || keyword.length < 2) {
    353 return;
    354 }
    355 var rooms = CHAT_DB.getRoomList(chatRoomType.ALL, keyword);
    356 let roomListTitle = getLocalizedString("room_search_placeholder");
    357 $('#chatTitle').text(roomListTitle);
    358 var template;
    359 $.get({ url: "./template/template_room_list.html", async: false }
    360 , function(text) {
    361 template = text;
    272 // ルーム開設メンバー数カウント
    273 $('input:checkbox').change(function() {
    274 if($(this).prop('checked')){
    275 $(this).attr('checked', true);
    • Kim Peace @kim-p commented Apr 01, 2021
      Master

      indent?

      indent?
    • Kang Donghun @kang-dh

      changed this line in version 7 of the diff

      Apr 02, 2021

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5660&start_sha=c49dc801e063ba4af9538d436281ab0e582c7f29#53b4b38e40d367a2ef7dae2dc126dcc0c1d056c4_275_272)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Apr 01, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kang Donghun @kang-dh

    added 21 commits

    • 2894034f - グループ検索画面実装
    • 1ad276cf - ネームカード修正及びグループ検索画面実装
    • 507fa5e1 - checkBox 追加
    • 386a6f81 - UIとロジック追加実装
    • cffb2468 - ネームカード修正。
    • 3edb8574 - ネームカード修正。
    • 68bb5268 - ネームカード修正
    • 37aad354 - ネームカード修正
    • ab3b6567 - ルーム開設API修正。
    • ead1dbfb - チャット一覧画面の詳細検索項目(グループ)修正
    • 91c019f7 - ルーム開設API修正。
    • 2a599b1d - Merge branch 'origin/develop_group_search_UI' into origin/develop_createRoom_UI
    • ff1f6054 - チャット開設画面修正
    • d6e63539 - ルーム名がある場合の不具合修正。
    • ba766869 - ネームカード修正
    • 002226bf - お気に入り修正。
    • 516bb765 - Merge branch 'origin/develop_group_search_UI' into origin/develop_createRoom_UI
    • 9887029f - Merge branch 'origin/develop_apply_design_chat' into origin/develop_createRoom_UI
    • c7b44b83 - CreateRoomUI適用
    • ce671c08 - コード整理
    • bbe64164 - Merge branch 'origin/develop_createRoom_UI' into origin/develop_apply_design_chat

    Compare with previous version

    Apr 01, 2021

    added 21 commits

    • 2894034f - グループ検索画面実装
    • 1ad276cf - ネームカード修正及びグループ検索画面実装
    • 507fa5e1 - checkBox 追加
    • 386a6f81 - UIとロジック追加実装
    • cffb2468 - ネームカード修正。
    • 3edb8574 - ネームカード修正。
    • 68bb5268 - ネームカード修正
    • 37aad354 - ネームカード修正
    • ab3b6567 - ルーム開設API修正。
    • ead1dbfb - チャット一覧画面の詳細検索項目(グループ)修正
    • 91c019f7 - ルーム開設API修正。
    • 2a599b1d - Merge branch 'origin/develop_group_search_UI' into origin/develop_createRoom_UI
    • ff1f6054 - チャット開設画面修正
    • d6e63539 - ルーム名がある場合の不具合修正。
    • ba766869 - ネームカード修正
    • 002226bf - お気に入り修正。
    • 516bb765 - Merge branch 'origin/develop_group_search_UI' into origin/develop_createRoom_UI
    • 9887029f - Merge branch 'origin/develop_apply_design_chat' into origin/develop_createRoom_UI
    • c7b44b83 - CreateRoomUI適用
    • ce671c08 - コード整理
    • bbe64164 - Merge branch 'origin/develop_createRoom_UI' into origin/develop_apply_design_chat

    Compare with previous version

    added 21 commits * 2894034f - グループ検索画面実装 * 1ad276cf - ネームカード修正及びグループ検索画面実装 * 507fa5e1 - checkBox 追加 * 386a6f81 - UIとロジック追加実装 * cffb2468 - ネームカード修正。 * 3edb8574 - ネームカード修正。 * 68bb5268 - ネームカード修正 * 37aad354 - ネームカード修正 * ab3b6567 - ルーム開設API修正。 * ead1dbfb - チャット一覧画面の詳細検索項目(グループ)修正 * 91c019f7 - ルーム開設API修正。 * 2a599b1d - Merge branch &#x27;origin&#x2F;develop_group_search_UI&#x27; into origin&#x2F;develop_createRoom_UI * ff1f6054 - チャット開設画面修正 * d6e63539 - ルーム名がある場合の不具合修正。 * ba766869 - ネームカード修正 * 002226bf - お気に入り修正。 * 516bb765 - Merge branch &#x27;origin&#x2F;develop_group_search_UI&#x27; into origin&#x2F;develop_createRoom_UI * 9887029f - Merge branch &#x27;origin&#x2F;develop_apply_design_chat&#x27; into origin&#x2F;develop_createRoom_UI * c7b44b83 - CreateRoomUI適用 * ce671c08 - コード整理 * bbe64164 - Merge branch &#x27;origin&#x2F;develop_createRoom_UI&#x27; into origin&#x2F;develop_apply_design_chat [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5656&start_sha=c74665ad52c63831fec7511bb045ef45bd810b7b)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 20fd1044 - conflict対応。

    Compare with previous version

    Apr 01, 2021

    added 1 commit

    • 20fd1044 - conflict対応。

    Compare with previous version

    added 1 commit * 20fd1044 - conflict対応。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5658&start_sha=bbe641641ae8a19c0173064b7d1c6b425b2a606d)
    Toggle commit list
  • Kang Donghun @kang-dh

    added 2 commits

    • 6ef14d1b - cssファイル修正
    • c49dc801 - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    Apr 01, 2021

    added 2 commits

    • 6ef14d1b - cssファイル修正
    • c49dc801 - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    added 2 commits * 6ef14d1b - cssファイル修正 * c49dc801 - Merge branch &#x27;origin&#x2F;develop_apply_design_chat&#x27; of… [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5659&start_sha=20fd104461a13632e6bf4112a272fa5d3e82c248)
    Toggle commit list
  • Kang Donghun @kang-dh

    added 1 commit

    • 2e455b85 - マジリクエストで見つけた問題修正

    Compare with previous version

    Apr 02, 2021

    added 1 commit

    • 2e455b85 - マジリクエストで見つけた問題修正

    Compare with previous version

    added 1 commit * 2e455b85 - マジリクエストで見つけた問題修正 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5660&start_sha=c49dc801e063ba4af9538d436281ab0e582c7f29)
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task @kang-dh as completed

    Apr 02, 2021

    marked the task @kang-dh as completed

    marked the task **@kang-dh** as completed
    Toggle commit list
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Apr 02, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 7194ca24 - InviteUser

    Compare with previous version

    Apr 02, 2021

    added 1 commit

    • 7194ca24 - InviteUser

    Compare with previous version

    added 1 commit * 7194ca24 - InviteUser [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5669&start_sha=2e455b8534bee6726ef9f9787d987955a9af0874)
    Toggle commit list
  • Kang Donghun @kang-dh

    added 4 commits

    • 1beaa6ca - コード整理
    • 5ac1daad - Merge branch 'origin/develop_apply_design_chat' into origin/develop_createRoom_UI
    • 5a808744 - 検索画面でチェックロジック修正
    • 8548e74d - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    Apr 02, 2021

    added 4 commits

    • 1beaa6ca - コード整理
    • 5ac1daad - Merge branch 'origin/develop_apply_design_chat' into origin/develop_createRoom_UI
    • 5a808744 - 検索画面でチェックロジック修正
    • 8548e74d - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    added 4 commits * 1beaa6ca - コード整理 * 5ac1daad - Merge branch &#x27;origin&#x2F;develop_apply_design_chat&#x27; into origin&#x2F;develop_createRoom_UI * 5a808744 - 検索画面でチェックロジック修正 * 8548e74d - Merge branch &#x27;origin&#x2F;develop_apply_design_chat&#x27; of… [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5670&start_sha=7194ca24f73a8eec98accd214f42c1d5d41e8ed5)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 2 commits

    • b977262b - add-user
    • 5f1420ea - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    Apr 02, 2021

    added 2 commits

    • b977262b - add-user
    • 5f1420ea - Merge branch 'origin/develop_apply_design_chat' of…

    Compare with previous version

    added 2 commits * b977262b - add-user * 5f1420ea - Merge branch &#x27;origin&#x2F;develop_apply_design_chat&#x27; of… [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5671&start_sha=8548e74d5b69368d8515d3922917c6fdbd53cca3)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @miura-t

    Apr 02, 2021

    assigned to @miura-t

    assigned to @miura-t
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • ce69af2e - remove log

    Compare with previous version

    Apr 02, 2021

    added 1 commit

    • ce69af2e - remove log

    Compare with previous version

    added 1 commit * ce69af2e - remove log [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5673&start_sha=5f1420ea50bc7132023b1c62f471f696522983a2)
    Toggle commit list
  • Takatoshi Miura @miura-t

    marked the task @miura-t as completed

    Apr 02, 2021

    marked the task @miura-t as completed

    marked the task **@miura-t** as completed
    Toggle commit list
  • Takatoshi Miura @miura-t

    assigned to @lee-mk

    Apr 02, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on commit ce69af2e Apr 02, 2021
    • Kim Peace @kim-p

      mentioned in commit a4ea3c56

      Apr 02, 2021

      mentioned in commit a4ea3c56

      mentioned in commit a4ea3c5695b85547a69c0e218f8043d5ae528443
      Toggle commit list
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 750300a0 - バグ修正。

    Compare with previous version

    Apr 02, 2021

    added 1 commit

    • 750300a0 - バグ修正。

    Compare with previous version

    added 1 commit * 750300a0 - バグ修正。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/13/diffs?diff_id=5681&start_sha=ce69af2e646df7e41d107cc3eb201f5b217dd865)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Apr 02, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit 807f9237

    Apr 02, 2021

    mentioned in commit 807f9237

    mentioned in commit 807f9237ce0991001e8d4c2be3592dd89e45c6a8
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Lee Munkyeong
Assignee
Lee Munkyeong @lee-mk
Assign to
None
Milestone
None
Assign milestone
Time tracking
5
5 participants
Reference: abookCommunication/chat_webview!13
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.