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

Merged
Opened May 20, 2021 by Lee Munkyeong@lee-mk 1 of 2 tasks completed1/2 tasks
  • Report abuse
Report abuse

アンドロイド8以下バージョンでのアラート追加、キャプチャー機能修正

  • @kim-p
  • @miura-t
Edited May 20, 2021 by Takatoshi Miura
  • Discussion 1
  • Commits 4
  • Changes 12
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Takatoshi Miura @miura-t

    marked the task @miura-t as completed

    May 20, 2021

    marked the task @miura-t as completed

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

    assigned to @kim-p

    May 20, 2021

    assigned to @kim-p

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

    added 1 commit

    • bfa1639b - コードミス修正。

    Compare with previous version

    May 20, 2021

    added 1 commit

    • bfa1639b - コードミス修正。

    Compare with previous version

    added 1 commit * bfa1639b - コードミス修正。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/135/diffs?diff_id=6283&start_sha=bf51035bd35239a0e68a050b9c2c3918ce5de38f)
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff May 20, 2021
    Resolved by Lee Munkyeong May 21, 2021
    public_new/js/chat-ui.js
    2481 2481 if (CHAT_UTIL.isIOS()) {
    2482 2482 webkit.messageHandlers.joinCollaboration.postMessage({"collaborationType": collaborationType, "meetingId": meetingId});
    2483 2483 } else if (CHAT_UTIL.isAndroid()) {
    2484 if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
    2485 alert(getLocalizedString('not_support_version'));
    2486 return;
    2487 }
    2484 2488 android.joinCollaboration(collaborationType, meetingId);
    2485 2489 }
    2486 2490 }
    2487 2491
    2488 2492 CHAT_UI.startCollaboration = function(collaborationType) {
    2493 if (collaborationType == COLLABORATION_TYPE.DOCUMENT && androidVersion < ANDROID_SDK_VERSION.O) {
    • Kim Peace @kim-p commented May 20, 2021
      Master

      [ask] iOSの場合は、気にしなくてもいいですか?

      Edited May 21, 2021
      [ask] iOSの場合は、気にしなくてもいいですか?
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      May 21, 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/135/diffs?diff_id=6289&start_sha=bfa1639b43994c7ad1e787ec15ee53ac1ce9f48e#cb43321944b8dcb1e2b3b87cea1e1f7c22f3d3cf_2493_2491)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    assigned to @lee-mk

    May 20, 2021

    assigned to @lee-mk

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

    added 1 commit

    • 37760b25 - Android7以下のユーザにホスト権限を渡すときにアラート追加。

    Compare with previous version

    May 21, 2021

    added 1 commit

    • 37760b25 - Android7以下のユーザにホスト権限を渡すときにアラート追加。

    Compare with previous version

    added 1 commit * 37760b25 - Android7以下のユーザにホスト権限を渡すときにアラート追加。 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/135/diffs?diff_id=6289&start_sha=bfa1639b43994c7ad1e787ec15ee53ac1ce9f48e)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    May 21, 2021

    resolved all discussions

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

    added 5 commits

    • 37760b25...695e99dc - 4 commits from branch develop
    • 8c3b7809 - Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into…

    Compare with previous version

    May 21, 2021

    added 5 commits

    • 37760b25...695e99dc - 4 commits from branch develop
    • 8c3b7809 - Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into…

    Compare with previous version

    added 5 commits * 37760b25...695e99dc - 4 commits from branch `develop` * 8c3b7809 - Merge branch &#x27;develop&#x27; of gitlab.agentec.jp:abookCommunication&#x2F;chat_webview into… [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/135/diffs?diff_id=6290&start_sha=37760b25d0c9915bcd9c785dafaf0b5bc11a50af)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit 2c6664a3

    May 21, 2021

    mentioned in commit 2c6664a3

    mentioned in commit 2c6664a358d33cb97c6ae84d93036aa21d14db64
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    May 21, 2021

    merged

    merged
    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
3
3 participants
Reference: abookCommunication/chat_webview!135
×

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.