7964 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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 v6.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
Du Peng	53dfa4d6f4	Merge branch 'pre_inscription' into staging	2023-06-30 16:48:11 +02:00
Du Peng	85d052684c	(i18n) update translates	2023-06-30 16:46:31 +02:00
Vincent	5f8717914d	(ui) Events dashboard layout	2023-06-30 16:41:13 +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
Du Peng	964f00e564	(feat) re-make event reservation item view	2023-06-29 18:01:09 +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
Du Peng	b82d91f537	Merge branch 'pre_inscription' into staging	2023-06-29 10:05:23 +02:00
Nicolas Florentin	8217bb1a59	adds project categories	2023-06-29 08:47:42 +02:00
Du Peng	59fb10753d	(feat) some improvements for family account	2023-06-28 18:23:07 +02:00
Du Peng	9dafc9f221	(feat) new pre registration mail and notification	2023-06-28 15:33:51 +02:00
Du Peng	25debb4141	(feat) add success info after reservation is paid	2023-06-28 12:05:15 +02:00
Du Peng	ad40661594	(bug) cannot save pre registration end date is empty	2023-06-28 12:05:02 +02:00
Du Peng	57e808e992	Merge branch 'pre_inscription' into staging	2023-06-27 19:05:36 +02:00
Du Peng	0cdc8a2228	(feat) pre-register event for family compte and nominatif	2023-06-27 19:04:37 +02:00
Du Peng	9672ab2968	(feat) admin can confirm the payment of pre-registration reservation	2023-06-27 17:50:47 +02:00
Du Peng	a437fc24ee	(wip) admin confirm payment of reservation pre-registration	2023-06-26 19:28:26 +02:00
Du Peng	92d1a07819	(feat) validate pre-registration reservation	2023-06-26 16:02:54 +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 v6.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
Du Peng	75259773d5	(bug) check object = nil	2023-06-19 21:01:01 +02:00
Du Peng	91fa1fcd85	(bug) notification type missing	2023-06-15 19:14:02 +02:00
Du Peng	c26563944a	(feat) notification type	2023-06-15 19:12:44 +02:00
Du Peng	f9c25d521e	(feat) pre-book a event	2023-06-14 18:21:08 +02:00
Du Peng	e28286d3cc	(wip) add pre-registration to event	2023-06-13 11:38:06 +02:00
Du Peng	4fdbd4fcf1	(bug) unable to modify the price of prepaid pack	2023-06-08 10:50:00 +02:00
Du Peng	6c5b4d9595	(bug) OpenAPI accounting gateway_object_id missing error	2023-06-02 18:33:07 +02:00
Du Peng	0dbe1420ac	Merge branch 'family_account' into staging	2023-05-31 18:27:49 +02:00
Du Peng	022bbfc3c6	(bug) hide member and child select if admin dont select a member before reserve event	2023-05-31 18:26:25 +02:00
Du Peng	b4781b1642	(feat) edit/delete child in members list	2023-05-31 18:26:24 +02:00