894 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	29f4974e78	Merge branch 'dev' for release 2.4.4	2016-11-24 16:48:38 +01:00
Sylvain	762d85f378	Version 2.4.4	2016-11-24 16:48:05 +01:00
Sylvain	a37dc5ab97	updated changelog	2016-11-24 16:44:47 +01:00
Sylvain	55564df8e8	improve translation to make it sex-agnostic	2016-11-24 16:43:15 +01:00
Sylvain	8b772b8c70	fix translation name in plan form	2016-11-24 16:42:30 +01:00
Sylvain	012a6b63c8	fix migration rollback	2016-11-24 16:42:02 +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
Peng DU	63a3bcf19a	Fix a bug: invoice of reservation show payment by debit card when user pay with wallet	2016-11-24 14:09:34 +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	9721872b2a	updated changelog	2016-11-24 09:50:56 +01:00
Sylvain	8419efc7f5	handle unconfigured twitter's keys	2016-11-24 09:38:42 +01:00
Sylvain	fc1f19a92f	completed readme about TWITTER_NAME	2016-11-24 09:12:39 +01:00
Sylvain	0cb0ff3a06	[ongoing] using cash coupon in reservation logic	2016-11-23 17:17:34 +01:00
Sylvain	c13f640e81	remove rails find_by_* helpers	2016-11-23 16:30:19 +01:00
Sylvain	cc06bcab85	fix cash coupon creation on stripe + store amount in centimes	2016-11-23 15:44:59 +01:00
Sylvain	2a029255c9	updated changelog	2016-11-23 15:10:07 +01:00
Sylvain	30ab25b5a0	normalize ProjectsController code structure	2016-11-23 15:01:33 +01:00
Sylvain	21d887945e	improve translation to make it sex-agnostic	2016-11-23 14:31:58 +01:00
Sylvain	cf11f6afcf	factorize currency symbol into	2016-11-23 14:27:11 +01:00
Sylvain	51faeedfa8	fix translation name in plan form	2016-11-23 12:57:33 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +01:00
Sylvain	b7737be6f3	fix migration rollback	2016-11-23 11:44:48 +01:00
Sylvain	42f1213af7	update documentation schemas	2016-11-23 11:32:22 +01:00
Sylvain	327a6eab11	fix typo	2016-11-21 15:00:34 +01:00
Sylvain	e365034374	Merge branch 'dev' for release 2.4.3	2016-11-21 14:26:02 +01:00
Sylvain	1747157c6b	Version 2.4.3	2016-11-21 14:16:55 +01:00
Sylvain	e38afc0d4b	updated changelog	2016-11-21 12:00:03 +01:00
Sylvain	52ad1b2c13	fix trainings, users, events graphs	2016-11-21 11:45:48 +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	d46e6cf9c9	[members excel export] invoicing disabled	2016-11-16 15:08:24 +01:00
Sylvain	da71ba783c	[bug] exports for events reservation always have seats=1 (fixes #54)	2016-11-09 15:01:58 +01:00
Sylvain	a80df7f993	updated changelog	2016-11-09 14:36:28 +01:00
Sylvain	c04ed51f85	[bug] translation conflict	2016-11-09 14:35:02 +01:00
Sylvain	d5a5b6dd29	updated changelog	2016-11-09 13:14:53 +01:00
Sylvain	2dcd980be3	[bug] recurrent events doesn't have the configured theme and age range	2016-11-09 13:12:30 +01:00
Sylvain	db280ce6d8	fix application startup warnings: Use strings for Figaro configuration	2016-11-09 13:05:26 +01:00
Sylvain	8ab2df1bc7	Merge branch 'dev' for release 2.4.2	2016-11-08 16:24:59 +01:00
Sylvain	7c328af357	Version 2.4.2	2016-11-08 16:24:34 +01:00
Peng DU	99cca406d5	fix bug: event date period dant show correct in invoice	2016-11-03 12:17:19 +01:00
Peng DU	9dca65786a	fix project step images height bug	2016-11-03 11:26:01 +01:00
Peng DU	f1b749d5f2	Image max size is configutable, size by default is 2 megabytes	2016-11-02 15:36:22 +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	010fe37221	forum is preferred channel for feature requests	2016-10-27 11:32:50 +02: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	1449ca2b82	updated changelog	2016-10-24 09:33:46 +02:00