Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity
415 Commits 5 Branches 1 Tag
8724748642f6c76cb4c70e21e3a13a1a13664774
Commit Graph

415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LeoMoulin
67fa630ecf e 2024-03-23 18:04:36 +01:00
LeoMoulin
ad0e7b3e35 - Ajoute un champ year dans UserCurriculum pour différencier les anciers cursus de l'actuel pour l'étudiant 
- Ajoute la table ExemptionsRequest
- Ajoute la table ScholarshipRequest
- Ajoute la table UninscriptionRequest
 2024-03-23 14:08:03 +01:00
Wawilski
9de4b06e75 Login 'fixed' 2024-03-23 13:57:46 +01:00
Wawilski
123fa97611 Merge branch 'wal/front/temp' into tonitch/front/fullSpaceApp 2024-03-22 20:15:45 +01:00
Wawilski
1fad792be7 Just to merge 2024-03-22 20:14:20 +01:00
Anthony Debucquoy
acd1262955 Make app use full space 2024-03-22 13:56:04 +01:00
Anthony Debucquoy
3d6941ab93 adding cdn to CI 2024-03-18 21:39:31 +01:00
Anthony Debucquoy
de72bd800c CI fix 2024-03-18 21:13:00 +01:00
Debucquoy Anthony
b465dcfa92 Merge pull request 'Clean le projet' (#146) from Leo/Backend/Cleaning into master 
Reviewed-on: PGL/Clyde#146
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 21:06:02 +01:00
LeoMoulin
73f3df0bc6 Clean le projet 2024-03-18 20:54:16 +01:00
Debucquoy Anthony
90a7b7b70e Merge pull request 'Link back and front all get' (#115) from wal/front/listingUsers into master 
Reviewed-on: PGL/Clyde#115
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
jalonA 		2024-03-18 20:20:35 +01:00
Debucquoy Anthony
4f002a29e1 Merge pull request 'added delete self' (#145) from Max/Backend/UserDelete into master 
Reviewed-on: PGL/Clyde#145
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 20:19:41 +01:00
LeoMoulin
66d090d045 Merge pull request 'Leo/Backend/UnitTest' (#138) from Leo/Backend/UnitTest into master 
Reviewed-on: PGL/Clyde#138
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
 2024-03-18 19:21:54 +01:00
Wawilski
4715441afd FINAL COMMIT 2024-03-18 18:47:00 +01:00
Wawilski
77ac771b8f Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 17:36:07 +01:00
Wawilski
3762750968 Tempo 2024-03-18 17:34:35 +01:00
Bartha Maxime
a276c24f8f added delete self 2024-03-18 17:30:04 +01:00
Wawilski
25c5c1b018 Nearly finish 2024-03-18 17:28:14 +01:00
LeoMoulin
c7f37b0854 Fix le truc de max et ajoute le test du delete 2024-03-18 15:55:38 +01:00
Wawilski
c35f675a11 Manage course + delete course END 2024-03-18 15:47:04 +01:00
Wawilski
a9e5e45872 Merge branch 'master' into wal/front/listingUsers 2024-03-18 14:57:49 +01:00
Wawilski
73d50f3f50 Merge remote-tracking branch 'refs/remotes/origin/wal/front/listingUsers' into wal/front/listingUsers 2024-03-18 14:52:29 +01:00
Wawilski
0871d2971d manage Course finished 2024-03-18 14:51:27 +01:00
LeoMoulin
9744bd973f Resolve conflicts and adapt tests 2024-03-18 14:29:30 +01:00
LeoMoulin
ecaa0af24a Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
#	backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
 2024-03-18 13:55:45 +01:00
Anthony Debucquoy
a762b6875d removing cdn 2024-03-18 13:54:31 +01:00
Debucquoy Anthony
4e6c4ecf38 Merge pull request 'added GET /user/{id}' (#143) from Max/Backend/GetUserById into master 
Reviewed-on: PGL/Clyde#143
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
 2024-03-18 13:48:07 +01:00
Anthony Debucquoy
ec3c912847 Merge remote-tracking branch 'origin/master' into Max/Backend/GetUserById 2024-03-18 13:45:47 +01:00
Debucquoy Anthony
5636d96478 Merge pull request 'Max/Backend/UserDelete' (#144) from Max/Backend/UserDelete into master 
Reviewed-on: PGL/Clyde#144
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-18 13:45:04 +01:00
Anthony Debucquoy
d40ceff2ba disable test on ci, problem for later 2024-03-18 12:41:18 +01:00
Bartha Maxime
fd357ba938 GET /curriculum returns user's curriculum 2024-03-18 12:15:13 +01:00
Wawilski
92079c5a47 Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 11:59:44 +01:00
Wawilski
753af3874e Login and register ok and starting requests 2024-03-18 11:55:51 +01:00
Bartha Maxime
e03a01ec89 oups forgot somthing 2024-03-18 11:53:33 +01:00
Bartha Maxime
fd18df7c3a added a InscriptionRequest to POST /mock 2024-03-18 11:33:50 +01:00
Bartha Maxime
93c161be4c added every delete endpoint required 2024-03-18 11:22:21 +01:00
Anthony Debucquoy
853a3a42d2 Small improvement 2024-03-18 02:14:36 +01:00
Bartha Maxime
a80fb2b297 added DELETE user and prepared tables for cascade deletion 2024-03-18 00:14:48 +01:00
Bartha Maxime
f484fb095e added protection for inscription requests 2024-03-18 00:14:26 +01:00
Wawilski
8ff29ca34e Register 2024-03-17 23:19:36 +01:00
Anthony Debucquoy
611e7167f9 CI -> build no test and trying to fix test 2024-03-17 22:40:22 +01:00
Anthony Debucquoy
ee37dc79a7 Fixing the CI 
Moving the dev test and build to port 5442 from 5432 to avoid
conflicting with the running postgresql
 2024-03-17 22:02:12 +01:00
Bartha Maxime
2fb6aef67c added GET /user/{id} 2024-03-17 22:01:48 +01:00
Wawilski
7e7cec2f6c Merge branch 'Max/Backend/GetUserById' into wal/front/listingUsers 2024-03-17 22:00:56 +01:00
Bartha Maxime
345599888d added GET /user/{id} 2024-03-17 21:48:58 +01:00
Wawilski
19b4950be4 Merge branch 'master' into wal/front/listingUsers 2024-03-17 21:39:04 +01:00
Wawilski
d9307753c4 trop de truc 2024-03-17 21:38:10 +01:00
Maxime
7a23dcc96a Merge pull request 'Max/Backend/ReturnUserPasswordIssue' (#137) from Max/Backend/ReturnUserPasswordIssue into master 
Reviewed-on: PGL/Clyde#137
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
 2024-03-17 21:36:53 +01:00
LeoMoulin
f2b80ba89f Resolve conflicts and resolve condition bug in isNotSecretaryOrAdmin 2024-03-17 19:17:38 +01:00
LeoMoulin
114116b97c Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest 
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
 2024-03-17 19:14:25 +01:00