950 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	24a0f5533c	fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views	2016-09-27 09:55:24 +02:00
Sylvain	30c52dfe95	share on twitter with title	2016-09-26 16:44:45 +02:00
Sylvain	a1fd69f309	auth provider safe destroy	2016-09-26 12:41:59 +02:00
Sylvain	2f315febd3	Merge branch 'master' of github.com:LaCasemate/fab-manager	2016-09-26 11:24:19 +02:00
Sylvain	838d9b9542	Release 2.3.1	2016-09-26 11:21:25 +02:00
Peng DU	1a0e5519f6	change groups cache key name	2016-09-26 11:20:28 +02:00
Peng DU	82838ceb6e	update CHANELOG	2016-09-26 10:39:14 +02:00
cyril	b2b66e7910	display the edit button for admin	2016-09-23 14:43:34 +02:00
cyril	c14a4d03c5	ui: machines and trainings list : remove the description	2016-09-23 14:42:53 +02:00
cyril	70a95ffcd7	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-09-23 14:40:47 +02:00
cyril	eed8f6519e	display caret icon for small screen in profil nav	2016-09-23 14:40:41 +02:00
cyril	8a68609b4b	update docker/env.example	2016-09-23 14:39:10 +02:00
Peng DU	fc9aeb00a2	remove edit wallet reference from facture	2016-09-23 12:52:43 +02:00
Peng DU	0f7238bbba	fix wallet amount display error	2016-09-23 11:46:58 +02:00
Peng DU	972a5e0a89	fix bug: admin cant pay a plan with code promo by wallet	2016-09-22 18:04:13 +02:00
Sylvain	81a6b996ee	fix sso data mmaing: if no mapping were defined for an integer value, set the raw value	2016-09-22 17:32:25 +02:00
Sylvain	205c45060a	update version on user login according to their role	2016-09-22 17:01:40 +02:00
Sylvain	6401b321ef	[feature] display fab-manager's version, when logged as admin	2016-09-22 16:46:14 +02:00
Peng DU	270b279ffb	user can use a code promo for pay le plan by wallet and carte visa	2016-09-21 16:19:04 +02:00
Peng DU	1008a6dd1b	fix bug: cant show correct payment modal when pay by wallet and code promo	2016-09-21 13:09:10 +02:00
Peng DU	cfd92cdc40	fix bug: code promotion change slot's price original	2016-09-20 18:39:28 +02:00
Peng DU	afb026bdc9	clear invoice_item of wallet/group if payment has a error	2016-09-20 17:42:30 +02:00
Peng DU	802e239d5b	calcul total price of reservation with coupon when use wallet	2016-09-20 16:54:23 +02:00
cyril	c98a497b21	update docker readme	2016-09-20 14:45:14 +02:00
Peng DU	e5341b0b89	fix bug: cant subscribe a plan	2016-09-20 14:37:35 +02:00
Peng DU	f883f8c344	update Changelog	2016-09-20 12:02:08 +02:00
Peng DU	5d6aa163b5	change groups cache key name	2016-09-20 11:39:49 +02:00
Vincent	6920793ce1	add RSS feed to events index	2016-09-15 22:22:35 +02:00
Vincent	a5c6ba5f7d	add RSS feed to projects index	2016-09-15 21:50:08 +02:00
Sylvain	64bae54bce	[Bug] move event reservation is not limited by admin settings (prior-delay & disable)	2016-09-15 18:43:27 +02:00
Sylvain	32a79bec1b	[bug] clicking on the text in stripe's payment modal, does not validate the checkbox	2016-09-15 18:22:52 +02:00
Sylvain	638747ff0e	[SSO] improved boolean mapping interface	2016-09-15 18:15:23 +02:00
Sylvain	094129ecf3	added jsonb info to README	2016-09-15 17:54:48 +02:00
Sylvain	f2ec874db0	updated documentation diagrams	2016-09-15 17:51:22 +02:00
Sylvain	9bc6fb5b7a	updated changelog and documentation	2016-09-15 17:45:59 +02:00
Sylvain	3c277428bf	[SSO] field data mapping transformation on data reception	2016-09-15 17:10:41 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	ee333df53f	improved transformation interface	2016-09-14 18:54:53 +02:00
Sylvain	77626aa674	[SSO] interface for transforming boolean and dates datatypes	2016-09-14 18:52:18 +02:00
Sylvain	a5bdbc16cd	updated README about PGSQL jsonb limitation	2016-09-14 18:13:18 +02:00
Sylvain	a0fb6fb683	[sso] show mapping datatype in provider edition	2016-09-14 17:32:11 +02:00
Sylvain	dc4c4b678f	[sso] fix create mapping w/ datatype display	2016-09-14 17:13:07 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	e3cb5456ed	updated CHANGELOG	2016-09-13 13:05:36 +02:00
Sylvain	019cfcadea	[sso] fix endpoint regexp	2016-09-13 12:09:55 +02:00
Sylvain	ec0f597067	[sso] display strategy name in providers list	2016-09-13 12:06:25 +02:00
Sylvain	6b46c175ca	improved sso doc	2016-09-13 11:30:52 +02:00
Sylvain	d62803dda5	[doc] fix github oauth endpoints	2016-09-13 11:25:07 +02:00
Sylvain	b7c41e89c4	fix locale of notify_auth_changed mails	2016-09-13 10:48:07 +02:00
Sylvain	caa3cd4417	fix typo	2016-09-12 17:57:04 +02:00