WIP: removed hacks #18

Draft

amirjanyanani wants to merge 1 commit from orm-hacks-removal into main

pull from: orm-hacks-removal

merge into: ELFA:main

ELFA:main

ELFA:refactor/split-mail-app

ELFA:workflow-ci

ELFA:import-contacts-fixes

ELFA:onerror-orm

ELFA:contact-filters

Conversation 0 Commits 1 Files changed 7 +32 -111

amirjanyanani commented 2026-11-03 11:41:38 +01:00

Owner

Copy link

No description provided.

amirjanyanani added 1 commit 2026-11-03 11:41:38 +01:00

removed hacks; updated dependencies: @ng-org/web, @ng-org/orm, and @ng-org/shex-orm to their latest versions. db36bbf7dc

This pull request has changes conflicting with the target branch.

• package-lock.json
• package.json
• shared/ui/hooks/contact/use-ng-contact-card-recovery.ts
• shared/ui/hooks/contact/use-ng-contact-card.ts

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'WIP: removed hacks' (#18) from orm-hacks-removal into main

Merge commit body Reviewed-on: https://git.elfaconsortium.eu/ELFA/pim-apps/pulls/18

Merge pull request 'WIP: removed hacks' (#18) from orm-hacks-removal into main Reviewed-on: https://git.elfaconsortium.eu/ELFA/pim-apps/pulls/18 Copy merge commit message

Checkout

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

git fetch -u origin orm-hacks-removal:orm-hacks-removal

git switch orm-hacks-removal

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 orm-hacks-removal

git switch orm-hacks-removal

git rebase main

git switch main

git merge --ff-only orm-hacks-removal

git switch orm-hacks-removal

git rebase main

git switch main

git merge --no-ff orm-hacks-removal

git switch main

git merge --squash orm-hacks-removal

git switch main

git merge --ff-only orm-hacks-removal

git switch main

git merge orm-hacks-removal

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

ELFA/pim-apps!18

No description provided.