8041 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	a10f3cffe4	(feat) statistics improvements	2023-09-01 12:43:36 +02:00
Du Peng	d70501e066	(merge) Merge remote-tracking branch 'origin/members-filter-not-validated' into dev	2023-09-01 09:43:59 +02:00
Du Peng	ad89e4f278	(bug) user cant book event after has reservation canceled	2023-08-31 17:11:18 +02:00
Du Peng	37aa4fb2ff	(feat) add is_confirm to slots_reservations	2023-08-31 16:10:43 +02:00
Du Peng	8ec90337b5	(bug) fix ruby syntax	2023-08-30 18:56:41 +02:00
Du Peng	a5c73b64c7	(bug) unable to generate statistic	2023-08-30 18:51:09 +02:00
Du Peng	5e621b0615	(bug) unable to update status to paid for latest payment schedule item	2023-08-30 18:51:04 +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
Vincent	0f7f32f256	(ui) change editorial-block cta target	2023-08-29 16:22:53 +02:00
Nicolas Florentin	ffaeb7e5c8	Fix a bug: for project categories, if there is no category : do not show categories panel in show view, do not show categories input field in edit view	2023-08-29 08:29:30 +02:00
Du Peng	5e6e4b8894	Merge branch 'dev' for release 6.0.13	2023-08-28 19:07:34 +02:00
Du Peng	d48fc08f07	Version 6.0.13	2023-08-28 19:07:27 +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	581e08ea1e	(bug) missing reservation context in statistic global export	2023-08-24 18:00:15 +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	9000c97aaf	(ui) Fix link	2023-08-22 19:10:08 +02:00
Vincent	43bb6d2c1e	(i18n) Fix typo	2023-08-22 19:09:59 +02:00
Du Peng	14f404dfb6	(bug) unable to cancel a payment schedule	2023-08-21 18:24:56 +02:00
Du Peng	1e862d5a49	Merge branch 'dev' for release 6.0.12	2023-08-14 16:10:11 +02:00
Du Peng	5263153202	Version 6.0.12	2023-08-14 16:10:03 +02:00
Du Peng	7187e53835	(bug) unable to show projects next page button	2023-08-11 11:26:09 +02:00
Du Peng	cfe2cbdda1	(bug) 403 error when manager edit an event	2023-08-01 10:47:56 +02:00
Du Peng	65a6a80670	(feat) add submiting to save event form	2023-07-31 15:10:46 +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	2a2c451d6e	(bug) admin valid/pay event reservaiton error	2023-07-31 10:18:15 +02:00
Du Peng	cc46103eca	(bug) family event nb free place error	2023-07-28 16:25:39 +02:00
Du Peng	4f26f52d85	(feat) hide child supporting document if dont any type of supporting document	2023-07-28 14:28:54 +02:00
Vincent	3139430761	(ui) Fix select dropdown z-index	2023-07-28 10:35:36 +02:00
Du Peng	c9f17309f9	(bug) child validited cannot reserve event	2023-07-27 17:54:34 +02:00
Du Peng	5a23b8d5e5	(bug) unable to remove supporting document type	2023-07-27 17:47:22 +02:00
Du Peng	ea83265b87	(bug) child cannot be updated	2023-07-27 17:34:54 +02:00
Du Peng	af57e59ccd	(bug) event canceled places error	2023-07-26 16:10:05 +02:00
Du Peng	8a3110cd0f	(feat) add not valid status for event reservaiton	2023-07-26 15:48:14 +02:00
Du Peng	d5fa71e113	(bug) event pre-registration status	2023-07-25 18:53:12 +02:00
Du Peng	768b5d7e0e	(bug) cannot create slot	2023-07-24 18:13:34 +02:00
Du Peng	5e46d8c45e	(bug) event reserved places compute error	2023-07-24 14:08:12 +02:00
Du Peng	0597c9857a	Merge branch 'dev' for release 6.0.11	2023-07-21 17:19:55 +02:00
Du Peng	7ba596c9b8	Version 6.0.11	2023-07-21 17:19:45 +02:00
Vincent	06d917f7d3	(i18n) Update user profil form	2023-07-21 15:07:29 +02:00
Nicolas Florentin	91ea663e1c	updates changelog	2023-07-21 13:48:50 +02:00
Nicolas Florentin	6bcd7c484e	updates changelog	2023-07-21 11:44:33 +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
Vincent	a4d6723413	(ui) Fix machines padding	2023-07-20 09:35:58 +02:00
Du Peng	8f237ff4ec	(doc) update changelog	2023-07-19 08:53:59 +02:00
Du Peng	2ceb4f1119	(bug) incorrect date range in statistics	2023-07-18 11:56:51 -04:00