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

Merged
Opened Mar 23, 2021 by Takatoshi Miura@miura-t 2 of 2 tasks completed2/2 tasks
  • Report abuse
Report abuse

Origin/develop apply design archive

アーカイブ一覧、アーカイブ詳細画面の新デザイン適用です。

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

  • @kim-p
  • @lee-mk
Edited Mar 25, 2021 by Lee Munkyeong
  • Discussion 5
  • Commits 4
  • Changes 12
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Mar 23, 2021
    Resolved by Takatoshi Miura Mar 23, 2021
    public/js/chat-ui.js
    1258 1266
    1259 1267 // アーカイブ一覧取得&表示
    1260 1268 var archiveList = CHAT_DB.getArchiveList();
    1261
    1262 1269 archiveList.forEach(function(archive) {
    1263 var archiveType = '';
    1264 var css = '';
    1270 var typeImage = "";
    • Kim Peace @kim-p commented Mar 23, 2021
      Master

      [nits] indentがspaceになっているので、tabに変更していただけますか。

      Edited Mar 23, 2021
      [nits] indentがspaceになっているので、tabに変更していただけますか。
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 23, 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/7/diffs?diff_id=5519&start_sha=23102b19f585383bf07367df2ba4f9b4b995b289#592e19e9bf87556e2256309d4bf2f8b1b96262f7_1270_1270)
      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 23, 2021
    Resolved by Takatoshi Miura Mar 23, 2021
    public/js/chat-ui.js
    1273 break;
    1274 case 2:
    1275 archiveType = getLocalizedString("archiveTypeSound");
    1276 css = 'type_sound';
    1277 break;
    1278 case 3:
    1279 // 今回のリリースに文書とその他は含めないため非表示
    1280 archiveType = getLocalizedString("archiveTypeDocument");
    1281 css = 'type_document';
    1282 break;
    1283 default:
    1284 // 今回のリリースに文書とその他は含めないため非表示
    1285 archiveType = getLocalizedString("archiveTypeOther");
    1286 css = 'type_other';
    1272 case 0: // 画像
    1273 typeImage = "./icon/icon_collabo_picture.png";
    • Kim Peace @kim-p commented Mar 23, 2021
      Master

      [nits] switchの中もindentがspaceとtabが混ざっているので、統一していただけますか。

      Edited Mar 23, 2021
      [nits] switchの中もindentがspaceとtabが混ざっているので、統一していただけますか。
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 23, 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/7/diffs?diff_id=5519&start_sha=23102b19f585383bf07367df2ba4f9b4b995b289#592e19e9bf87556e2256309d4bf2f8b1b96262f7_1273_1273)
      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 23, 2021
    Last updated by Takatoshi Miura Mar 23, 2021
    public/js/chat-ui.js
    1374 1366 break;
    1375 1367 case 2: // 音声
    1376 1368 $('#archive_player').prepend('<audio class="archive_audio_player" src=' + archive.archiveUrl + ' controls></audio>');
    1377 $('#archive_player').prepend('<img class="archive_player" src=' + "https://via.placeholder.com/1280x720" + ' </img>');
    1369 $('#archive_player').prepend('<img class="archive_player" src=' + "./images/capture.png" + ' </img>');
    • Kim Peace @kim-p commented Mar 23, 2021
      Master

      [ask] img tagの格好が閉じられてなさそうに見えるのでうが、大丈夫でしょうか? <img ... </img>になっているように見えます。

      Edited Mar 23, 2021
      [ask] `img` tagの格好が閉じられてなさそうに見えるのでうが、大丈夫でしょうか? `<img ... </img>`になっているように見えます。
    • Takatoshi Miura @miura-t commented Mar 23, 2021
      Developer

      </img> が不要でした。 <img ・・・ > となるように修正しました。

      Edited Mar 23, 2021 by Takatoshi Miura
      `</img>` が不要でした。 `<img ・・・ >` となるように修正しました。
    • Takatoshi Miura @miura-t

      changed this line in version 2 of the diff

      Mar 23, 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/7/diffs?diff_id=5519&start_sha=23102b19f585383bf07367df2ba4f9b4b995b289#592e19e9bf87556e2256309d4bf2f8b1b96262f7_1369_1369)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    assigned to @miura-t

    Mar 23, 2021

    assigned to @miura-t

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

    added 1 commit

    • 17b5062e - コードレビュー対応(tab統一)

    Compare with previous version

    Mar 23, 2021

    added 1 commit

    • 17b5062e - コードレビュー対応(tab統一)

    Compare with previous version

    added 1 commit * 17b5062e - コードレビュー対応(tab統一) [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/7/diffs?diff_id=5519&start_sha=23102b19f585383bf07367df2ba4f9b4b995b289)
    Toggle commit list
  • Takatoshi Miura @miura-t

    assigned to @kim-p

    Mar 23, 2021

    assigned to @kim-p

    assigned to @kim-p
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Mar 24, 2021

    marked the task @kim-p as completed

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

    assigned to @miura-t

    Mar 24, 2021

    assigned to @miura-t

    assigned to @miura-t
    Toggle commit list
  • Kim Peace @kim-p commented Mar 24, 2021
    Master

    LGTMです!

    LGTMです!
  • Takatoshi Miura @miura-t

    assigned to @lee-mk

    Mar 24, 2021

    assigned to @lee-mk

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

    marked the task @lee-mk as completed

    Mar 25, 2021

    marked the task @lee-mk as completed

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

    assigned to @miura-t

    Mar 25, 2021

    assigned to @miura-t

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

    merged

    Mar 25, 2021

    merged

    merged
    Toggle commit list
  • Takatoshi Miura @miura-t

    mentioned in commit a8d13870

    Mar 25, 2021

    mentioned in commit a8d13870

    mentioned in commit a8d1387060e20f7d9d9768f634704de9804b1124
    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
3
3 participants
Reference: abookCommunication/chat_webview!7
×

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.