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

Merged
Opened Mar 09, 2021 by Takatoshi Miura@miura-t 4 of 4 tasks completed4/4 tasks
  • Report abuse
Report abuse

Origin/deverop archive ui

LGTMの場合、チェックしてください。

  • @jung-k
  • @kim-p
  • @kang-dh
  • @lee-dh
Edited Mar 15, 2021 by Kim Peace
  • Discussion 5
  • Commits 8
  • Changes 7
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace @kim-p

    changed the description

    Mar 10, 2021

    changed the description

    changed the description
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Mar 10, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @lee-dh

    Mar 10, 2021

    assigned to @lee-dh

    assigned to @lee-dh
    Toggle commit list
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Mar 10, 2021
    Resolved by Takatoshi Miura Mar 10, 2021
    public/js/chat-ui.js
    1270 default:
    1271 // 今回のリリースに文書とその他は含めないため非表示
    1272 archiveType = getLocalizedString("archiveTypeOther");
    1273 css = 'type_other';
    1274 }
    1275
    1276 let html = Mustache.render(archiveTemplate, {
    1277 id: archive.archiveId,
    1278 fileName: archive.archiveName,
    1279 thumbnailImage: archive.archiveUrl,
    1280 insertDate: archive.archiveDate,
    1281 archiveType: archiveType,
    1282 archiveTypeCSS: css
    1283 });
    1284
    1285 let obj = $(jQuery.parseHTML(html)).on('click', function(){
    • Lee Daehyun @lee-dh commented Mar 10, 2021
      Developer

      {スペースを合わしてください

      Edited Mar 10, 2021
      `{`スペースを合わしてください
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 11, 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/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747#592e19e9bf87556e2256309d4bf2f8b1b96262f7_1285_1285)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Mar 10, 2021
    Resolved by Takatoshi Miura Mar 10, 2021
    public/js/chat-ui.js
    1360 $('#archive_player').prepend('<video class="archive_player" src=' + archive.archiveUrl + ' controls autoplay muted playsinline></video>');
    1361 break;
    1362 case 2: // 音声
    1363 $('#archive_player').prepend('<audio class="archive_audio_player" src=' + archive.archiveUrl + ' controls></audio>');
    1364 $('#archive_player').prepend('<img class="archive_player" src=' + "https://via.placeholder.com/1280x720" + ' </img>');
    1365 break;
    1366 case 3: // 文書
    1367 // リリースに文書とその他は含めないため今回は非表示
    1368 break;
    1369 default:
    1370 // リリースに文書とその他は含めないため今回は非表示
    1371 }
    1372
    1373 // チャットルームへのリンク付け
    1374 document.getElementById('joinChatRoom').onclick = function() {
    1375 socket.emit('joinRoom', roomId, roomInfo.chatRoomName, function (){
    • Lee Daehyun @lee-dh commented Mar 10, 2021
      Developer

      {スペースを合わしてください

      Edited Mar 10, 2021
      `{`スペースを合わしてください
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 11, 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/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747#592e19e9bf87556e2256309d4bf2f8b1b96262f7_1375_1375)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun @lee-dh

    assigned to @miura-t

    Mar 10, 2021

    assigned to @miura-t

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

    marked the task @lee-dh as completed

    Mar 10, 2021

    marked the task @lee-dh as completed

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

    resolved all discussions

    Mar 10, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Takatoshi Miura @miura-t

    assigned to @kang-dh

    Mar 10, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 10, 2021
    Resolved by Takatoshi Miura Mar 10, 2021
    public/css/chat.css
    763 .inbox_archive {
    764 width: 100%;
    765 }
    766
    767 #archive_list {
    768 margin: 0;
    769 padding: 5px 5px 5px;
    770 overflow-y: scroll;
    771 white-space: nowrap;
    772 -webkit-overflow-scrolling: touch;
    773 height: calc(100vh - 200px);
    774 }
    775
    776 .archive_data {
    777 overflow-y: scroll;
    778 clear:both;
    • Kang Donghun @kang-dh commented Mar 10, 2021
      Developer

      [nits] インデントを合わせてください。 ex) clear: both;

      Edited Mar 10, 2021 by Kang Donghun
      [nits] インデントを合わせてください。 ex) `clear: both;`
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 11, 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/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747#3dcc5a603bda5bd713397e41b7231dfd76cd2e1c_778_778)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 10, 2021
    Resolved by Takatoshi Miura Mar 10, 2021
    public/js/chat-ui.js
    483 483 $('#bottomNav').show();
    484 484 break;
    485 485
    486 case '#pills-archive':
    • Kang Donghun @kang-dh commented Mar 10, 2021
      Developer

      [nits]インデントを合わせてください。

      Edited Mar 10, 2021
      [nits]インデントを合わせてください。
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 11, 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/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747#592e19e9bf87556e2256309d4bf2f8b1b96262f7_486_486)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun @kang-dh

    assigned to @miura-t

    Mar 10, 2021

    assigned to @miura-t

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

    resolved all discussions

    Mar 10, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Takatoshi Miura @miura-t

    assigned to @jung-k

    Mar 10, 2021

    assigned to @jung-k

    assigned to @jung-k
    Toggle commit list
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Mar 10, 2021
    Resolved by Takatoshi Miura Mar 11, 2021
    public/js/language_ko.js
    58 58 "directMessageChatRoom":"DM",
    59 59 "favorite":"즐겨찾기리스트",
    60 60 "mygroup":"마이그룹",
    61 "groupChatRoom":"그룹"
    61 "groupChatRoom":"그룹",
    62 "archiveListTitle":"아카이브",
    63 "archiveTypeImage":"이미지",
    64 "archiveTypeMovie":"동영상",
    65 "archiveTypeSound":"음성",
    66 "archiveTypeDocument":"문서",
    67 "archiveTypeOther":"기타",
    68 "archiveDetailTitle":"세부 묘사",
    69 "fileNameTitle":"파일 이름",
    70 "saveDateTitle":"저장 일",
    71 "roomNameTitle":"대화방 이름",
    • Jung Kwangkyu @jung-k commented Mar 10, 2021
      Owner

      全角スペースでしょうか。であれば半角にしてください。

      Edited Mar 11, 2021
      全角スペースでしょうか。であれば半角にしてください。
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 11, 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/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747#d3b4588a0c59f693d2da49328421018d8ed09b75_71_71)
      Toggle commit list
    Please register or sign in to reply
  • Jung Kwangkyu @jung-k

    assigned to @miura-t

    Mar 10, 2021

    assigned to @miura-t

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

    resolved all discussions

    Mar 11, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Takatoshi Miura @miura-t

    added 2 commits

    • ad5bcaf4 - コード レビュー修正
    • bdd013b8 - コード レビュー対応

    Compare with previous version

    Mar 11, 2021

    added 2 commits

    • ad5bcaf4 - コード レビュー修正
    • bdd013b8 - コード レビュー対応

    Compare with previous version

    added 2 commits * ad5bcaf4 - コード レビュー修正 * bdd013b8 - コード レビュー対応 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/4/diffs?diff_id=5414&start_sha=65d6780343cf0fa47d01d1e8d69b6b1c2b2e6747)
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task @kang-dh as completed

    Mar 15, 2021

    marked the task @kang-dh as completed

    marked the task **@kang-dh** as completed
    Toggle commit list
  • Jung Kwangkyu @jung-k

    marked the task @jung-k as completed

    Mar 15, 2021

    marked the task @jung-k as completed

    marked the task **@jung-k** as completed
    Toggle commit list
  • Jung Kwangkyu @jung-k

    marked the task @kang-dh as incomplete

    Mar 15, 2021

    marked the task @kang-dh as incomplete

    marked the task **@kang-dh** as incomplete
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kang-dh as completed

    Mar 15, 2021

    marked the task @kang-dh as completed

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

    merged

    Mar 15, 2021

    merged

    merged
    Toggle commit list
  • Takatoshi Miura @miura-t

    mentioned in commit 64d2007a

    Mar 15, 2021

    mentioned in commit 64d2007a

    mentioned in commit 64d2007aaf8044b9ea88c39905484157d662f342
    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
Takatoshi Miura
Assignee
Takatoshi Miura @miura-t
Assign to
None
Milestone
None
Assign milestone
Time tracking
5
5 participants
Reference: abookCommunication/chat_webview!4
×

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.