8041 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	94d4ed3d1a	Merge branch 'saml' into dev	2024-01-29 14:55:58 +01:00
Du Peng	bc023011d2	(feat) saml provider	2024-01-26 21:24:33 +01:00
Du Peng	f58da357b7	(wip) saml sso	2024-01-24 15:27:01 +01:00
Du Peng	73566d4cd9	(wip) add saml provider	2024-01-24 15:27:01 +01:00
Du Peng	ba926721bb	(bug) if there is a reservation with a deleted user, it is not possible to delete the event	2024-01-24 15:26:18 +01:00
Du Peng	9e5740b05e	Merge branch 'dev' for release 6.3.10	2024-01-19 14:43:14 +01:00
Du Peng	ccc684e6b6	Version 6.3.10	2024-01-19 14:43:08 +01:00
Du Peng	25a4dda429	(i18n) updated translations	2024-01-19 14:41:34 +01:00
Du Peng	f77b4af211	(bug) unable to update event recurrence	2024-01-12 11:55:07 +01:00
Du Peng	c770ab33ec	Merge branch 'dev' for release 6.3.9	2024-01-08 09:27:03 +01:00
Du Peng	83eca554d8	Version 6.3.9	2024-01-08 09:26:55 +01:00
Du Peng	332b9a3870	update changelog	2024-01-05 18:23:24 +01:00
Du Peng	ab93c3d146	(bug) event number places error in statistic	2024-01-05 18:22:44 +01:00
Du Peng	9685b9cad9	(bug) unable to show extended prices of space	2024-01-05 15:08:47 +01:00
Vincent	15b63c896e	(ui) Fix button color	2024-01-02 17:24:06 +01:00
Vincent	76ab6d3b34	(i18n) Added translation files for Swedish	2024-01-02 14:11:56 +01:00
Du Peng	b78c14894d	update Dockerfile	2024-01-02 14:00:33 +01:00
Vincent	d2c742f273	(i18n) Translation updates	2024-01-02 11:53:16 +01:00
Du Peng	c2c71b2846	Merge branch 'dev' for release 6.3.8	2023-12-29 11:46:30 +01:00
Du Peng	8d3befd6d0	Version 6.3.8	2023-12-29 11:44:07 +01:00
Du Peng	4b228b21a5	(bug) unable to build docker image	2023-12-29 11:30:07 +01:00
Du Peng	32c5b01053	Version 6.3.7	2023-12-28 18:38:10 +01:00
Du Peng	4fcdd51f25	update Changelog	2023-12-28 18:38:10 +01:00
Du Peng	dac874d915	(i18n) updated translations	2023-12-28 18:38:10 +01:00
Du Peng	be034c1c06	(bug) unable to create Stripe coupon with duration = forever	2023-12-28 18:38:10 +01:00
Du Peng	04c5dc58e7	(bug) PayZen amount of subscription compute error for Coupon validity per user = forever	2023-12-28 18:38:10 +01:00
Du Peng	5a88ff5aa4	(feat) show invoice payment method in accounting line	2023-12-28 18:38:10 +01:00
Du Peng	13311906bb	update changelog	2023-12-28 18:38:10 +01:00
Vincent	c75fa4b954	(quality) Cleanup unused feature	2023-12-28 18:38:10 +01:00
Du Peng	11205bb1b3	update Gemfile	2023-12-28 18:38:10 +01:00
Du Peng	d9e4568b71	(bug) unable to show wallet payment mean for invoice	2023-12-28 18:38:09 +01:00
Du Peng	01a1403eb7	Version 6.3.7	2023-12-28 18:37:16 +01:00
Du Peng	181faa7975	update Changelog	2023-12-28 18:36:05 +01:00
Du Peng	989ad8f691	(i18n) updated translations	2023-12-28 18:34:31 +01:00
Du Peng	818b6971ec	(bug) unable to create Stripe coupon with duration = forever	2023-12-28 18:32:16 +01:00
Du Peng	903a84f802	(bug) PayZen amount of subscription compute error for Coupon validity per user = forever	2023-12-28 17:54:47 +01:00
Du Peng	71275f18a1	(feat) show invoice payment method in accounting line	2023-12-21 15:49:11 +01:00
Du Peng	74d9cc462d	update changelog	2023-12-15 18:09:33 +01:00
Peng	33a2da6275	Merge branch 'cleanup' into 'dev' ... (quality) Cleanup unused feature See merge request projets/fab-manager!20	2023-12-15 17:06:50 +00:00
Vincent	63a4695d43	(quality) Cleanup unused feature	2023-12-15 15:08:33 +01:00
Du Peng	70c9776031	update Gemfile	2023-12-11 17:01:37 +01:00
Du Peng	f8eda2e228	(bug) unable to show wallet payment mean for invoice	2023-12-11 17:01:08 +01:00
Nicolas Florentin	ebd2a5452e	Merge branch 'dev' for release 6.3.6	2023-12-06 11:13:05 +01:00
Nicolas Florentin	c0c46d0b77	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2023-12-06 11:12:57 +01:00
Nicolas Florentin	cb36494876	Merge branch 'dev' for release 6.3.6	2023-12-06 11:12:21 +01:00
Nicolas Florentin	ebc33fd5f4	Version 6.3.6	2023-12-06 11:12:21 +01:00
Du Peng	9713f88cea	(i18n) update translations	2023-12-06 11:09:46 +01:00
Nicolas Florentin	96d8f85bbc	updates changelog	2023-12-06 10:44:30 +01:00
Nicolas Florentin	259889447e	adds locale es-MX	2023-12-06 10:18:59 +01:00
Nicolas Florentin	b17546fbdb	(fix) fix event service	2023-12-05 16:31:32 +01:00