57 Commits

Author	SHA1	Message	Date
Sylvain	07b21f5094	Merge branch 'book_slot_at_same_time' into dev	2020-03-02 15:52:05 +01:00
Sylvain	11ccaa73b6	Merge remote-tracking branch 'origin/disable_wallet_option' into dev	2020-03-02 15:47:14 +01:00
Sylvain	f1928c0d4c	refactor the home tour to start after the render	2020-03-02 11:40:00 +01:00
Sylvain	5186d6b22c	behavior of FEATURE_TOUR_DISPLAY	2020-03-02 11:17:28 +01:00
Sylvain	4e72cd16a1	harmonized Fab-manager typo	2020-03-02 08:59:43 +01:00
Sylvain	4db219b204	[ongoing] FEATURE_TOUR_DISPLAY	2020-02-25 18:02:41 +01:00
Sylvain	9589efa312	fix scroll issues on tours	2020-02-25 10:11:18 +01:00
Sylvain	16ed2fa73a	isolate welcome tour	2020-02-18 17:39:47 +01:00
Sylvain	5b46edd748	welcome tour + save completed tours in database	2020-02-18 17:36:45 +01:00
Du Peng	908275d171	add disable wallet option	2020-02-12 18:15:44 +01:00
Sylvain	fd471be40a	angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message	2020-02-12 17:18:11 +01:00
Sylvain	71290420bb	ui-tour 3 steps	2020-02-11 15:49:43 +01:00
Sylvain	528877bc76	poc features-tour	2020-02-11 15:49:43 +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	656a603d6c	customize home page css	2020-01-27 17:10:29 +01:00
Sylvain	19502c8231	fix display version on home page	2020-01-14 17:39:13 +01:00
Sylvain	1f3d9cf88d	display upgrade infos directly on the interface	2020-01-14 17:12:36 +01:00
Sylvain	3c3e806a29	Merge branch 'user-confirmation' into dev	2020-01-07 10:34:25 +01:00
Sylvain	b6ee4e92a4	change falsy value + updated changelog	2020-01-07 10:34:12 +01:00
Nicolas Florentin	0b899fe183	Merge branch 'dev' into user-confirmation	2019-12-30 09:36:43 +01:00
Sylvain	3412d9e35c	fix checking enable_in_context_translation	2019-12-23 13:49:46 +01:00
Sylvain	f05547e46e	change ach pluralization location	2019-12-23 11:29:02 +01:00
Sylvain	40e8b60a0a	add ach pluralization fonction for messageFormat	2019-12-23 10:28:12 +01:00
Nicolas Florentin	518511ab3b	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2019-12-19 12:06:54 +01:00
Nicolas Florentin	7ea3e5ce32	fix translation key path app.public.projects_list.the_fablab_projects	2019-12-19 12:06:45 +01:00
Sylvain	bcd0e6833d	integrate crowdin in-context translation code	2019-12-18 16:50:16 +01:00
Nicolas Florentin	0a3a6d034a	env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in	2019-12-18 16:02:47 +01:00
Sylvain	91008b3df1	improved calendar legend	2019-11-27 11:52:37 +01:00
Sylvain	ad928bd4e6	ability to set phone number optional or required ... also: show stars on required fields in new admin form	2019-11-19 11:44:32 +01:00
Sylvain	cdc30e0da2	configure the slots duration with an environment variable	2019-10-29 16:52:52 +01:00
Sylvain	58821555fe	Ability to set the default view in project gallery: openLab or local	2019-10-22 14:42:45 +02:00
Sylvain	0d3cc0fe40	[feature] Ability to disable invoices generation and interfaces	2019-09-30 15:29:20 +02:00
Sylvain	588010ac0b	[feature] Optional reCaptcha checkbox in sign-up form	2019-09-23 17:46:46 +02:00
Sylvain	539eb08b89	ability to disable the online payments through an env var	2019-09-11 17:08:00 +02:00
Sylvain	967f539ad9	[ongoing] update to stripe-js:v3 to use strong customer authentication	2019-09-04 17:20:18 +02:00
Sylvain	f69703f0a0	allow user to change his choice about cookies	2019-06-13 12:52:56 +02:00
Sylvain	249e59bb2a	get user consent about cookies	2019-06-13 11:28:55 +02:00
Sylvain	dd4b6e2cb1	[ongoing] abuses management interface	2019-05-09 18:27:19 +02:00
Sylvain	75310d599f	Merge branch 'host' into dev	2019-03-26 14:33:30 +01:00
Sylvain	01ac73a1a1	removed capistrano & unicorn + cleaned lacasemate brading	2019-03-26 10:40:58 +01:00
Sylvain	8530a6f655	superadmin + fixed free space notification	2019-03-20 16:49:38 +01:00
Sylvain	9af1e5c658	fixed User.to_json	2018-07-24 11:13:05 +02:00
Sylvain	7afe62522f	refactor User.as_json to use jbuilder template	2018-07-04 14:05:44 +02:00
Sylvain	89e30980e0	[bug] unable to set locale other than fr or en	2017-04-27 18:35:00 +02:00
Sylvain	13689fd707	set spaces disabled by default	2017-03-01 15:50:49 +01:00
Sylvain	23b9851218	allow enable/disable spaces -> disabled by default	2017-02-15 15:41:25 +01:00
Sylvain	1ef2c11355	add links to RSS feeds into application header	2016-09-29 11:54:08 +02:00
Sylvain	6401b321ef	[feature] display fab-manager's version, when logged as admin	2016-09-22 16:46:14 +02:00
Sylvain	139d7d9f0f	[bug] Google Analytics not loaded ... - angular-google-analytics plugin update from 0.0.15 to 1.1.7 - google analytics config moved into secrets.yml/production	2016-05-24 14:53:07 +02:00
cyril	79b69f21ba	Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab	2016-05-02 11:55:15 +02:00