7864 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	33d81c6c36	(feat) add a notification to remind users to upload their supporting documents	2023-09-11 15:52:05 +02:00
Nicolas Florentin	35c72cc5ce	fix comment	2023-09-11 14:21:51 +02:00
Du Peng	fb2b762015	Merge branch 'spaces-machines-tree' into dev	2023-09-11 09:54:08 +02:00
Nicolas Florentin	0322e26150	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2023-09-11 09:22:43 +02:00
Nicolas Florentin	48bf00f6e6	adds test for NotificationsController#polling	2023-09-11 09:22:30 +02:00
Vincent	aad5da63be	(i18n) Typo	2023-09-11 09:15:00 +02:00
Nicolas Florentin	a1938201ca	fix NotificationsController#polling failing request	2023-09-11 09:07:27 +02:00
Du Peng	e4bd077907	(feat) Add extra_authorize_params to OpenIdConnect config	2023-09-07 16:22:57 +02:00
Nicolas Florentin	6806a60f5a	improves supporting documents reminder worker test	2023-09-07 10:51:11 +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
Du Peng	60a99e4611	Merge branch 'dev' for release 6.0.14	2023-09-06 16:44:46 +02:00
Du Peng	48d76fa783	Version 6.0.14	2023-09-06 16:44:37 +02:00
Du Peng	ccfa7aeb39	(bug) unable to generate stat for reservation no invoice	2023-09-06 16:34:18 +02:00
Vincent	dd2fcbd352	(ui) Remove liste style on statistics table	2023-09-06 15:52:05 +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	45959b1fa4	(bug) unable to update user profile by admin	2023-09-04 11:48:58 +02:00
Du Peng	9b09e8b7c6	(feat) allow notify_admin_order_is_paid notification to setting	2023-09-01 16:05:54 +02:00
Du Peng	e3dc47889b	(i18n) update translations	2023-09-01 15:46:51 +02:00
Du Peng	c7c132153c	Merge branch 'manager-notifications' into dev	2023-09-01 15:18:58 +02:00
Du Peng	f3b5e2b240	(bug) fix notification list is shown in notification settings page	2023-09-01 15:18:29 +02:00
Nicolas Florentin	7925040d33	manager can configure his notifications	2023-09-01 14:39:53 +02:00
Du Peng	ed22d1c37c	Merge branch 'stats-improvements' into dev	2023-09-01 14:31:33 +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	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