481 Commits

Author	SHA1	Message	Date
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	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	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	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	e43d4918e1	(feat) show present status for pre registration evnet if amount == 0	2023-07-11 15:42:46 +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
Nicolas Florentin	751920893a	translations for project filters	2023-07-06 14:28:46 +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	2319dbab11	(i18n) update translates	2023-07-04 15:05:48 +02:00
Du Peng	524404e7fa	(feat) some improvements for family account	2023-07-04 15:05:45 +02:00
Du Peng	2a57a7e505	(feat) add success info after reservation is paid	2023-07-04 15:05:43 +02:00
Du Peng	26cf72a846	(feat) pre-register event for family compte and nominatif	2023-07-04 15:05:41 +02:00
Du Peng	a60e587187	(feat) admin can confirm the payment of pre-registration reservation	2023-07-04 15:05:40 +02:00
Du Peng	172f09661f	(wip) admin confirm payment of reservation pre-registration	2023-07-04 15:05:39 +02:00
Du Peng	0f9a5ff8af	(feat) validate pre-registration reservation	2023-07-04 15:05:36 +02:00
Du Peng	219e7f5913	(wip) add pre-registration to event	2023-07-04 15:02:36 +02:00
Du Peng	ec1a736601	(feat) child validation	2023-07-04 15:01:06 +02:00
Du Peng	07b47d7956	(wip) add event type	2023-07-04 14:58:58 +02:00
Du Peng	9373f50706	(wip) event reservation naminative	2023-07-04 14:57:42 +02:00
Du Peng	7d10132953	(feat) add Family account setting	2023-07-04 14:56:29 +02:00
Du Peng	212e044a6b	(i18n) updated translations	2023-07-03 18:39:02 +02:00
Nicolas Florentin	a3a5527141	Merge branch 'project-categories' into projects-improvements	2023-07-03 14:32:35 +02:00
Nicolas Florentin	bc284e7813	filter projects by date	2023-07-03 11:42:29 +02:00
Nicolas Florentin	97c652f785	filter projects list by member	2023-06-29 14:32:06 +02:00
Nicolas Florentin	8217bb1a59	adds project categories	2023-06-29 08:47:42 +02:00
Sylvain	0ab998cb5b	(i18n) updated translations	2023-03-20 10:40:10 +01:00
Sylvain	98e58cbc25	(bug) fix invalid invoice reference	2023-03-20 10:13:42 +01:00
Sylvain	328529809d	(bug) plan visibility is not applied ... (bug) plan limit error message (quality) improved error message (ui) plan visibility cannot be under 7	2023-03-16 12:02:08 +01:00
Sylvain	6089e636e4	(feat) limit machine visibility per plan	2023-03-15 14:17:06 +01:00
Sylvain	7ad1f8da3f	(quality) delete a plan limitation	2023-03-15 10:19:39 +01:00
Sylvain	25cbf63b48	(feat) notify member on limit reached	2023-03-14 16:45:01 +01:00
Sylvain	6026189e59	(i18n) updated translations	2023-03-14 12:41:08 +01:00
Sylvain	8fecec6b3d	(i18n) updated translations	2023-03-13 14:04:41 +01:00
Sylvain	e1ab56340d	(i18n) improved translations	2023-02-17 17:03:34 +01:00
Sylvain	8b3a7c73a6	(i18n) updated translations	2023-02-16 17:06:29 +01:00
Vincent	2fa59167ec	(i18n) Update translations	2023-02-16 16:07:43 +01:00