1300 Commits

Author	SHA1	Message	Date
Sylvain	10fc7b69e9	Ability to display optional information message on event reservation page	2016-11-29 16:46:19 +01:00
Sylvain	b75cbc17d7	fix training reservation calendar witch shows all trainings slots	2016-11-29 15:48:39 +01:00
Sylvain	fd93f3cefd	updated changelog	2016-11-29 12:03:38 +01:00
Sylvain	f91959af81	updated changelog	2016-11-29 11:54:56 +01:00
Sylvain	aa7748f8eb	Merge branch 'cash' into dev	2016-11-28 12:05:18 +01:00
Sylvain	5231beb6e1	updated changelog	2016-11-28 10:11:52 +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
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	9721872b2a	updated changelog	2016-11-24 09:50:56 +01:00
Sylvain	2a029255c9	updated changelog	2016-11-23 15:10:07 +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	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	d5a5b6dd29	updated changelog	2016-11-09 13:14:53 +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	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
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
Sylvain	1bb05da16a	Version 2.4.1	2016-10-11 16:11:20 +02:00
Sylvain	e7b03599ce	updated changelog	2016-10-11 16:09:04 +02:00
Sylvain	592c250b49	updated changelog	2016-10-05 11:12:14 +02:00
Sylvain	977f3dac91	Version 2.4.0	2016-10-04 16:39:10 +02:00
Sylvain	9791c7e0fe	updated changelog	2016-09-29 12:07:18 +02:00
Sylvain	c6cf40f7cc	updated changelog	2016-09-29 10:04:37 +02:00
Sylvain	5211880ed5	updated CHANGELOG	2016-09-28 11:37:36 +02:00
Sylvain	60d60fdd65	use slugs in projects URL opened from notifications	2016-09-27 16:58:57 +02:00
Sylvain	c27c4372b0	updated CHANGELOG	2016-09-27 15:34:30 +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	d793af5012	updated changelog	2016-09-27 10:45:53 +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
Peng DU	82838ceb6e	update CHANELOG	2016-09-26 10:39:14 +02:00
Sylvain	6401b321ef	[feature] display fab-manager's version, when logged as admin	2016-09-22 16:46:14 +02:00
Peng DU	f883f8c344	update Changelog	2016-09-20 12:02:08 +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	9bc6fb5b7a	updated changelog and documentation	2016-09-15 17:45:59 +02:00
Sylvain	e3cb5456ed	updated CHANGELOG	2016-09-13 13:05:36 +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	ef5701dac6	updated changelog	2016-09-06 17:22:49 +02:00
Peng DU	6880ba9aa3	allow load locales for subdirectories	2016-09-05 16:26:28 +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	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	14ab4c7033	updated changelog	2016-08-23 10:49:02 +02:00
Sylvain	26aed7a1b5	ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message	2016-08-17 12:49:52 +02:00
Sylvain	a63c1830cd	better fix for events categories	2016-08-11 11:33:55 +02:00
Sylvain	0c3a2a7832	fix events categories	2016-08-11 11:07:49 +02:00
Sylvain	5b5394725f	updated changelog	2016-08-02 16:50:03 +02:00
Sylvain	6c428008c7	updated changelog	2016-07-27 12:05:58 +02:00
Sylvain	74154cf1f3	Merge branch 'xls' into dev ... Conflicts: CHANGELOG.md app/helpers/application_helper.rb config/locales/en.yml config/locales/fr.yml	2016-07-25 16:56:22 +02:00
Sylvain	32d239f723	[Bug #28] Event type disappear when editing the event	2016-07-25 16:16:25 +02:00
Peng DU	2d31bb1a5f	update changelog	2016-07-21 16:32:58 +02:00
Peng DU	43740b2364	update changelog	2016-07-18 18:16:54 +02:00
Sylvain	91f4694175	updated changelog	2016-07-13 18:41:08 +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	a4d301b3c8	updated changelog	2016-07-13 18:29:34 +02:00
Sylvain	f5b435895e	updated changelog	2016-07-13 16:15:50 +02:00
Sylvain	730eda0820	updated changelog	2016-07-13 16:11:31 +02:00
Sylvain	a45a648b4a	updated changelog	2016-07-13 16:05:13 +02:00
Sylvain	320999e9f9	updated changelog	2016-07-13 16:02:29 +02:00
Sylvain	4dcab27af2	API generate valid xlsx files	2016-07-05 16:13:11 +02:00
Sylvain	5750aec326	updated changelog	2016-06-30 14:20:17 +02:00
Sylvain	7d02fa9d9a	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
Sylvain	7126843eda	updated changelog for 2.3.0	2016-06-28 10:23:39 +02:00
Sylvain	8c90eab8ac	updated changelog with TODO DEPLOY	2016-06-27 16:42:27 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Peng DU	6db26e7a19	fix conflt	2016-06-27 12:47:03 +02:00
Peng DU	df8dbfae8c	fix conflt of changelog	2016-06-27 12:42:57 +02:00
Peng DU	07f231cb1f	update changelog	2016-06-27 12:41:54 +02:00
Sylvain	98edd345b1	updated changelog for v2.2.2	2016-06-23 11:49:48 +02:00
Sylvain	18c1f19840	updated changelog for v2.2.1	2016-06-22 09:19:40 +02:00
Sylvain	3138097be2	updated chagelog	2016-06-21 15:24:25 +02:00
Sylvain	be3a3e2b03	updated changelog for 2.2.0	2016-06-16 17:22:44 +02:00
Sylvain	f7d8d18bc8	[feature] paginate public list of members	2016-06-16 16:09:22 +02:00
Sylvain	c30b43f14a	updated readme	2016-06-16 13:03:10 +02:00
Sylvain	90f77ca929	updated changelog	2016-06-15 12:05:04 +02:00
Sylvain	e503d6edd8	optimize trainings API	2016-06-14 15:42:28 +02:00
Sylvain	f924144fda	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
Sylvain	65328451ac	updated changelog	2016-05-31 10:06:18 +02:00
Sylvain	7f050223eb	Merge branch 'hotfix' into dev ... Conflicts: CHANGELOG.md	2016-05-24 14:59:07 +02:00
Sylvain	f056c1eb91	updated changelog for 2.1.2	2016-05-24 14:56:58 +02:00
Sylvain	cab70654d6	updated change log	2016-05-18 17:33:42 +02:00
Sylvain	cbaf1d8610	updated change log	2016-05-18 17:30:33 +02:00
Nicolas Florentin	7f032526cb	implements open_api various endpoints	2016-05-04 18:17:50 +02:00
Sylvain	dc5c125cdb	updated changes log	2016-05-03 16:39:05 +02:00
Sylvain	ff316f7bdd	updated changes log	2016-05-03 16:33:06 +02:00
cyril	ce6979729a	add changelog file	2016-05-02 17:14:21 +02:00