Commit graph

145 commits

Author SHA1 Message Date
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
2a5f56ff37 Don't open the help by default 2022-03-13 19:18:27 +01:00
be835ee14f Rajoute timeGridDay en version mobile 2022-03-13 19:14:23 +01:00
b19ef82b6d Rajoute un message d'aide 2022-03-13 18:35:47 +01:00
ed6ea39d3c Change TriStateCheckbox a bit 2022-03-13 13:10:43 +01:00
78c1b9b918 Remove console.log 2022-03-12 16:42:45 +01:00
Raito Bezarius
119f9660e3 calendar: add time grid day view 2022-03-12 16:41:34 +01:00
Raito Bezarius
653d9c8bc1 calendar: add Framagenda.org support, CinéClub URL 2022-03-12 16:41:34 +01:00
22f055decc Ajoute le support des statuts d'évènements 2022-03-12 16:39:58 +01:00
Raito Bezarius
0673b3e455 loading: enable progressive rendering for all our sources asynchronously 2022-03-11 22:53:03 +01:00
Raito Bezarius
0bfb5e2bd8 month-view: next day threshold is at 5 AM (K-Fet request) 2022-03-11 22:50:15 +01:00
Raito Bezarius
103632cc9d calendar: Fanfare → Ernestophone… 2022-03-11 22:43:13 +01:00
Raito Bezarius
231c795b7c calendars: add Club inutile, CinéClub, Fanfare (with backend) 2022-03-11 18:27:20 +01:00
779a6b628c Add markdown support in description (#14)
Fixes #8

Co-authored-by: Tom Hubrecht <tom.hubrecht@ens.fr>
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/14
Co-authored-by: tomate <tom.hubrecht@ens.fr>
Co-committed-by: tomate <tom.hubrecht@ens.fr>
2022-03-07 19:53:48 +01:00
b0729d0c2d Merge pull request 'Add default location' (#13) from thubrecht/default_location into master
Reviewed-on: https://git.rz.ens.wtf/Klub-RZ/metis/pulls/13
2022-03-07 17:31:19 +01:00
e967664769 Start the view to now 2022-03-07 11:41:32 +01:00
4bbe0cb856 Fix body shift when opening modal 2022-03-07 11:36:13 +01:00
232a06feee Allow collapsing of groups 2022-03-07 11:29:45 +01:00
933c176601 Add default location 2022-03-07 10:59:05 +01:00
27d904871d Add color to the K-Fêt calendar 2022-03-07 08:33:46 +01:00