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

Merged
Opened May 29, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

規約同意画面を追加

規約同意を一通り実装しました。

規約同意画面は、二転三転しましたが、最終的にAlertDialogとして実装しました。

  • 規約同意画面を表示する、AgreementToTermsHelperを追加
  • CMSのAPIを利用するために、AgreementToTermsJSON、AgreementToTermsParameters、AgreementToTermsLogicを追加
  • ログアウト処理をLogoutHelper(新規作成)に移行
  • その他

といった変更を行っています。

Edited May 29, 2023 by Kazuyuki Hida
×

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.500_53088_agreement_to_terms origin/features/1.4.500_53088_agreement_to_terms

Step 2. Review the changes locally

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

git checkout features/1.4.500
git merge --no-ff features/1.4.500_53088_agreement_to_terms

Step 4. Push the result of the merge to GitLab

git push origin features/1.4.500

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 24
  • Changes 18
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida @hida-k

    added 1 commit

    • 9ae2850b - 不要なファイルを削除

    Compare with previous version

    May 29, 2023

    added 1 commit

    • 9ae2850b - 不要なファイルを削除

    Compare with previous version

    added 1 commit * 9ae2850b - 不要なファイルを削除 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/316/diffs?diff_id=11486&start_sha=0ec230c33ad78bd2e9d9504f7884d30a71aae72b)
    Toggle commit list
  • Kazuyuki Hida @hida-k

    added 1 commit

    • d3aea6cc - 不要なコードを削除

    Compare with previous version

    May 29, 2023

    added 1 commit

    • d3aea6cc - 不要なコードを削除

    Compare with previous version

    added 1 commit * d3aea6cc - 不要なコードを削除 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/316/diffs?diff_id=11487&start_sha=9ae2850b020494d5ed9b4f750eaba7006d95d175)
    Toggle commit list
  • Kazuyuki Hida @hida-k

    added 1 commit

    • 6f294325 - 不要なコードを削除

    Compare with previous version

    May 29, 2023

    added 1 commit

    • 6f294325 - 不要なコードを削除

    Compare with previous version

    added 1 commit * 6f294325 - 不要なコードを削除 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/316/diffs?diff_id=11488&start_sha=d3aea6cc24ed3d53697a36fd816f6885281dbce2)
    Toggle commit list
  • Kazuyuki Hida @hida-k

    added 1 commit

    • f732d5a6 - プログレスアイコンを閉じる処理を変更

    Compare with previous version

    May 29, 2023

    added 1 commit

    • f732d5a6 - プログレスアイコンを閉じる処理を変更

    Compare with previous version

    added 1 commit * f732d5a6 - プログレスアイコンを閉じる処理を変更 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/316/diffs?diff_id=11489&start_sha=6f294325070511e7e06074a172effa015146f615)
    Toggle commit list
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    May 29, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Kazuyuki Hida @hida-k

    assigned to @kim_j

    May 29, 2023

    assigned to @kim_j

    assigned to @kim_j
    Toggle commit list
  • Kazuyuki Hida @hida-k

    merged

    May 30, 2023

    merged

    merged
    Toggle commit list
  • Kazuyuki Hida @hida-k

    mentioned in commit 7917561a

    May 30, 2023

    mentioned in commit 7917561a

    mentioned in commit 7917561ab82d9067a0a65ae349009bd182142c9d
    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
Kim Jinsung
Assignee
Kim Jinsung @kim_j
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!316
×

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.