250 Commits

Author	SHA1	Message	Date
Sylvain	1e3066f6f4	Ability to parametrize machines order on the booking page	2018-09-18 15:30:54 +02:00
Sylvain	a26e8edf19	fix rendering issues in settings	2018-09-18 14:38:43 +02:00
Sylvain	c046b1d26b	[bug] fablab:fix:categories_slugs	2018-09-06 11:22:23 +02:00
Sylvain	bfa849acc2	Version 2.6.5	2018-07-24 14:44:14 +02:00
Sylvain	1b33f3c865	display the machine reservation user name to other members	2018-07-24 12:24:51 +02:00
Sylvain	9af1e5c658	fixed User.to_json	2018-07-24 11:13:05 +02:00
Sylvain	4db9ffb7b8	updated deploy instructions	2018-07-12 14:35:41 +02:00
Sylvain	4499c10e24	[security] fix for CVE-2018-3760	2018-07-12 14:34:20 +02:00
Sylvain	38e425cbc3	[security] fix for CVE-2017-18258	2018-07-12 14:26:21 +02:00
Sylvain	a7cc1711aa	Merge branch 'elastic5' into dev	2018-07-12 12:50:52 +02:00
Sylvain	407c18075c	[bug] event catgories not correct in statistics	2018-07-12 12:48:50 +02:00
Sylvain	7666fd88f8	fixed syntax & typo in readme	2018-07-04 14:32:17 +02:00
Sylvain	697ea87e37	[bug] unable to filter statistics from age 0	2018-06-08 12:06:22 +02:00
Sylvain	e7f4c1ffcc	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2018-06-04 12:05:10 +02:00
Sylvain	d3da7a2d35	instructions for upgrading elastic	2018-06-04 12:03:46 +02:00
Sylvain	3e4e5e3e9b	[security] fix for CVE-2018-3741	2018-04-30 07:57:21 +02:00
Sylvain	1aad974782	Ensure elasticSearch indices are started with green status on new installations	2018-04-04 14:05:48 +02:00
Sylvain	d606130bc3	[security] CVE-2018-8048	2018-03-27 10:17:41 +02:00
Sylvain	59152c3485	updated omniauth (omniauth#872)	2018-03-26 17:03:57 +02:00
Nicolas Florentin	f695813688	updates changelog for release of 2.6.4	2018-03-15 15:07:03 +01:00
Nicolas Florentin	a85877740d	updates changelog	2018-03-08 12:18:31 +01:00
Nicolas Florentin	ec21cc2a3c	updates changelog	2018-03-08 10:45:20 +01:00
Sylvain	679ccfec99	ability to share trainings on social medias	2018-01-09 15:09:48 +01:00
Sylvain	290b2ad513	[bug] facebook sharing of event has HTML tags in description	2018-01-09 15:02:45 +01:00
Sylvain	bdf799f79e	[bug] a reminder notification were sent for canceled reservations	2018-01-09 14:44:19 +01:00
Sylvain	f622789e5d	Version 2.6.3	2018-01-02 10:26:04 +01:00
Sylvain	563eee40fa	add test for credits	2017-12-21 12:00:11 +01:00
Sylvain	72634162c6	[bug] unable to create training credit	2017-12-21 11:49:51 +01:00
Sylvain	247c446af0	fix typo in documentation	2017-12-21 11:32:13 +01:00
Sylvain	37f7642ead	Version 2.6.1	2017-12-14 16:46:10 +01:00
Sylvain	537fc41514	[doc] docker installation instructions	2017-12-14 14:33:49 +01:00
Sylvain	6539c60a14	[security] fix for CVE-2015-3224	2017-12-13 15:28:57 +01:00
Sylvain	0b3192c3ab	[bug] subscription refund generate PDF with wrong dates	2017-12-13 13:16:32 +01:00
Sylvain	8c156e4830	fix docker-compose deploy instructions	2017-11-15 10:20:23 +01:00
Sylvain	c760a96320	updated changelog with deploy instructions	2017-11-13 13:20:30 +01:00
Sylvain	80ce5c43ea	Merge branch 'dev' for release 2.6.0	2017-11-13 13:17:01 +01:00
Sylvain	dc138c21a8	Version 2.6.0	2017-11-13 13:16:24 +01:00
Sylvain	c5b3de9a76	upgrade rails minor version	2017-11-13 12:25:28 +01:00
Sylvain	639610dc7a	[bug] unable to display profiles of users whom any reservation is associated with a deleted object	2017-11-13 11:15:33 +01:00
Sylvain	73a62bd9a0	[feature] allow setting decimal prices	2017-11-02 15:33:56 +01:00
Sylvain	a4bcad3059	updated changelog	2017-10-11 16:52:46 +02:00
Sylvain	8acd5eba27	updated changelog	2017-10-11 16:10:18 +02:00
Sylvain	25eb24e516	Confirmation and error handling while deleting an event	2017-10-02 13:14:15 +02:00
Sylvain	bbae623cac	[bug] image deformed on small device	2017-09-26 16:32:55 +02:00
Sylvain	601ac177b6	[bug] rendering for social networks shares	2017-09-26 15:48:47 +02:00
Sylvain	f874748f74	[bug] fix events monitoring pagination	2017-09-25 15:48:21 +02:00
Sylvain	8d92f8492a	removed full-calendar hack, improved remove slot precess	2017-09-18 12:42:45 +02:00
Sylvain	7d9d0cd075	updated changelog	2017-09-18 11:02:27 +02:00
Sylvain	6efb4eb773	Merge branch 'dev' for release 2.5.14	2017-09-12 08:43:53 +02:00
Sylvain	8b1b39dc49	Version 2.5.14	2017-09-12 08:43:28 +02:00