3364 Commits

Author	SHA1	Message	Date
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	ccfa7aeb39	(bug) unable to generate stat for reservation no invoice	2023-09-06 16:34:18 +02:00
Du Peng	45959b1fa4	(bug) unable to update user profile by admin	2023-09-04 11:48: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	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	a5c73b64c7	(bug) unable to generate statistic	2023-08-30 18:51:09 +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	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
Du Peng	6b183969c7	Merge branch 'reservation-context' into dev	2023-08-24 10:37:53 +02:00
Du Peng	14f404dfb6	(bug) unable to cancel a payment schedule	2023-08-21 18:24:56 +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
Vincent	3139430761	(ui) Fix select dropdown z-index	2023-07-28 10:35:36 +02:00
Du Peng	af57e59ccd	(bug) event canceled places error	2023-07-26 16:10:05 +02:00
Du Peng	5e46d8c45e	(bug) event reserved places compute error	2023-07-24 14:08:12 +02:00
Vincent	06d917f7d3	(i18n) Update user profil form	2023-07-21 15:07:29 +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	2ceb4f1119	(bug) incorrect date range in statistics	2023-07-18 11:56:51 -04:00
Du Peng	e4b996654b	(bug) event reserved places compute error	2023-07-13 15:04:57 +02:00
Du Peng	1ff61c9380	(bug) unable to confirm payment of store for admin	2023-07-10 13:49:39 +02:00
Du Peng	b0a204dd1d	(feat) Improved performance when marking all notifications as read	2023-07-07 16:17:34 +02:00
Du Peng	9bc146d037	(bug) unable to create plan with plan limitation	2023-07-07 09:15:14 +02:00
Du Peng	d7d996bc6d	(feat) Ability to show all availabilities in calender for admin	2023-07-07 09:15:13 +02:00
Du Peng	bd6e4fe0ab	(bug) unable to update Store Order sub type in statistics	2023-07-06 10:15:05 +02:00
Du Peng	ab5497dcc6	(bug) unable to show project step image in markdown file	2023-07-04 17:01:05 +02:00
Du Peng	168d804eb9	(bug) variable is not defined	2023-07-04 17:01:04 +02:00
Vincent	ead7e79f01	(ui) Fix projects filters font-weight	2023-07-04 16:57:41 +02:00
Peng	bc320693cf	Merge branch 'dev' into 'projects-improvements' ... # Conflicts: # Gemfile.lock	2023-07-03 16:13:21 +00:00
Peng	6ed79fe215	Merge branch 'navbar-my-orders-link' into 'dev' ... displays "my orders" link only if store module is active See merge request projets/fab-manager!11	2023-07-03 15:44:58 +00:00
Du Peng	e50c90b30d	(bug) Accouning Line in duplicate	2023-07-03 17:43:27 +02:00
Nicolas Florentin	b3970da1c4	displays "my orders" link only if store module is active	2023-07-03 16:31:45 +02:00
Nicolas Florentin	b8fd8d8172	Merge remote-tracking branch 'origin/projects-to-markdown' into projects-improvements	2023-07-03 14:37:57 +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	94b0b062bc	fix	2023-07-03 07:57:54 +02:00
Nicolas Florentin	af69ba67df	wip	2023-06-30 11:26:26 +02:00
Nicolas Florentin	50ed3c9ed2	projects to markdown in zip	2023-06-30 11:15:37 +02:00
Nicolas Florentin	82823dd4cc	download project to markdown file	2023-06-29 16:37:16 +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
Du Peng	11a079b3e2	(bug) unable to refresh machine/space/training calender after pay an reservation	2023-06-22 11:59:52 +02:00
Du Peng	75259773d5	(bug) check object = nil	2023-06-19 21:01:01 +02:00
Du Peng	4fdbd4fcf1	(bug) unable to modify the price of prepaid pack	2023-06-08 10:50:00 +02:00