Commit graph

164 commits

Author SHA1 Message Date
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
29bce486d2 Add user-select: all for easier copy when the clipboard is not available 2022-07-27 00:17:50 +02:00
4e63112182 Share as b64 and add toast w/ clipboard filling 2022-07-27 00:13:16 +02:00
117a5eb0b1 Move the share button (useful on mobile) 2022-07-26 23:05:41 +02:00
df1140649e Fix date selection 2022-07-26 22:50:16 +02:00
a61d87b161 Add share modal 2022-07-26 22:50:16 +02:00
9d9a1a09d9 Factorise l'url, et rajoute la sélection de la vue 2022-07-26 22:50:16 +02:00
8279d15c04 Add initial date selection via querystring 2022-07-26 22:50:16 +02:00
bc634a8c35 Merge pull request 'Don't change scrolling state when changing date' (#35) from dont_change_scroll_when_changing_date into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/35
2022-07-26 22:49:52 +02:00
sinavir
06586f8757 Don't change scrolling state when changing date 2022-07-26 16:48:06 +02:00
0233ce33c2 Merge pull request 'Add event full name at hover' (#31) from thubrecht/tooltip into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/31
2022-07-26 14:42:06 +02:00
1561f8d350 Add tooltips with the names of the events 2022-07-26 14:38:23 +02:00
b7aa57c149 Merge pull request 'Resource timelines for room-based views' (#29) from resource-timelines into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/29
2022-07-26 14:36:32 +02:00
fb034e4b65 Fix location 2022-07-26 14:34:26 +02:00
Raito Bezarius
5c1c12b413 feat: group resources, decrease width, perform adhoc patches of location with a static map 2022-07-26 13:07:03 +02:00
def6868588 Add locations 2022-07-26 02:32:26 +02:00
Raito Bezarius
433568751c feat: associate events with resource IDs 2022-07-26 01:07:03 +02:00
Raito Bezarius
788694dae5 dependencies: downgrade to ^5.10.1 because of upstream issues 2022-07-26 01:07:03 +02:00
Raito Bezarius
2269dd540f feat: add resource timelines with ENS locations 2022-07-26 01:06:53 +02:00
c7605f42ba Merge pull request 'better_display_on_small_screens' (#24) from better_display_on_small_screens into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/24
2022-07-26 00:46:41 +02:00
sinavir
17aa03295c title on top on mobiles 2022-07-26 00:44:15 +02:00
sinavir
ef12ad4be5 better_display_on_small_screens 2022-07-26 00:44:15 +02:00
679c7a0397 Fix display issue 2022-07-26 00:43:42 +02:00
7edd149351 Merge pull request 'rentrée admin' (#27) from rentree-admin into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/27
2022-07-26 00:42:46 +02:00
sinavir
b9f69d951d Merge branch 'master' into rentree-admin 2022-07-25 23:53:00 +02:00
sinavir
b3f838f4bc typos 2022-07-25 23:50:12 +02:00
sinavir
7cf094f091 calendriers de rentree de l'admin 2022-07-25 23:35:38 +02:00
b1eee6e163 Merge pull request 'Rajoute un calendrier pour la Nuit' (#22) from thubrecht/cal-nuit into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/22
2022-07-25 20:47:35 +02:00
283ba5082e Show the calendar 2022-07-24 18:52:58 +02:00
efec6f582d Fix syntax 2022-07-24 18:49:20 +02:00
897fc362fa Rajoute un calendrier pour la Nuit 2022-07-24 18:49:20 +02:00
sinavir
b84d071f5a rentrée admin: typos 2022-07-23 00:59:58 +02:00
sinavir
a2405b3e6a rentrée admin 2022-07-23 00:58:16 +02:00
1361078402 Merge pull request 'new calendar for cof events' (#25) from new_event_cal into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/25
2022-07-19 14:37:02 +02:00
sinavir
a82a7b22c5 add short name to cof calendars 2022-07-19 14:07:15 +02:00
sinavir
44f874722f update tree 2022-07-19 00:41:41 +02:00
sinavir
d5afde9089 new calendar for cof events 2022-07-19 00:27:55 +02:00
sinavir
f877eda899 add_cof (#23)
On ajoute le cof et on le met avant les clubs

Co-authored-by: sinavir <sinavir@sinavir.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/23
Co-authored-by: sinavir <maurice.debray@ens.fr>
Co-committed-by: sinavir <maurice.debray@ens.fr>
2022-07-18 13:47:05 +02:00
183d0df233 thubrecht/inutile (#19)
Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/19
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-03-29 20:39:06 +02:00
6f9a84fed6 Add pre-selection of calendars (#20)
Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Co-authored-by: Raito Bezarius <masterancpp@gmail.com>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/20
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-03-29 20:33:05 +02:00
1559e5cdd9 Rajoute le téléchargement des calendriers (#17)
Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/17
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-03-29 20:22:05 +02:00