62 Commits

Author	SHA1	Message	Date
Sylvain	9b7f74e02d	handle coupons & plans & user change in cart directive	2017-02-20 15:07:14 +01:00
Sylvain	049606b450	[ongoing] reservation cart refactoring	2017-02-16 17:57:14 +01:00
Sylvain	c479502dd0	[bug] too many unread notifications cause system memory overflow	2017-01-05 15:06:54 +01:00
Sylvain	531a89945b	member form: add asterisks on mendatory fields	2016-12-14 13:05:42 +01:00
Sylvain	c2f638934e	added info notice about operation's time of admin delete	2016-12-12 11:18:24 +01:00
Sylvain	4c8b661750	display coupon application result in inline message instead of growl notification	2016-11-30 10:17:05 +01:00
Sylvain	f9220d44a0	fix i_accept_to_receive_information_from_the_fablab in sign-up modal	2016-10-26 16:35:10 +02:00
Kenneth Lim	18bc37749b	locale: informations --> information ... Not sure if this helps but information does not require an `s`. :) Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>	2016-10-07 17:11:58 +08: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
Peng DU	0f7238bbba	fix wallet amount display error	2016-09-23 11:46:58 +02:00
Peng DU	cfd92cdc40	fix bug: code promotion change slot's price original	2016-09-20 18:39:28 +02:00
Sylvain	ba559d87fb	use coupon in plan subscription	2016-08-11 18:17:28 +02:00
Sylvain	def5384a38	validation of validity_per_user on coupon usage	2016-08-10 11:08:01 +02:00
Sylvain	b4e28b94f3	apply coupon in payment modal + fix update user w/o organization	2016-08-09 17:20:38 +02:00
Sylvain	d1c1a614a9	i18n coupon directive	2016-08-09 10:22:01 +02:00
Sylvain	5ce0097aa3	[ongoing] coupon validation and usage directive	2016-08-08 17:09:05 +02:00
Sylvain	33358c2fb5	ability to edit organization in profile & ablity to link its params from an sso	2016-08-02 15:11:26 +02:00
Sylvain	2afd6ade8a	allow user to set his organization on registration	2016-08-02 12:27:45 +02:00
Sylvain	5f96c9916d	[feature] newsletter : ask conscent + export in xlsx	2016-07-28 12:20:51 +02:00
Sylvain	5cacb1d34a	notify admin when users exports are running	2016-07-28 10:28:43 +02:00
Peng DU	c220678ea5	change some texts in reservation on site	2016-07-21 16:32:58 +02:00
Peng DU	5d84dcb666	update locale	2016-07-21 16:32:57 +02:00
Peng DU	31d5c6d3b3	pay totalement/partialement reservation by wallet	2016-07-21 16:32:54 +02:00
Peng DU	db8a6e8a32	application can show user wallet	2016-07-21 16:32:53 +02:00
Sylvain	6839e8db38	Merge branch 'events' into dev ... Conflicts: CHANGELOG.md config/locales/app.shared.en.yml config/locales/app.shared.fr.yml	2016-07-13 18:32:30 +02:00
Sylvain	2c8001f38f	Merge branch 'projects' into dev ... Conflicts: app/views/api/members/show.json.jbuilder	2016-07-13 15:57:45 +02:00
Sylvain	7d02fa9d9a	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Sylvain	ba4115a1da	Merge remote-tracking branch 'origin/plugin' into dev	2016-06-16 17:13:36 +02:00
Sylvain	f924144fda	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
Sylvain	306e0322c5	[feature] display 'draft' badge on drafts	2016-06-01 10:47:00 +02:00
Nicolas Florentin	f158ba2890	refacto code insertion code	2016-05-26 15:14:57 +02:00
Nicolas Florentin	822705c54c	adds necessary code to permit navi gami plugin to add data in user profile view	2016-05-26 15:14:20 +02:00
Sylvain	0be0935474	[feature] add user's job to profile	2016-05-26 12:34:30 +02:00
Sylvain	d009cf3fc1	[feature] add flickr, lastfm & pinterest	2016-05-26 12:05:28 +02:00
Sylvain	b19765ad4a	change placeholders for social networks + remove contributor status label top margin	2016-05-18 17:21:10 +02:00
Sylvain	420d247590	adjust avatar position & bio titles	2016-05-18 14:28:44 +02:00
Sylvain	d8cc1ec107	fix responsive public profile	2016-05-18 11:16:55 +02:00
Sylvain	1869dd0bcf	[bug] project gain collaborator i18n key FR ... [UI] project display in profile	2016-05-18 10:54:50 +02:00
Sylvain	a3e0954f93	fix profile pictos style	2016-05-18 10:11:50 +02:00
Sylvain	9ee869ee3f	fix regex pattern	2016-05-18 09:47:30 +02:00
Sylvain	c1c981a695	social links validation	2016-05-18 09:38:55 +02:00
Sylvain	d005712662	fix social links position & website icon	2016-05-18 09:11:08 +02:00
Sylvain	284879e0d4	private profile	2016-05-17 17:43:29 +02:00
Sylvain	0061c3dca6	reorganize profile header zone	2016-05-17 16:41:32 +02:00
Sylvain	93edd6eaa8	[ongoing] UI refactoring of public profile	2016-05-16 18:20:22 +02:00
Sylvain	88de9c3c75	[feature] profile website + edition of is_allow_contact	2016-05-16 14:46:57 +02:00
Sylvain	6b66620686	improve social button workflow	2016-05-16 11:23:19 +02:00
Sylvain	7ec5e5ba03	[feature] allow user to add links to his socials networks	2016-05-16 11:18:30 +02:00