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

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

Origin/develop apply design chat

  • @kim-p
  • @kang-dh
  • @miura-t
  • @lee-dh
Edited Mar 31, 2021 by Kang Donghun
  • Discussion 2
  • Commits 13
  • Changes 23
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Munkyeong @lee-mk

    added 4 commits

    • 88753006...643b084a - 3 commits from branch origin/develop_apply_design
    • a280f1c7 - Merge branch 'origin/develop_apply_design' into 'origin/develop_apply_design_chat'

    Compare with previous version

    Mar 31, 2021

    added 4 commits

    • 88753006...643b084a - 3 commits from branch origin/develop_apply_design
    • a280f1c7 - Merge branch 'origin/develop_apply_design' into 'origin/develop_apply_design_chat'

    Compare with previous version

    added 4 commits * 88753006...643b084a - 3 commits from branch `origin/develop_apply_design` * a280f1c7 - Merge branch 'origin/develop_apply_design' into 'origin/develop_apply_design_chat' [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5585&start_sha=88753006630a47db32dea5952aca88c8e6c7fa38)
    Toggle commit list
  • Lee Daehyun @lee-dh

    marked the task @lee-dh as completed

    Mar 31, 2021

    marked the task @lee-dh as completed

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

    marked the task @miura-t as completed

    Mar 31, 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

    Mar 31, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Mar 31, 2021
    Resolved by Lee Munkyeong Mar 31, 2021
    public_new/contact.html
    51 51 <div class="content chat_list">
    52 52 <ul class="p-0 chat_make_room_list">
    53 53 <li class="d-flex align-items-center">
    54 <a href="#" data-toggle="modal" data-target="#myNameCard" style="width: 100%;">
    54 <a href="#" style="width: 100%;">
    55 55 <div class="chat_item d-flex flex-row align-items-center">
    56 56 <div class="chat_item_l">
    57 <div class="thumbnail">
    58 <div class="img_wrap"><img id="myImg" src="img/noImage.png" alt="サムネイル画像" /></div>
    57 <div class="thubnail">
    • Kim Peace @kim-p commented Mar 31, 2021
      Master

      [ask] thubnail -> thumbnail?

      Edited Mar 31, 2021
      [ask] `thubnail` -> `thumbnail`?
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Mar 31, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5586&start_sha=a280f1c7f687284cfafdf761e737690de7657d18#a04b1c72e49a08ce6fcaf25f1ff98d508b60f66c_57_57)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Mar 31, 2021
    Resolved by Lee Munkyeong Mar 31, 2021
    public_new/js/chat-websocket.js
    185 194 } catch(e) {
    186 195 message.text = message.text
    187 196 }
    188
    197 var replacePath = message.text;
    198 replacePath = replacePath.replaceAll('?fileName=','?sid='+CHAT.globalLoginParameter.sid+'&fileName=');
    • Kim Peace @kim-p commented Mar 31, 2021
      Master

      [nits] ,の後はスペースを空けてください。

      Edited Mar 31, 2021
      [nits] `,`の後はスペースを空けてください。
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Mar 31, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5586&start_sha=a280f1c7f687284cfafdf761e737690de7657d18#2d59aff3f7b30c93f30c787fc0c94b7dc62ac323_198_198)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Mar 31, 2021

    marked the task @kim-p as completed

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

    added 1 commit

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

    Compare with previous version

    Mar 31, 2021

    added 1 commit

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

    Compare with previous version

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

    resolved all discussions

    Mar 31, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Mar 31, 2021

    assigned to @kang-dh

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

    added 1 commit

    • 4c63bc20 - コード整理及びメッセージロード修正。

    Compare with previous version

    Mar 31, 2021

    added 1 commit

    • 4c63bc20 - コード整理及びメッセージロード修正。

    Compare with previous version

    added 1 commit * 4c63bc20 - コード整理及びメッセージロード修正。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5592&start_sha=cdf37962edf57d1d4dcc01190a8eb2205de44440)
    Toggle commit list
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Mar 31, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task @kang-dh as completed

    Mar 31, 2021

    marked the task @kang-dh as completed

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

    added 1 commit

    • 7cf52fed - Conflict対応。

    Compare with previous version

    Mar 31, 2021

    added 1 commit

    • 7cf52fed - Conflict対応。

    Compare with previous version

    added 1 commit * 7cf52fed - Conflict対応。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5593&start_sha=4c63bc20001d90ad44d6b37a6731984f5846586a)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 8 commits

    • 7cf52fed...3eb9d95e - 7 commits from branch origin/develop_apply_design
    • ba10fd30 - Merge branch 'origin/develop_apply_design' into 'origin/develop_apply_design_chat'

    Compare with previous version

    Mar 31, 2021

    added 8 commits

    • 7cf52fed...3eb9d95e - 7 commits from branch origin/develop_apply_design
    • ba10fd30 - Merge branch 'origin/develop_apply_design' into 'origin/develop_apply_design_chat'

    Compare with previous version

    added 8 commits * 7cf52fed...3eb9d95e - 7 commits from branch `origin/develop_apply_design` * ba10fd30 - Merge branch &#x27;origin&#x2F;develop_apply_design&#x27; into &#x27;origin&#x2F;develop_apply_design_chat&#x27; [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/9/diffs?diff_id=5594&start_sha=7cf52feda023a393f969d0ddb1cafa3d52508a96)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Mar 31, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit e45ebc85

    Mar 31, 2021

    mentioned in commit e45ebc85

    mentioned in commit e45ebc856d281c7513a4426340764239c0bbadd9
    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!9
×

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.