17 Commits

Author	SHA1	Message	Date
Sylvain	a44bf85014	Merge branch 'slot_is_only_subscriptions' into dev	2020-03-02 16:27:26 +01:00
Sylvain	07b21f5094	Merge branch 'book_slot_at_same_time' into dev	2020-03-02 15:52:05 +01:00
Sylvain	5186d6b22c	behavior of FEATURE_TOUR_DISPLAY	2020-03-02 11:17:28 +01:00
Sylvain	31dce73f14	project elements tour	2020-02-25 10:47:16 +01:00
Sylvain	e6f2e60997	spaces tour	2020-02-24 16:57:41 +01:00
Sylvain	76c1b69b7a	machines tour	2020-02-24 16:51:03 +01:00
Du Peng	74cc69d1bd	Ability to configure reservation slot restrict for plans	2020-02-07 17:37:00 +01:00
Du Peng	7c86adde4b	Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time	2020-02-05 16:53:47 +01:00
Sylvain	a7b423b151	refactoring i18n keys - admin	2019-12-17 18:06:56 +01:00
Sylvain	ea0ec47268	[bug] error handling does not work in some cases	2019-01-03 12:22:34 +01:00
Sylvain	2801ab0039	fix controllers imports issues due es6 convertion	2018-11-21 15:29:35 +01:00
Sylvain	f528b2021d	added semicolons	2018-11-21 11:08:53 +01:00
Sylvain	8cd533b5a6	eslint problems autofixes	2018-11-21 10:59:07 +01:00
Sylvain	c1b1b701ae	fixes and improvements after coffeescript migration	2018-11-20 14:44:41 +01:00
Sylvain	aac0e8125c	[ongoing] fix erb js controllers	2018-11-19 16:52:48 +01:00
Sylvain	6352087f70	fix comments in erb files	2018-11-19 16:17:49 +01:00
Sylvain	e7031c90d5	restablished erb files	2018-10-25 17:08:13 +02:00