1
0
forked from PGL/Clyde
Commit Graph

632 Commits

Author SHA1 Message Date
96965bde97 Merge pull request 'master' (#187) from Maxime/Clyde:master into master
Reviewed-on: PGL/Clyde#187
2024-04-22 22:13:49 +02:00
302e0b555c Merge remote-tracking branch 'origin/master' 2024-04-22 22:12:57 +02:00
Wal
84a408298d Merge pull request 'Last Correction Schedule' (#186) from miniCorrectionFinal into master
Reviewed-on: PGL/Clyde#186
2024-04-22 22:11:51 +02:00
3b48e5adfb Last Correction Schedule 2024-04-22 22:08:17 +02:00
78da7b23d2
fixup! fix ci 2024-04-22 21:38:50 +02:00
1831cc7eb2
fix ci 2024-04-22 21:05:51 +02:00
Wal
cc51510dac Merge pull request 'Little Correction in schedules' (#185) from origin/littleCorrections into master
Reviewed-on: PGL/Clyde#185
2024-04-22 20:53:53 +02:00
44bb04f21b Little Correction in schedules 2024-04-22 20:49:39 +02:00
1ed61c8c7b Merge pull request 'Fixing tests and tokenService' (#184) from f into master
Reviewed-on: PGL/Clyde#184
2024-04-22 20:44:53 +02:00
59c82d7482 Merge branch 'master' into f 2024-04-22 20:37:59 +02:00
772fa09e28 Fixing tests and tokenService 2024-04-22 20:35:30 +02:00
672fcd099f Merge pull request 'Fixing stuffs' (#183) from e into master
Reviewed-on: PGL/Clyde#183
2024-04-22 18:50:33 +02:00
3198a7ade0 Merge branch 'master' into e 2024-04-22 18:27:51 +02:00
5516f75346 Fixing stuffs 2024-04-22 18:27:06 +02:00
1f66ac5a4d Merge remote-tracking branch 'origin/master' 2024-04-22 18:26:31 +02:00
Wal
59b82abf71 Merge pull request 'Post mock when arrives on the app' (#182) from PostMockAndCorrections into master
Reviewed-on: PGL/Clyde#182
2024-04-22 13:35:10 +02:00
cf0c465248 Merge remote-tracking branch 'origin/master' into PostMockAndCorrections 2024-04-22 13:31:31 +02:00
2917d645fa post Mock and corrections 2024-04-22 13:29:59 +02:00
730a72dba3 added profile picture handling 2024-04-22 13:19:08 +02:00
47eb98da57 Merge pull request 'Cleaning backend' (#181) from e into master
Reviewed-on: PGL/Clyde#181
2024-04-22 13:08:35 +02:00
eafcf6b265 Cleaning backend 2024-04-22 13:06:33 +02:00
34e537ff02 fixed push of researcher 2024-04-22 12:19:21 +02:00
364f39c4bc put the about user in the middle 2024-04-22 11:58:42 +02:00
f2675ed764 Merge remote-tracking branch 'origin/master' 2024-04-22 11:42:48 +02:00
85c1282f48 Merge pull request 'master' (#180) from Maxime/Clyde:master into master
Reviewed-on: PGL/Clyde#180
2024-04-22 11:31:25 +02:00
4d6387ca8b fixed the search input 2024-04-22 11:29:58 +02:00
fa2deca1b9 fix once again the stats and translations 2024-04-22 10:02:45 +02:00
490bf403f0 Merge pull request 'Add the regNo in profile and aboutStudent' (#178) from regNoFix into master
Reviewed-on: PGL/Clyde#178
2024-04-22 09:52:56 +02:00
c61a092809 Add the regNo in profile and aboutStudent 2024-04-22 09:39:48 +02:00
2cffe28720
show regno on options 2024-04-22 09:22:19 +02:00
060526c20d
timer on notifications 2024-04-22 09:09:53 +02:00
af8bc8872d Merge pull request 'fix with the stats and translations' (#177) from Maxime/Clyde:master into master
Reviewed-on: PGL/Clyde#177
2024-04-22 02:28:41 +02:00
12ff43e970 fix with the stats and translations 2024-04-22 02:27:21 +02:00
82cf7cbfaf
removing apps spacing 2024-04-22 01:46:46 +02:00
3b63896439 Merge pull request 'tonitch/front/bar' (#176) from tonitch/front/bar into master
Reviewed-on: PGL/Clyde#176
2024-04-22 01:39:48 +02:00
bd3b03dfea Merge pull request 'ok last one I promise' (#175) from prank into master
Reviewed-on: PGL/Clyde#175
2024-04-22 00:55:40 +02:00
b38b1ab6b8 Merge branch 'master' into prank 2024-04-22 00:51:58 +02:00
6e0a9a46e5 ok last one I promise 2024-04-22 00:50:44 +02:00
2d8fcb4712 Merge pull request 'Fixing some little bugs and details' (#174) from last into master
Reviewed-on: PGL/Clyde#174
2024-04-22 00:42:56 +02:00
fcb48ac71a Fixing some little bugs and details 2024-04-22 00:39:17 +02:00
043f5c87d2
fixup! fix bar height 2024-04-22 00:12:59 +02:00
a03983d625
fix bar height 2024-04-22 00:09:39 +02:00
b382bf957f Merge pull request 'master' (#173) from Maxime/Clyde:master into master
Reviewed-on: PGL/Clyde#173
2024-04-22 00:06:59 +02:00
bbddcb26ad
fixup! Merge pull request 'Notifications on Schedule' (#172) from NotificationSchedule into master 2024-04-22 00:03:45 +02:00
22665f0565 oupsi 2024-04-21 23:57:29 +02:00
d324d7447d fixing my dumb merge 2024-04-21 23:55:07 +02:00
Wal
71c2af7fcb Merge pull request 'Notifications on Schedule' (#172) from NotificationSchedule into master
Reviewed-on: PGL/Clyde#172
2024-04-21 23:39:29 +02:00
c717205764 Notifications Schedule 2024-04-21 23:36:25 +02:00
4d007534b3 Merge remote-tracking branch 'origin/master' 2024-04-21 23:34:19 +02:00
8ac1f7ed8b
notifications forum 2024-04-21 23:25:03 +02:00