1
0
forked from PGL/Clyde
Commit Graph

618 Commits

Author SHA1 Message Date
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
1a266cdfbd post User by secretary 2024-04-21 23:14:56 +02:00
32810a9b01 Merge pull request 'oof' (#171) from oof into master
Reviewed-on: PGL/Clyde#171
2024-04-21 23:09:52 +02:00
217ad7f0d1 oof 2024-04-21 23:07:04 +02:00
2d20b45c3a Merge pull request 'Better login' (#170) from betterlogin into master
Reviewed-on: PGL/Clyde#170
2024-04-21 22:35:20 +02:00
9cbdaac09d Better login 2024-04-21 22:31:56 +02:00
a90243f4b9
fix register 2024-04-21 22:16:08 +02:00
Wal
636e17b4bf Merge pull request 'Add Course to Curriculum' (#169) from AddBranchToCurriculum into master
Reviewed-on: PGL/Clyde#169
2024-04-21 21:56:14 +02:00
9cd54bdae9 Merge remote-tracking branch 'origin/master' into AddBranchToCurriculum 2024-04-21 21:51:14 +02:00
69be9681ff Add course to Curriculum 2024-04-21 21:50:38 +02:00
98082f34b7 Merge pull request 'tonitch/feat/notifications' (#159) from tonitch/feat/notifications into master
Reviewed-on: PGL/Clyde#159
2024-04-21 20:19:47 +02:00
43883caef0
Merge remote-tracking branch 'origin/master' into tonitch/feat/notifications 2024-04-21 20:19:17 +02:00
88b057e19d
Merge branch 'master' into tonitch/feat/notifications 2024-04-21 20:16:07 +02:00
260191d790
archiving 2024-04-21 20:15:47 +02:00
608b6e4893 added reesearcher manager for secretary 2024-04-21 20:07:21 +02:00