389 Commits

Author	SHA1	Message	Date
Sylvain	94abdb9eec	revert last commit	2017-01-02 17:01:52 +01:00
Sylvain	a39be14718	fix number of remaining notifications	2017-01-02 15:56:52 +01:00
Sylvain	1f0da1194b	[bug] fix VAT amount in invoice config	2017-01-02 11:08:40 +01:00
Sylvain	9bfaaaccd9	improved numerous notifications display	2016-12-19 17:08:11 +01:00
Sylvain	102eecdc8a	ability to send again auth migration code	2016-12-15 14:16:24 +01:00
Sylvain	5e1b85832c	[ongoing] resend sso fusion token	2016-12-14 17:14:53 +01:00
Sylvain	d8b6848b1b	sso wording	2016-12-14 15:14:33 +01:00
Sylvain	531a89945b	member form: add asterisks on mendatory fields	2016-12-14 13:05:42 +01:00
Sylvain	76c1412177	Merge branch 'wallet_avoir' into dev	2016-12-13 15:33:56 +01:00
Sylvain	ecbe8a58a2	coupon edition: display internationalized errors	2016-12-13 12:46:00 +01:00
Sylvain	85ee73f0e0	ability to edit coupon expiration	2016-12-13 12:01:54 +01:00
Sylvain	b44089a33d	interface & api to build avoir for a wallet credit	2016-12-12 14:20:26 +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	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	852437ebf8	remove coupon from memory after payment	2016-11-29 15:35:54 +01:00
Sylvain	0c05b45d08	improved error message on machine reservation w/ stripe payment	2016-11-29 09:15:30 +01:00
Sylvain	70a369a2b9	display error message on server error when paying by card	2016-11-28 16:47:40 +01:00
Sylvain	3ce41f0c5c	[to test] send cash coupon to user by mail	2016-11-24 18:17:49 +01:00
Sylvain	ce6877b484	success message when applying cash coupon	2016-11-24 18:05:16 +01:00
Sylvain	0a08c4c32d	check cash coupons does not exceed cart amount for subscriptions	2016-11-24 16:38:22 +01:00
Sylvain	ff11694e05	check cash coupons does not exceed cart amount for events	2016-11-24 15:01:35 +01:00
Sylvain	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	3dc5f1a0e4	real fix for coupon change slot's original price (reverts cfd92cdc40)	2016-11-24 11:33:45 +01:00
Sylvain	30ab25b5a0	normalize ProjectsController code structure	2016-11-23 15:01:33 +01:00
Sylvain	cf11f6afcf	factorize currency symbol into	2016-11-23 14:27:11 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Sylvain	6c9fdaaf83	[bug] fix machine hours stats graph	2016-11-21 11:35:56 +01:00
Sylvain	38653d22d1	fix events description on the home page	2016-11-16 16:55:56 +01:00
Sylvain	c04ed51f85	[bug] translation conflict	2016-11-09 14:35:02 +01:00
Peng DU	9dca65786a	fix project step images height bug	2016-11-03 11:26:01 +01:00
Peng DU	ba5e5752a4	allow add more picture for project step	2016-11-02 14:58:06 +01:00
Peng DU	84c03a690b	add padding for summernote editor modal	2016-11-02 11:12:23 +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
Sylvain	42f7b3c75c	add HTML in event description	2016-10-26 16:33:21 +02:00
Sylvain	91f70e2c47	[bug] statistics graphs not working	2016-10-24 09:31:29 +02:00
Sylvain	7d54341d98	Merge remote-tracking branch 'github/master' into dev	2016-10-11 15:37:35 +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
Sylvain	611652ccb5	[bug] many fixes on admin calendar ... - [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated - [bug] deleting an element have an erronous confirmation message - [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console	2016-10-05 11:06:58 +02:00
Sylvain	fc747c55c7	wallet credit confirmation	2016-09-29 13:02:24 +02:00
Sylvain	1ef2c11355	add links to RSS feeds into application header	2016-09-29 11:54:08 +02:00
Sylvain	c2d2786515	fix default_host for dev and test environments	2016-09-29 10:02:31 +02:00
Sylvain	785e9a42f8	test fix asset:precompile	2016-09-28 10:52:25 +02:00
Sylvain	e48bb88f1f	use slug in traning show url	2016-09-27 16:00:22 +02:00
Sylvain	b715078e83	[admin] button to delete training from view + confirmation on machine/training deletion from view	2016-09-27 15:32:49 +02:00
Sylvain	9a71dc5ea2	trainings monitoring: open current year/month by default on training selection	2016-09-27 14:56:57 +02:00
Sylvain	d45ca7213f	updated changelog	2016-09-27 14:10:00 +02:00
Sylvain	36524d4cd9	display list of allowed extensions in project's CAD attachments	2016-09-27 14:08:04 +02:00
Sylvain	bf9ea40648	[feature #40] project images will show in full-size on a click	2016-09-27 11:50:05 +02:00
Sylvain	6e94850522	prevent project step reordering to trigger unsaved-changes dialog	2016-09-27 11:31:20 +02:00
Sylvain	1195451863	[bug] embedded video not working in tranings/machines descriptions	2016-09-27 10:45:07 +02:00
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
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
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
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	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	e5341b0b89	fix bug: cant subscribe a plan	2016-09-20 14:37:35 +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	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	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	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	c2533c0590	add custom aggs for machine & trainings stats: available bookings	2016-09-06 17:17:15 +02:00
Sylvain	9d599a14e5	display custom aggregations in front statistics	2016-09-06 16:53:04 +02:00
Sylvain	53dd54b175	working custom aggs w/ result tidy in stats query	2016-09-06 16:32:41 +02:00
Sylvain	1fec50accf	ability to run custom aggregation with query and append result to query	2016-09-06 14:21:52 +02:00
Sylvain	71a111d8ba	improved reservations settings validation (delays)	2016-09-01 16:15:41 +02:00
Sylvain	9aef331596	add textual indications about empty fields in coupon form	2016-09-01 14:54:24 +02:00
Sylvain	670e9371d8	improved machine reservation tag display	2016-09-01 14:34:08 +02:00
Sylvain	434234c235	[Bug] machine slots with tags are not displayed correctly on reservation calendar	2016-09-01 14:31:21 +02:00
Sylvain	401e88cd88	fix event hover color for age range and theme	2016-09-01 11:44:18 +02:00
Sylvain	c3505c1419	fix coupon discount if reservation+subscription when pay by stripe	2016-09-01 11:36:51 +02:00
Sylvain	cb42b46790	[Bug] machine name is not shown in plan edition	2016-08-31 17:01:01 +02:00
Sylvain	4f41aa6554	event custom prices: various fixes and removed artifacts	2016-08-30 13:07:47 +02:00
Sylvain	63a9f8bf95	update nummber of free places after event reservation payment	2016-08-30 12:45:35 +02:00
Sylvain	b9411366c2	update nb of free places after moving an event reservation with custom prices	2016-08-30 12:34:36 +02:00
Sylvain	7de896feb9	display 'pay' button when booking only custom prices tickets	2016-08-30 12:11:51 +02:00
Sylvain	feda4861f2	ability to move reservation with custom fares reservations	2016-08-30 11:27:25 +02:00
Sylvain	8aef50660a	show custom price reservations in admin/events/show reservations	2016-08-29 17:51:11 +02:00
Sylvain	60a8f60be8	display custom prices in events index	2016-08-29 17:33:21 +02:00
Sylvain	7bc19f540d	show custom price event bookings in dashboard	2016-08-29 17:21:20 +02:00
Sylvain	3d1c852576	show custom prices bookings in admin/editMember	2016-08-29 16:54:10 +02:00
Sylvain	af883ea1ec	show custom price tickets booked in event show	2016-08-29 16:28:26 +02:00
Sylvain	06d65c785a	reserve event with custom prices	2016-08-29 15:43:47 +02:00
Sylvain	12eadb8ceb	interface for booking event custom prices	2016-08-29 11:09:36 +02:00
Sylvain	c6a83e98cb	[ongoing] db architecture for custom prices reservation	2016-08-25 18:41:33 +02:00