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

Merged
Opened Oct 15, 2021 by Lee Munkyeong@lee-mk 0 of 1 task completed0/1 task
  • Report abuse
Report abuse

課題票75,110対応

  • @jung-k
    課題票75,110対応
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b features/1.4.100_develop_mk origin/features/1.4.100_develop_mk

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout features/1.4.201
git merge --no-ff features/1.4.100_develop_mk

Step 4. Push the result of the merge to GitLab

git push origin features/1.4.201

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 3
  • Commits 12
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Lee Munkyeong
    @lee-mk started a discussion on commit 179b5664 Oct 15, 2021
    • Lee Munkyeong @lee-mk

      mentioned in commit f926f436

      Oct 15, 2021

      mentioned in commit f926f436

      mentioned in commit f926f4360c16c4cb08109742413df65f3945229f
      Toggle commit list
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    added 162 commits

    • f926f436...47084337 - 161 commits from branch features/1.4.201
    • 9cbda6fd - Merge branch 'features/1.4.201' of…

    Compare with previous version

    Oct 15, 2021

    added 162 commits

    • f926f436...47084337 - 161 commits from branch features/1.4.201
    • 9cbda6fd - Merge branch 'features/1.4.201' of…

    Compare with previous version

    added 162 commits * f926f436...47084337 - 161 commits from branch `features/1.4.201` * 9cbda6fd - Merge branch 'features/1.4.201' of… [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7274&start_sha=f926f4360c16c4cb08109742413df65f3945229f)
    Toggle commit list
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Oct 15, 2021
    Resolved by Lee Munkyeong Oct 15, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
    1172 1174 }
    1173 1175
    1174 1176
    1175 public void commonAttachedDataUrl (String taskKey, String data) {
    1177 public void commonAttachedDataUrl (String taskKey, String data) {
    1176 1178 boolean isError = false;
    • Jung Kwangkyu @jung-k commented Oct 15, 2021
      Master

      [nits] インデントを合わせましょう。

      Edited Oct 15, 2021
      [nits] インデントを合わせましょう。
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Oct 15, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7276&start_sha=9cbda6fd8439b946b025aec931123dc1a48f55e7#db2d892a0f815036e6d7af1ba76b645cba2086eb_1178_1178)
      Toggle commit list
    Please register or sign in to reply
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Oct 15, 2021
    Resolved by Lee Munkyeong Oct 15, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
    1273 1302 }
    1274 1303
    1275 1304 /**
    1305 * 作業データ更新処理
    1306 * @param operationId 作業ID
    1307 * @param reportType 作業タイプ
    1308 * @param buttonEventFlag ボタンイベントフラグ
    1309 * @return エラー文言
    1310 */
    1311 public String syncOperation(final long operationId, int reportType, boolean buttonEventFlag) {
    1312 final StringBuilder errorMsg = new StringBuilder();
    1313 Logger.i(TAG, "---sync start");
    • Jung Kwangkyu @jung-k commented Oct 15, 2021
      Master

      必要なログですか?デバッグためだったら削除しましょう。

      Edited Oct 15, 2021 by Jung Kwangkyu
      必要なログですか?デバッグためだったら削除しましょう。
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Oct 15, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7276&start_sha=9cbda6fd8439b946b025aec931123dc1a48f55e7#e59744bb2eed89bb0481731e7fd3e60b44c4c163_1313_1313)
      Toggle commit list
    Please register or sign in to reply
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Oct 15, 2021
    Resolved by Lee Munkyeong Oct 15, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
    1325 progressDialogHorizontal.setProgress(progressDialogHorizontal.getProgress() + progress);
    1326 }
    1327 });
    1328 return null;
    1329 }
    1330 };
    1331
    1332 // 報告送信
    1333 mOperationLogic.sendTaskReportSendData(operationId, progressCallback);
    1334
    1335 //工程全削除の送信(連続作業)
    1336 if (reportType == Constant.ReportType.ReportContinuous) {
    1337 if (!mOperationLogic.deleteProcess(operationId)) { //工程全削除送信失敗時
    1338 return PatternStringUtil.patternToString(getApplicationContext(),
    1339 R.string.msg_error_all_process_delete,
    1340 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
    • Jung Kwangkyu @jung-k commented Oct 15, 2021
      Master

      「0」はハードコーディングではなく、定数にしましょう。

      Edited Oct 15, 2021
      「0」はハードコーディングではなく、定数にしましょう。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Oct 15, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7277&start_sha=bb556ea24681380d68a996d49e8c5aad5a238a94#e59744bb2eed89bb0481731e7fd3e60b44c4c163_1338_1340)
      Toggle commit list
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    added 1 commit

    • bb556ea2 - コードレビュー対応

    Compare with previous version

    Oct 15, 2021

    added 1 commit

    • bb556ea2 - コードレビュー対応

    Compare with previous version

    added 1 commit * bb556ea2 - コードレビュー対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7276&start_sha=9cbda6fd8439b946b025aec931123dc1a48f55e7)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 1e9de99e - ハードコーディング修正

    Compare with previous version

    Oct 15, 2021

    added 1 commit

    • 1e9de99e - ハードコーディング修正

    Compare with previous version

    added 1 commit * 1e9de99e - ハードコーディング修正 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/238/diffs?diff_id=7277&start_sha=bb556ea24681380d68a996d49e8c5aad5a238a94)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Oct 15, 2021

    resolved all discussions

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

    merged

    Oct 15, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit 2044e9c0

    Oct 15, 2021

    mentioned in commit 2044e9c0

    mentioned in commit 2044e9c072c671ea92896e7fd35e2e7276df9fc6
    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
Jung Kwangkyu
Assignee
Jung Kwangkyu @jung-k
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!238
×

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.