Commit graph

154 commits

Author SHA1 Message Date
64534b2bf7 Répare l'indentation 2023-03-07 22:45:04 +01:00
871b7eaaf8 Rajoute PLS 2023-03-06 18:42:07 +01:00
7d2662d00a Merge pull request 'change_bds' (#63) from change_bds into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/63
2023-02-24 15:47:43 +01:00
sinavir
629bb480ea change_bds 2023-02-24 14:30:29 +01:00
86da9646d8 Merge pull request 'add_ulmity' (#61) from add_ulmity into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/61
2023-02-22 19:38:21 +01:00
sinavir
05c7174f5f add_ulmity 2023-02-22 19:38:01 +01:00
7ce999c365 Merge pull request 'add_club_bouffe' (#62) from add_club_bouffe into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/62
2023-02-22 19:37:46 +01:00
sinavir
985e6561b8 add_club_bouffe 2023-02-22 17:32:16 +01:00
f9ebe70653 Merge pull request 'Add psychédéliste' (#60) from add_liste_cof into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/60
2022-12-04 11:53:48 +01:00
sinavir
036ba938ae Add psychédéliste 2022-12-03 22:38:42 +01:00
4af6452003 Merge pull request 'add_homonerie' (#59) from add_homonerie into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/59
2022-11-12 22:10:34 +01:00
sinavir
0e172f5569 add_homonerie 2022-11-12 21:54:48 +01:00
aa697799bc Change things 2022-10-28 13:39:31 +02:00
58597c8076 Set timeout during loading to prevent a calendar from blocking the view 2022-10-28 13:34:43 +02:00
142b841397 Formatting 2022-10-25 10:39:28 +02:00
75e9a5c281 Merge pull request 'remove rentrée' (#57) from remove_rentree into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/57
2022-10-25 10:26:15 +02:00
sinavir
d958b817f3 remove rentrée 2022-10-25 10:23:24 +02:00
06ef17e8f5 Merge pull request 'Add ambassadeurices santé' (#56) from add_ambassadeurices_sante into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/56
2022-10-25 10:07:19 +02:00
sinavir
a5353b0c9e revert remove of "rentrée" 2022-10-25 10:04:41 +02:00
sinavir
b40b7494a4 Add ambassadeurices santé 2022-10-24 18:59:25 +02:00
26cb575a54 Don't try to show a tooltip when no title is defined 2022-10-10 18:20:54 +02:00
3e84c21e00 Merge pull request 'add club jeux' (#55) from add_club_jeux into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/55
2022-10-10 14:08:14 +02:00
sinavir
4a1e24c1d3 add club jeux 2022-10-10 13:26:24 +02:00
3a2502acbe Add Écocampus 2022-09-29 18:44:41 +02:00
7eb5ee2dfd Merge pull request 'add separate calendar for bda' (#54) from add_separate_calendar_for_bda into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/54
2022-09-29 08:52:11 +02:00
sinavir
5c415b6a04 better naming 2022-09-28 17:11:46 +02:00
sinavir
4444649136 add separate calendar for bda 2022-09-28 13:38:33 +02:00
e420cdd0b4 Move room and calendar data to a specific folder (#52)
On met tout dans /data pour décorréler les sources du calendrier de la logique au maximum

Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/52
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-09-12 17:46:54 +02:00
26ccb5dcc9 Rajoute la banda et DDR (#51)
Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/51
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-09-12 13:30:29 +02:00
a958ba4b2a Merge pull request 'add_bds' (#49) from add_bds into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/49
2022-08-27 21:20:27 +02:00
sinavir
f9a9009914 add_bds 2022-08-27 21:19:32 +02:00
sinavir
6849eaed06 Add a favicon (#48)
Co-authored-by: sinavir <sinavir@sinavir.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/48
Co-authored-by: sinavir <maurice.debray@ens.fr>
Co-committed-by: sinavir <maurice.debray@ens.fr>
2022-08-15 13:49:24 +02:00
0ee44ac32a Merge pull request 'Raccourcit les liens de partage' (#47) from thubrecht/reduce-share into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/47
2022-08-04 23:32:10 +02:00
6aa3c6820c Raccourcit les liens de partage 2022-08-02 18:08:58 +02:00
30259d31bd Merge pull request 'Fix tooltip not disapearing' (#45) from thubrecht/tooltip into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/45
2022-07-28 23:29:34 +02:00
12226dcd25 Fix tooltip not disapearing 2022-07-28 21:38:33 +02:00
f792566d06 Merge pull request 'Better print quality' (#43) from thubrecht/print into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/43
2022-07-28 18:56:23 +02:00
ff1b211bbb Hide more stuff 2022-07-28 18:51:31 +02:00
df690a6289 Better print quality 2022-07-28 18:51:30 +02:00
43b6dbcba1 Merge pull request 'Update share modal' (#42) from thubrecht/link into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/42
2022-07-28 18:49:32 +02:00
9bc5e860ea Update share modal 2022-07-28 18:49:06 +02:00
36723000b0 Merge pull request 'Only show the loading on the view' (#41) from thubrecht/share into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/41
2022-07-28 18:48:10 +02:00
8e5d9bb657 Move spinner to its own file, and only mask the current view, not the whole window 2022-07-28 14:16:52 +02:00
b7bf1f96a7 Add bootstrap as dev dependency 2022-07-28 13:43:44 +02:00
950d690020 Tweaks 2022-07-27 21:48:31 +02:00
978d8626b7 Merge pull request 'Add a loading indication' (#36) from thubrecht/spinner into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/36
2022-07-27 17:51:38 +02:00
c7cc8dcd84 Add a loading indication 2022-07-27 17:37:34 +02:00
8ba44c472f Fix share link 2022-07-27 01:23:21 +02:00
a837e7ef5d Merge pull request 'Export current view as a share link' (#34) from thubrecht/selection into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/34
2022-07-27 01:17:44 +02:00
4a7414cb11 Permet de basculer du partage en base64 à un partage normal 2022-07-27 01:09:07 +02:00