8041 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	26f1c939cd	(feat) edit/delete child in members list	2023-07-04 15:01:24 +02:00
Du Peng	a4d4107cb1	(i18n) update translation	2023-07-04 15:01:23 +02:00
Vincent	050ae9be67	(ui) fix gap	2023-07-04 15:01:22 +02:00
Vincent	e392cc1803	(ui) restor deleted table's style	2023-07-04 15:01:21 +02:00
Vincent	d4b2b16425	(ui) integration	2023-07-04 15:01:20 +02:00
Du Peng	f64e76a463	(bug) child validated_at type	2023-07-04 15:01:19 +02:00
Du Peng	e7bac208a7	(feat) child's supporting document file created/updated notification	2023-07-04 15:01:18 +02:00
Du Peng	78d8b3bfe6	(feat) show event reservation booking users in events of member dashbaord	2023-07-04 15:01:17 +02:00
Du Peng	d729ded4d5	(feat) add birthday alert for event reservation	2023-07-04 15:01:16 +02:00
Du Peng	3de8d664e1	(bug) child birthday < 18 years ago	2023-07-04 15:01:15 +02:00
Du Peng	426c74c46f	(feat) filter child in member list	2023-07-04 15:01:14 +02:00
Du Peng	387fc3ffb3	(feat) confirmation required for delete child	2023-07-04 15:01:13 +02:00
Du Peng	f6883ea43e	(feat) show event booking users in member edit page	2023-07-04 15:01:12 +02:00
Du Peng	b577cd1ae2	(feat) child compte validation notification	2023-07-04 15:01:11 +02:00
Du Peng	562dfcb010	(feat) new child notification	2023-07-04 15:01:10 +02:00
Du Peng	d08e4ff9cd	(feat) admin can refuse child's supporting document file	2023-07-04 15:01:09 +02:00
Du Peng	ec1a736601	(feat) child validation	2023-07-04 15:01:06 +02:00
Du Peng	3d542ce6d4	(feat) add supporting document for child	2023-07-04 14:59:42 +02:00
Du Peng	e935b23631	(wip) family account css	2023-07-04 14:59:02 +02:00
Du Peng	04795ba629	(wip) show event reservation users	2023-07-04 14:59:01 +02:00
Du Peng	e85e2d7b47	(wip) pay family and nominative event	2023-07-04 14:59:00 +02:00
Du Peng	07b47d7956	(wip) add event type	2023-07-04 14:58:58 +02:00
Du Peng	177748169a	(wip) save booking user for event nominatif	2023-07-04 14:58:21 +02:00
Du Peng	9373f50706	(wip) event reservation naminative	2023-07-04 14:57:42 +02:00
Du Peng	39178b5d96	(wip) create/update user children	2023-07-04 14:56:34 +02:00
Du Peng	5365cbdaba	(wip) add/edit user children	2023-07-04 14:56:33 +02:00
Du Peng	7d10132953	(feat) add Family account setting	2023-07-04 14:56:29 +02:00
Du Peng	80642faa03	Merge branch 'dev' for release 6.0.8	2023-07-03 18:43:53 +02:00
Du Peng	734608f31c	Version 6.0.8	2023-07-03 18:40:29 +02:00
Du Peng	212e044a6b	(i18n) updated translations	2023-07-03 18:39:02 +02:00
Du Peng	878051d2b1	(doc) update changelogs	2023-07-03 18:18:00 +02:00
Du Peng	875dc4a3bd	Merge branch 'projects-improvements' into dev	2023-07-03 18:15:19 +02:00
Peng	bc320693cf	Merge branch 'dev' into 'projects-improvements' ... # Conflicts: # Gemfile.lock	2023-07-03 16:13:21 +00:00
Du Peng	d4313a1efc	(doc) update changelog	2023-07-03 17:45:59 +02: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	a23de67bd5	Merge branch 'dev' for release 6.0.7	2023-06-20 15:27:39 +02:00
Du Peng	77035d81e2	Version 6.0.7	2023-06-20 15:27:23 +02:00
Du Peng	48ea7509cf	(bug) Incorrect amount calculation when paying monthly subcription with a wallet	2023-06-19 21:09:26 +02:00