WIP: fix/ui_and_asso_info #4

Draft

ljahier wants to merge 6 commits from fix/ui_and_asso_info into main

pull from: fix/ui_and_asso_info

merge into: purr:main

purr:main

purr:feature_admin_bo

purr:chore_new_version

purr:emrys/feat/local-dev-branch

purr:aeris

Conversation 0 Commits 6 Files changed 62 +1060 -1872

ljahier commented 2025-12-30 15:58:18 +00:00

Member

Copy link

No description provided.

ljahier added 23 commits 2025-12-30 15:58:19 +00:00

chore(frontend): refacto + new design + consistency + tooling + new mandat page 0517dd1f7f

feat(api): convert to multi-crate workspace c3a0f4cf58

feat(agir-core): implement VSA with user, auth, and mandat 5557c599e8

feat(agir-user): implement VSA with user, auth, and mandat + documenso connector 757faac32d

chore: cleanup 5b6d164484

chore: add ci 53120a276f

chore: fix tests 7349888ea5

chore: remove useless code b632cb87c6

chore: update ci 93a7d535bb

feat: add utoipa and typescript sdk generation e00842a6d5

feat(api): add violation_type, description, and attachments to signature mandat c2db3f0d12

feat: wire api and app 870a257495

chore: cleanup + add docker compose for dev 3a40f4d9cc

fix(frontend): mandat signature page issue a107c0a068

feat: remove totp step at register 11e1e65ced

feat: add 2fa in user account settings 9d452533e1

feat: use documenso v2 api 1b53b71114

chore: update build f7a8de0d7c

chore: remove i18n a049b5ffe4

chore: improve api config handling 8a280f6604

--amend 7558e10643

chore: cleanup + make email leak impossible 5952422346

fix: move from red to blue for info card + add asso info c79ea57161

ljahier changed title from fix/ui_and_asso_info to WIP: fix/ui_and_asso_info 2025-12-30 15:58:57 +00:00

Some checks failed

Hide all checks

CI / Style (pull_request) Has been cancelled

Details

CI / Test (pull_request) Has been cancelled

Details

This pull request has changes conflicting with the target branch.

• .env.sample
• Cargo.lock
• Cargo.toml
• app/pnpm-lock.yaml
• app/src/assets/main.css
• app/src/components/Navbar.vue
• app/src/components/account/BackupCodesDisplay.vue
• app/src/components/account/ConfirmationModal.vue
• app/src/components/account/PasswordPolicyHint.vue
• app/src/components/account/TwoFactorSetup.vue

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin fix/ui_and_asso_info:fix/ui_and_asso_info

git switch fix/ui_and_asso_info

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff fix/ui_and_asso_info

git switch fix/ui_and_asso_info

git rebase main

git switch main

git merge --ff-only fix/ui_and_asso_info

git switch fix/ui_and_asso_info

git rebase main

git switch main

git merge --no-ff fix/ui_and_asso_info

git switch main

git merge --squash fix/ui_and_asso_info

git switch main

git merge --ff-only fix/ui_and_asso_info

git switch main

git merge fix/ui_and_asso_info

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

purr/agir!4

No description provided.