Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
D
design
  • 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
  • abookCheck
  • design
  • Merge Requests
  • !5

Merged
Opened Aug 27, 2021 by Takatoshi Miura@miura-t 1 of 2 tasks completed1/2 tasks
  • Report abuse
Report abuse

#44124 カテゴリーが小さく表示されるバグを修正&RFID修正

アプリを新規インストールし、初回起動した時にカテゴリーが小さく表示されるバグを修正しました。 チケットではiPadのみとなっていますがAndroidでも再現していたので直っているか確認をお願いしたいです。

チケット https://redmine.agentec.jp/issues/44124

関連チケット https://redmine.agentec.jp/issues/43868#change-191502

  • @lee-jw
  • @lee-mk
Edited Aug 28, 2021 by Lee Munkyeong
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/1.4.0_miura origin/feature/1.4.0_miura

Step 2. Review the changes locally

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

git checkout feature/1.4.0
git merge --no-ff feature/1.4.0_miura

Step 4. Push the result of the merge to GitLab

git push origin feature/1.4.0

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

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

  • Discussion 0
  • Commits 6
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Takatoshi Miura @miura-t

    added 1 commit

    • d5a12c31 - 1.4.0_miura_#44150 バックグラウンド遷移時にRFID読み込みを終了する修正

    Compare with previous version

    Aug 27, 2021

    added 1 commit

    • d5a12c31 - 1.4.0_miura_#44150 バックグラウンド遷移時にRFID読み込みを終了する修正

    Compare with previous version

    added 1 commit * d5a12c31 - 1.4.0_miura_#44150 バックグラウンド遷移時にRFID読み込みを終了する修正 [Compare with previous version](https://gitlab.agentec.jp/abookCheck/design/merge_requests/5/diffs?diff_id=6991&start_sha=b3b37e646bfe4fa8f58452195cfd7c358ebc4a8c)
    Toggle commit list
  • Takatoshi Miura @miura-t

    added 1 commit

    • e8b2c9e1 - 1.4.0.0_RFID_#44143 RFID(バーコード)メッセージのアラート化

    Compare with previous version

    Aug 28, 2021

    added 1 commit

    • e8b2c9e1 - 1.4.0.0_RFID_#44143 RFID(バーコード)メッセージのアラート化

    Compare with previous version

    added 1 commit * e8b2c9e1 - 1.4.0.0_RFID_#44143 RFID(バーコード)メッセージのアラート化 [Compare with previous version](https://gitlab.agentec.jp/abookCheck/design/merge_requests/5/diffs?diff_id=6996&start_sha=d5a12c3109162ae7073e04551ab63c842504e0f9)
    Toggle commit list
  • Takatoshi Miura @miura-t

    changed title from #44124 カテゴリーが小さく表示されるバグを修正 to #44124 カテゴリーが小さく表示されるバグを修正&RFID修正

    Aug 28, 2021

    changed title from #44124 カテゴリーが小さく表示されるバグを修正 to #44124 カテゴリーが小さく表示されるバグを修正&RFID修正

    changed title from **#44124 カテゴリーが小さく表示されるバグを修正** to **#44124 カテゴリーが小さく表示されるバグを修正{+&RFID修正+}**
    Toggle commit list
  • Takatoshi Miura @miura-t

    changed the description

    Aug 28, 2021

    changed the description

    changed the description
    Toggle commit list
  • Lee Munkyeong @lee-mk

    marked the task @lee-mk as completed

    Aug 28, 2021

    marked the task @lee-mk as completed

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

    assigned to @lee-jw

    Aug 28, 2021

    assigned to @lee-jw

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

    added 4 commits

    • e8b2c9e1...a48ab012 - 3 commits from branch feature/1.4.0
    • e072544c - Merge branch 'feature/1.4.0' into feature/1.4.0_miura

    Compare with previous version

    Aug 28, 2021

    added 4 commits

    • e8b2c9e1...a48ab012 - 3 commits from branch feature/1.4.0
    • e072544c - Merge branch 'feature/1.4.0' into feature/1.4.0_miura

    Compare with previous version

    added 4 commits * e8b2c9e1...a48ab012 - 3 commits from branch `feature/1.4.0` * e072544c - Merge branch 'feature/1.4.0' into feature/1.4.0_miura [Compare with previous version](https://gitlab.agentec.jp/abookCheck/design/merge_requests/5/diffs?diff_id=6999&start_sha=e8b2c9e1faeafe479e8a550b415eb172bb2b892c)
    Toggle commit list
  • Takatoshi Miura @miura-t

    added 1 commit

    • 8906697b - 1.4.0_miura_#44143 RFID(バーコード)のアラートを分岐

    Compare with previous version

    Aug 28, 2021

    added 1 commit

    • 8906697b - 1.4.0_miura_#44143 RFID(バーコード)のアラートを分岐

    Compare with previous version

    added 1 commit * 8906697b - 1.4.0_miura_#44143 RFID(バーコード)のアラートを分岐 [Compare with previous version](https://gitlab.agentec.jp/abookCheck/design/merge_requests/5/diffs?diff_id=7000&start_sha=e072544cdcb2f6ca022c6447a609ade4b018fa88)
    Toggle commit list
  • Takatoshi Miura @miura-t

    added 1 commit

    • 47a688d6 - 1.4.0_miura_#44143 RFID(バーコード)の読み込み表示位置を調整

    Compare with previous version

    Aug 28, 2021

    added 1 commit

    • 47a688d6 - 1.4.0_miura_#44143 RFID(バーコード)の読み込み表示位置を調整

    Compare with previous version

    added 1 commit * 47a688d6 - 1.4.0_miura_#44143 RFID(バーコード)の読み込み表示位置を調整 [Compare with previous version](https://gitlab.agentec.jp/abookCheck/design/merge_requests/5/diffs?diff_id=7002&start_sha=8906697b16eaf436aaf274df0e106b86b32a1ce8)
    Toggle commit list
  • Takatoshi Miura @miura-t

    merged

    Aug 29, 2021

    merged

    merged
    Toggle commit list
  • Takatoshi Miura @miura-t

    mentioned in commit 7321568f

    Aug 29, 2021

    mentioned in commit 7321568f

    mentioned in commit 7321568f2997cb2f8eef0e2052f0b7d481c751aa
    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 JaeWon
Assignee
Lee JaeWon @lee-jw
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abookCheck/design!5
×

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.