Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • 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
  • abook_android
  • abook_check
  • Merge Requests
  • !143

Merged
Opened May 11, 2021 by Lee Munkyeong@lee-mk 1 of 1 task completed1/1 task
  • Report abuse
Report abuse

Features/abcomm sp6 document collaboration

  • @kim-p
Edited May 11, 2021 by Kim Peace
  • Discussion 1
  • Commits 8
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff May 11, 2021
    Last updated by Lee Munkyeong May 11, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    1396 return meetingId.toString();
    1397 }
    1398
    1399 @JavascriptInterface
    1400 public void startContentView(String joinMeetingId) {
    1401 Integer meetingId;
    1402 try {
    1403 connectMeetingServer();
    1404 List<MeetingDto> meetingList= meetingManager.getMeetingList(mSkey);
    1405 for (MeetingDto meeting : meetingList) {
    1406 if (meeting.title.equals("Collaboration__"+roomId) && meetingManager.isOwner()) {
    1407 meetingManager.deleteMeeting(meeting.meetingId, mSkey);
    1408 }
    1409 }
    1410 if (collaborationJoinFlg == 0) {
    1411 meetingId = meetingManager.createMeeting(mSkey,"Collaboration_"+roomId, roomId.toString());
    • Kim Peace @kim-p commented May 11, 2021
      Master

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

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

      changed this line in version 2 of the diff

      May 11, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/143/diffs?diff_id=6194&start_sha=4acde33918587fccc91e96de85283eb96b6e60b1#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_1411_1411)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    May 11, 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-mk

    May 11, 2021

    assigned to @lee-mk

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

    added 1 commit

    • 2b11ca45 - コードレビュー対応。

    Compare with previous version

    May 11, 2021

    added 1 commit

    • 2b11ca45 - コードレビュー対応。

    Compare with previous version

    added 1 commit * 2b11ca45 - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/143/diffs?diff_id=6194&start_sha=4acde33918587fccc91e96de85283eb96b6e60b1)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    May 11, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit f88c2e59

    May 11, 2021

    mentioned in commit f88c2e59

    mentioned in commit f88c2e5952cdb0830b1b009317b10fcd873c39b0
    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
2
2 participants
Reference: abook_android/abook_check!143
×

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.