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.

Sign up for GitHub

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

Jump to bottom

Final merge #28

Merged
merged 74 commits into from
Sep 3, 2024
Merged

Final merge #28

merged 74 commits into from
Sep 3, 2024

Conversation

JarodCouprie
Copy link
Owner

No description provided.

TheoRoblin and others added 30 commits August 16, 2024 13:59
@TheoRoblin
feat(organisation): wip service/equipe
6e79a0d
@TheoRoblin
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat/sirh…
314241e 
…_39_organisation
@TheoRoblin
feat(organisation): wip department/team
f4e7a2f
@TheoRoblin
feat(organisation): delete agency
46955f1
@jarod-empirys
feat(ui): update badge color
3c79044
@TheoRoblin
fix(organisation): create department
971a21d
@TheoRoblin
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
f150214 
…feat/sirh_39_organisation
@jarod-empirys
fix(tables): add table row
edf83d7
@jarod-empirys
fix(users): fix paginator accessibility
c1dda57
@TheoRoblin
fix(demand): delete toString()
b24a598
@TheoRoblin
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
060ee7e 
…feat/sirh_39_organisation
@jarod-empirys
fix(users): fix accessibility
897ee06
@Ethan-C11
fix(expense): fixed front-end
78cfea2
@jarod-empirys
fix(project): fix accessibility
13b973c
@TheoRoblin
fix(demand): fix api call
bbc473b
@TheoRoblin
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
d2da5e8 
…feat/sirh_39_organisation
@jarod-empirys
fix(users): fix typo
565eb0b
@TheoRoblin
feat(organisation): add data in front
43cd88b
@TheoRoblin
fix(organisation): fix front
1134d1e
@JarodCouprie
feat(notification): wip notifications
dbb1394
@JarodCouprie
feat(notification): notifications tab front
b77b371
@jarod-empirys
feat(project): add gitignore
1cf7c05
@TheoRoblin
feat(organisation): wip team
e192b62
@TheoRoblin
fix(project): add logo
42e2dab
@TheoRoblin
feat(organisation): detail team + suppresion team
1a1f375
@TheoRoblin
feat(organisation): can edit member team
5319e64
@JarodCouprie
fix(accessibility): add meta to index.html
6b9e119
@jarod-empirys
feat(project): update README.md and add tests
d105c4d
@TheoRoblin
feat(organisation): wip
07454db
@TheoRoblin
Merge remote-tracking branch 'origin/feat/sirh_39_organisation' into …
f27b03f 
…feat/sirh_39_organisation
Ethan-C11 and others added 23 commits September 2, 2024 09:31
@Ethan-C11
Merge branch 'dev' into feat/sirh_swagger
f50aa6d
@Ethan-C11
Merge branch 'dev' into feat/sirh_swagger
7f45334
@TheoRoblin
feat(dev): add agency data
d2aef7f
@Ethan-C11
feat(tests): fix expenses tests
9335d18
@TheoRoblin
Merge pull request #26 from JarodCouprie/feat/sirh_swagger
04ee019 
Feat/sirh swagger
@TheoRoblin
fix(organisation): bug member present
6864100
@TheoRoblin
Merge remote-tracking branch 'origin/dev' into feat/sirh_39_organisation
6f8f18b 
# Conflicts:
#	api-server/src/resources/expense/ExpenseService.ts
#	react-app/src/components/navigation/UserMenu.tsx
@jarod-empirys
feat(notification): send notifications
06802ba
@jarod-empirys
feat(notification): wip websocket
7a99363
@TheoRoblin
feat(swagger): swagger agency, demand, department and team
0a32907
@Ethan-C11
feat(swagger): swagger expenses controller
31673ba
fix(expenses): Fixed data.sql to include data from september
64f4c2e
fix(expenses): Fixed getExpensesValuesByUserId Repository ORDER BY
e8dc58a
@JarodCouprie
fix(notification): socket working
1d359d7
@JarodCouprie
fix(dashboard): wip layout
45a1e2c
@jarod-empirys
feat(dashboard): dashboard layout
9f2cbab
@TheoRoblin
fix(dev): icone and data
b0f6842
@jarod-empirys
feat(notification): fix typo
277e8a3
@jarod-empirys
feat(dashboard): layout
4077bbb
@jarod-empirys
Merge branch 'dev' into feat/sirh_56_notifications
abc37d0 
# Conflicts:
#	api-server/package-lock.json
#	api-server/package.json
#	api-server/sql/data.sql
#	api-server/src/index.ts
@jarod-empirys
feat(project): merge from dev
150726a
@jarod-empirys
feat(project): display routes
3308038
@Ethan-C11
Merge pull request #27 from JarodCouprie/feat/sirh_56_notifications
efd496c 
Feat/sirh 56 notifications
Ethan-C11
Ethan-C11 approved these changes Sep 3, 2024
View reviewed changes
Copy link
Collaborator

@Ethan-C11 Ethan-C11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing weird here, ok for me👍

TheoRoblin
TheoRoblin approved these changes Sep 3, 2024
View reviewed changes
Copy link
Collaborator

@TheoRoblin TheoRoblin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked !

@TheoRoblin TheoRoblin merged commit e22e59a into main Sep 3, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheoRoblin TheoRoblin TheoRoblin approved these changes

@Ethan-C11 Ethan-C11 Ethan-C11 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JarodCouprie @TheoRoblin @Ethan-C11 @jarod-empirys