Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: modal to add favourite activity #1794

Merged
merged 31 commits into from
Jan 21, 2025
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2b593ff
feat: refacto favorite actvity api to support consep
Dec 4, 2024
e95dd53
feat: add fav act page for consep
Dec 9, 2024
eddf779
Merge branch 'main' into feat/1580-list-favorite-activity-in-consep
Dec 9, 2024
f0ce209
feat: add migration for consep favorite activity
Dec 9, 2024
c7b62aa
feat: add all the activities in consep
Dec 10, 2024
03555f6
feat: add department key in favActivityTypes
Dec 10, 2024
5a2c6f0
feat: modal to add favourite activity
Dec 20, 2024
de82cd3
Merge branch 'main' into feat/1580-list-favorite-activity-in-consep
xiaopeng0202 Jan 3, 2025
97d998d
fix: address pr comment
Jan 7, 2025
304c4b0
fix: favourite act testing
Jan 7, 2025
62b74f5
Merge branch 'main' into feat/1580-list-favorite-activity-in-consep
xiaopeng0202 Jan 7, 2025
576c289
fix: fix style
Jan 7, 2025
b3fe626
fix: revert port
Jan 7, 2025
a0d945e
fix: merge conflit
Jan 7, 2025
25584d0
fix: testings
Jan 7, 2025
fc75a01
fix: testings
Jan 8, 2025
4190bd7
fix: testings
Jan 8, 2025
a9848a5
fix: testings
Jan 8, 2025
85875ed
fix: style
Jan 8, 2025
f1bc406
fix: style
Jan 8, 2025
b433bfb
fix: remove comment
Jan 8, 2025
52c99d2
Merge branch 'main' into feat/1580-list-favorite-activity-in-consep
xiaopeng0202 Jan 13, 2025
a731ee5
fix: update folder name
Jan 13, 2025
5b47f13
fix: eslint
Jan 13, 2025
482e9fd
fix: eslint
Jan 13, 2025
39870e0
fix: eslint
Jan 13, 2025
b49ba4d
Merge branch 'feat/1580-list-favorite-activity-in-consep' into feat/1…
Jan 14, 2025
25913ea
fix: address pr comments
Jan 14, 2025
9f5fc99
fix: merge conflit
Jan 14, 2025
157ad4a
fix: address more pr comments
Jan 21, 2025
3fc3c9e
fix: address merge conflits
Jan 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into feat/1580-list-favorite-activity-in-consep
xiaopeng0202 authored Jan 13, 2025
commit 52c99d2b152f6d842a2f35c23e81048e248124ea

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.