3270 Commits

Author	SHA1	Message	Date
Du Peng	19b6bd8d8a	Merge branch 'dev' into staging	2023-09-11 18:18:37 +02:00
Du Peng	16925bf129	(i18n) update translations	2023-09-11 17:08:43 +02:00
Du Peng	33d81c6c36	(feat) add a notification to remind users to upload their supporting documents	2023-09-11 15:52:05 +02:00
Du Peng	fb2b762015	Merge branch 'spaces-machines-tree' into dev	2023-09-11 09:54:08 +02:00
Vincent	aad5da63be	(i18n) Typo	2023-09-11 09:15:00 +02:00
Du Peng	e4bd077907	(feat) Add extra_authorize_params to OpenIdConnect config	2023-09-07 16:22:57 +02:00
Nicolas Florentin	a72c2e580c	improves api/notification controller to avoid failing when there is a notification with wrong notification_type in db	2023-09-07 10:30:48 +02:00
Nicolas Florentin	b458f03e43	add a notification to remind users to upload their supporting documents	2023-09-05 11:15:12 +02:00
Du Peng	7c703433ef	Merge branch 'dev' into staging	2023-09-01 15:56:35 +02:00
Du Peng	e3dc47889b	(i18n) update translations	2023-09-01 15:46:51 +02:00
Nicolas Florentin	4f75a2c20e	adds missing translation	2023-09-01 12:43:59 +02:00
Du Peng	a10f3cffe4	(feat) statistics improvements	2023-09-01 12:43:36 +02:00
Du Peng	fb12b52ec4	Merge branch 'dev' into staging	2023-08-31 17:14:36 +02:00
Nicolas Florentin	fcfa4f018b	Feature: add a filter in members list (admin) to show only "not validated" members	2023-08-30 11:56:24 +02:00
Du Peng	e18b34be3a	(i18n) update translations	2023-08-28 18:33:50 +02:00
Du Peng	e9346afed2	(i18n) update translations	2023-08-24 18:31:56 +02:00
Du Peng	be69befb6b	(feat) add adds coupon in statistic export	2023-08-24 18:31:16 +02:00
Du Peng	b5f330ea5a	Merge branch 'spaces-machines-tree' into staging	2023-08-24 15:03:46 +02:00
Nicolas Florentin	bdc5729141	(feat) space associate machines	2023-08-24 14:41:29 +02:00
Du Peng	6b183969c7	Merge branch 'reservation-context' into dev	2023-08-24 10:37:53 +02:00
Vincent	c9588b0b97	(i18n) Fix typo	2023-08-22 14:48:24 +02:00
Du Peng	e2765d5629	Merge branch 'pre_inscription' into staging	2023-07-31 15:11:11 +02:00
Du Peng	23faa559e3	(feat) reanme event family to event reserved for members	2023-07-31 15:10:16 +02:00
Du Peng	b62e9efd12	(i18n) update tranlations	2023-07-31 14:35:31 +02:00
Du Peng	2025409741	Merge branch 'pre_inscription' into staging	2023-07-31 10:19:39 +02:00
Du Peng	8a3110cd0f	(feat) add not valid status for event reservaiton	2023-07-26 15:48:14 +02:00
Du Peng	7340758f13	Merge branch 'pre_inscription' into staging	2023-07-25 18:53:50 +02:00
Du Peng	d5fa71e113	(bug) event pre-registration status	2023-07-25 18:53:12 +02:00
Du Peng	a6947f61f7	(merge) merge dev	2023-07-24 18:15:22 +02:00
Vincent	06d917f7d3	(i18n) Update user profil form	2023-07-21 15:07:29 +02:00
Nicolas Florentin	c0df547293	Merge branch 'reservation-context' into staging	2023-07-21 13:10:00 +02:00
Nicolas Florentin	f466826e8b	Fix a bug: hide project categories filter if there is no project categories, Improvement : dialog confirm to remove a project category	2023-07-21 10:21:08 +02:00
Nicolas Florentin	043ff6d47e	wip	2023-07-20 16:55:22 +02:00
Du Peng	e7a4ab2140	Merge branch 'pre_inscription' into staging	2023-07-12 15:07:31 +02:00
Du Peng	25d8b25808	(feat) add reservation status registered	2023-07-12 11:23:00 +02:00
Du Peng	3f1d6bf378	(merge) merge branch pre_inscription	2023-07-12 09:34:09 +02:00
Du Peng	4fc181480b	(merge) merge branch dev	2023-07-12 09:33:04 +02:00
Du Peng	b6f2187d94	(feat) add child age will be 18 worker	2023-07-12 09:29:16 +02:00
Du Peng	770d1edbe6	(i18n) update translations	2023-07-11 15:57:47 +02:00
Du Peng	e43d4918e1	(feat) show present status for pre registration evnet if amount == 0	2023-07-11 15:42:46 +02:00
Du Peng	61fbb37fb2	(feat) add invalidate pre registration notification	2023-07-11 14:57:38 +02:00
Du Peng	8b4150a888	(feat) show age of child in event reservation	2023-07-11 14:17:03 +02:00
Du Peng	8771eb8ccc	(feat) admin can confirm the prensence of pre-registration event	2023-07-11 13:53:41 +02:00
Du Peng	d271fa59e6	(feat) valid/invalid pre registration event	2023-07-11 10:36:44 +02:00
Du Peng	e430ae14e2	(i18n) updated translations	2023-07-07 18:05:40 +02:00
Nicolas Florentin	751920893a	translations for project filters	2023-07-06 14:28:46 +02:00
Vincent	a8dedfe040	(ui) Add radio buttons for event validation	2023-07-06 11:24:50 +02:00
Du Peng	b4f7ceb747	(merge) merge dev	2023-07-04 17:11:15 +02:00
Du Peng	6e014ddfe6	(i18n) update translations	2023-07-04 17:09:25 +02:00
Du Peng	8542c07dc7	(i18n) update translations	2023-07-04 15:05:49 +02:00