7245 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	c6d9cbd88d	add integration test for coupon	2016-09-08 14:26:21 +02:00
Nicolas Florentin	d45b6f8270	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-09-08 09:40:05 +02:00
Sylvain	d99d090814	remove duplicate in mime types	2016-09-07 16:30:14 +02:00
Sylvain	254612dbdc	fix typo	2016-09-07 16:17:22 +02:00
Sylvain	e2bf7bf2ad	updated CHANGELOG	2016-09-07 16:07:07 +02:00
Sylvain	87eb75801d	updated changelog	2016-09-07 15:58:41 +02:00
Sylvain	2607836203	fix message in case of wrong mime type	2016-09-07 15:56:41 +02:00
Sylvain	19e89cce3d	[feature] validate project attachement by mime type	2016-09-07 15:44:19 +02:00
Nicolas Florentin	1bd502cd04	Create ISSUE_TEMPLATE.md	2016-09-07 12:27:14 +02:00
Sylvain	6bbb45c953	add more extensions to the allowed projects attachements	2016-09-07 12:17:21 +02:00
Sylvain	ef5701dac6	updated changelog	2016-09-06 17:22:49 +02:00
Sylvain	ec49e658d7	Merge branch 'stats' into dev	2016-09-06 17:17:35 +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
Peng DU	b2fac69b14	update docker-compose.yml	2016-09-06 16:02:33 +02:00
Peng DU	f05a147847	update docker-compose.yml	2016-09-06 16:01:10 +02:00
Peng DU	7ed8a93503	update README	2016-09-06 15:11:03 +02:00
Sylvain	1fec50accf	ability to run custom aggregation with query and append result to query	2016-09-06 14:21:52 +02:00
Peng DU	b3ae59f426	separate nginx and app in docker	2016-09-06 12:19:47 +02:00
Sylvain	ea671d03a4	database structure for custom aggregations in statistics	2016-09-05 17:16:23 +02:00
Peng DU	c384cf9b56	remove locales example file	2016-09-05 17:08:24 +02:00
Peng DU	6880ba9aa3	allow load locales for subdirectories	2016-09-05 16:26:28 +02:00
Sylvain	d0837706b6	fixed rake tasks	2016-09-05 15:30:46 +02:00
Sylvain	701b913eb1	[ongoing] elastic data structure for storing availabilities info	2016-09-05 15:15:31 +02:00
Sylvain	9ed8542e5d	added know issue for {elastic + ubuntu 16.04} (see #38) + fix typos	2016-09-05 08:54:01 +02:00
Sylvain	054e965d3d	fix markdown syntax	2016-09-05 08:38:50 +02:00
Sylvain	3fc53105d7	fix typo	2016-09-01 18:10:54 +02:00
Sylvain	3b2276f3f8	updated the README instructions about postgreSQL (fixes #36)	2016-09-01 18:06:18 +02:00
Sylvain	3dea7a63a9	prevent sending multiple reminders for reservations with multiple slots	2016-09-01 16:26:08 +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	9212ef7c4a	updated changelog	2016-08-31 15:50:05 +02:00
Sylvain	0ffe5733d6	fix typo & completed deployment process in changelog	2016-08-31 15:44:23 +02:00
Sylvain	e3db5e427b	updated documentational schemas	2016-08-31 12:07:56 +02:00
Sylvain	87104a6b97	remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events	2016-08-31 11:58:37 +02:00
Sylvain	e281a20ada	database migration to event price category	2016-08-30 18:30:21 +02:00
Sylvain	4c9879768b	fix statistic generation for events with custom prices	2016-08-30 17:03:05 +02:00
Sylvain	ea73b9a88b	fix create event without custom price + fix test fixtures	2016-08-30 14:48:22 +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	f175b4b28e	display custom prices places names in reservation summary after booking an event	2016-08-30 10:17:52 +02:00