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
  • !24

Merged
Opened Apr 07, 2021 by Lee Daehyun@lee-dh 3 of 3 tasks completed3/3 tasks
  • Report abuse
Report abuse

Bug fix/ネームカード名前ずれ

  • @kim-p
  • @miura-t
  • @lee-mk
Edited Apr 08, 2021 by Takatoshi Miura
  • Discussion 12
  • Commits 5
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Daehyun @lee-dh

    added 29 commits

    • a0a65567...f4dcc293 - 28 commits from branch release_sp3
    • 2cb93bcf - Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ'

    Compare with previous version

    Apr 07, 2021

    added 29 commits

    • a0a65567...f4dcc293 - 28 commits from branch release_sp3
    • 2cb93bcf - Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ'

    Compare with previous version

    added 29 commits * a0a65567...f4dcc293 - 28 commits from branch `release_sp3` * 2cb93bcf - Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ' [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5738&start_sha=a0a65567ac2698ba2dbc2bc6cc035126e6c8cb69)
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Apr 07, 2021

    assigned to @lee-mk

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

    assigned to @lee-dh

    Apr 07, 2021

    assigned to @lee-dh

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

    added 1 commit

    • d5e76937 - ネームカードUI修正

    Compare with previous version

    Apr 07, 2021

    added 1 commit

    • d5e76937 - ネームカードUI修正

    Compare with previous version

    added 1 commit * d5e76937 - ネームカードUI修正 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5754&start_sha=2cb93bcf3b7c58078334a35d53a9786fc94212b0)
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Apr 07, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong
    @lee-mk started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/chat_room.html
    137 137 <div id="loadingArea"></div>
    138 138 <div id="userProfileModal"></div>
    139 139 <div id="chatMenuModal"></div>
    140 <div id="pictureModal"></div>
    141 <!-- メニューモーダル -->
    • Lee Munkyeong @lee-mk commented Apr 07, 2021
      Developer

      SDはサーバがないのでSSI方式は動作しないと思います。

      Edited Apr 08, 2021
      SDはサーバがないのでSSI方式は動作しないと思います。
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#f0bfa7a9ed0d0c1e3dcf08be05ad16caa636f4c5_141_141)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      削除しました

      Edited Apr 08, 2021
      削除しました
    Please register or sign in to reply
  • Lee Munkyeong
    @lee-mk started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/chat_room.html
    159 166 <script src="./js/chat-websocket.js"></script>
    160 167 <script src="./js/chat-room.js"></script>
    161 168 <script>
    169 function test(image) {
    • Lee Munkyeong @lee-mk commented Apr 07, 2021
      Developer

      メソッド名を変更してください。

      Edited Apr 08, 2021
      メソッド名を変更してください。
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#f0bfa7a9ed0d0c1e3dcf08be05ad16caa636f4c5_169_163)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      imageModalに変更しました。

      Edited Apr 08, 2021
      `imageModal`に変更しました。
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    assigned to @lee-dh

    Apr 07, 2021

    assigned to @lee-dh

    assigned to @lee-dh
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/css/chat.css
    834 842 max-width: 75%;
    835 843 }
    836 844 }
    845 /*************************** ネームカード *************************/
    846 .prifile_name {
    • Kim Peace @kim-p commented Apr 07, 2021
      Master

      [nits] indent?

      Edited Apr 08, 2021
      [nits] indent?
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#38f51759ac918471c315119579d30bdd66bd6b91_846_843)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      修正しました。

      Edited Apr 08, 2021
      修正しました。
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/css/chat.css
    740 740
    741 741 /**************************** modal *************************/
    742 742 /* メニューモーダル */
    743 .modal-body {
    • Kim Peace @kim-p commented Apr 07, 2021
      Master

      [nits] 使わないcssは削除しても。。。?

      Edited Apr 08, 2021
      [nits] 使わないcssは削除しても。。。?
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#38f51759ac918471c315119579d30bdd66bd6b91_743_743)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      削除しました

      Edited Apr 08, 2021
      削除しました
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/css/common.css
    156 overflow: auto;
    155 height: 150px;
    156 overflow: scroll;
    157 157 padding-top: 0rem;
    158 padding-right: 0rem;
    158 padding-right: 1rem;
    159 159 margin-top: 1rem;
    160 160 }
    161 .profile_modal .modal-header { display: table; }
    161 162 .profile_modal .modal-header,.profile_modal .modal-body { padding-bottom: 0; }
    162 .profile_modal .modal-footer button { width: 33%; padding: 5px;}
    163 .profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px;}
    164 .profile_modal .modal-header .profile_desc{ width: 100%;}
    163 .profile_modal .modal-footer button { width: 33%; padding: 5px; }
    164 .profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px; }
    165 .profile_modal .modal-header .profile_desc{ width: 100%; }
    • Kim Peace @kim-p commented Apr 07, 2021
      Master

      [nits] {の前はスペース空けてください

      Edited Apr 08, 2021
      [nits] `{`の前はスペース空けてください
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#ed03458772a8a5f16d0b329749eca6d521239c31_165_165)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      修正しました。

      Edited Apr 08, 2021
      修正しました。
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 07, 2021
    Resolved by Lee Daehyun Apr 08, 2021
    public_new/js/chat.js
    111 111 }
    112 112 let downloadPath = CMS_SERVER_URL + '/chatapi/file/download?fileName=' + imageName + '&roomId=' + CHAT.globalLoginParameter.roomId;
    113 113 // アップロードが終了した後ローディング画面から離れてメッセージをメッセージを転送する
    114 const lightbox = $('<a/>',{href:imgPath, 'data-lightbox':'attachedImages','data-title':imageName});
    115 const image = $('<img/>',{src:imgPath, width:'auto',style:'max-width:100%'});
    116 const downloadIcon = $('<a/>',{href:downloadPath, class:'fa fa-download', download:res.fileName});
    114 const lightbox = $('<a/>', {'data-lightbox':'attachedImages', 'data-title':imageName});
    115 const image = $('<img/>', {src:imgPath, width:'auto', style:'max-width:100%', 'data-toggle':'modal', onclick:'test(this);'});
    • Kim Peace @kim-p commented Apr 07, 2021
      Master

      [must] test?

      Edited Apr 08, 2021
      [must] `test`?
    • Lee Daehyun @lee-dh

      changed this line in version 5 of the diff

      Apr 08, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014#53b4b38e40d367a2ef7dae2dc126dcc0c1d056c4_115_115)
      Toggle commit list
    • Lee Daehyun @lee-dh commented Apr 08, 2021
      Developer

      imageModalに変更しました

      Edited Apr 08, 2021
      `imageModal`に変更しました
    Please register or sign in to reply
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Apr 07, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Lee Daehyun @lee-dh

    added 1 commit

    • 35c0cc47 - MR インデント、function名変更

    Compare with previous version

    Apr 08, 2021

    added 1 commit

    • 35c0cc47 - MR インデント、function名変更

    Compare with previous version

    added 1 commit * 35c0cc47 - MR インデント、function名変更 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5760&start_sha=d5e76937fff78250ee59d76a4fb2db0986176014)
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Apr 08, 2021

    assigned to @lee-mk

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

    added 7 commits

    • 35c0cc47...e9bfd760 - 6 commits from branch release_sp3
    • b2e55c82 - Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ'

    Compare with previous version

    Apr 08, 2021

    added 7 commits

    • 35c0cc47...e9bfd760 - 6 commits from branch release_sp3
    • b2e55c82 - Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ'

    Compare with previous version

    added 7 commits * 35c0cc47...e9bfd760 - 6 commits from branch `release_sp3` * b2e55c82 - Merge branch &#x27;release_sp3&#x27; into &#x27;bugFix&#x2F;ネームカード名前ずれ&#x27; [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/24/diffs?diff_id=5761&start_sha=35c0cc47a49465cc2df77df7f7c094f8881567b0)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    marked the task @lee-mk as completed

    Apr 08, 2021

    marked the task @lee-mk as completed

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

    assigned to @lee-dh

    Apr 08, 2021

    assigned to @lee-dh

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

    resolved all discussions

    Apr 08, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @miura-t

    Apr 08, 2021

    assigned to @miura-t

    assigned to @miura-t
    Toggle commit list
  • Takatoshi Miura @miura-t

    marked the task @miura-t as completed

    Apr 08, 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-dh

    Apr 08, 2021

    assigned to @lee-dh

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

    merged

    Apr 08, 2021

    merged

    merged
    Toggle commit list
  • Lee Daehyun @lee-dh

    mentioned in commit 42b78026

    Apr 08, 2021

    mentioned in commit 42b78026

    mentioned in commit 42b78026d86b11aae2b3ac5fc94e61f2685307f2
    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 Daehyun
Assignee
Lee Daehyun @lee-dh
Assign to
None
Milestone
None
Assign milestone
Time tracking
4
4 participants
Reference: abookCommunication/chat_webview!24
×

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.