1101 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	5981aa342d	Version 2.5.3	2017-04-27 14:23:06 +02:00
Sylvain	1f7bf2a591	Rails l10n support for 115 new locations	2017-04-27 14:22:07 +02:00
cyril	d63969daea	update changelog	2017-04-13 14:27:11 +02:00
cyril	d1a1b63db5	Project view: added responsive support on external images	2017-04-13 14:26:29 +02:00
cyril	61278127d5	Merge branch 'dev'	2017-04-12 20:34:35 +02:00
cyril	2971fd25b8	release 2.5.2	2017-04-12 20:31:52 +02:00
matbgn	816f4b8877	Merge branch 'fix_display_CL_docker-compose' into dev	2017-04-12 16:53:01 +02:00
matbgn	36d7cfe701	Fix the way CL are displayed (inline instead of l/l) for db creation	2017-04-12 16:52:41 +02:00
matbgn	a52e0e4371	Merge branch 'fix_docker-compose_env_file' into dev	2017-04-12 16:27:06 +02:00
matbgn	457dd8e201	Modified the docker-compose.yml position due to insertion $PWD/config	2017-04-12 16:26:34 +02:00
cyril	a4721b9656	update changelog	2017-04-03 17:08:47 +02:00
Nicolas Florentin	004e74e13e	extracts first admin created email and password into environment variables	2017-04-03 15:48:32 +02:00
Nicolas Florentin	77a24f14c6	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2017-04-03 15:34:45 +02:00
cyril	f3392e391c	Merge branch 'dev' for release 2.5.1	2017-03-28 20:28:36 +02:00
cyril	4245bda9fd	Version 2.5.1	2017-03-28 20:26:32 +02:00
cyril	3fcf61de24	hide spaces in admin's credit management if spaces are disabled	2017-03-28 20:13:18 +02:00
Peng DU	1d53e3b5b7	fix json template of training reservation	2017-03-28 19:53:48 +02:00
Peng DU	2cc8096236	fix bug: cant get list of training reservation	2017-03-28 19:45:36 +02:00
Sylvain	c9beb3110f	Merge branch 'dev' for release 2.5.0	2017-03-28 13:45:23 +02:00
Sylvain	966ada599d	Version 2.5.0	2017-03-28 13:44:02 +02:00
Sylvain	0c733479a5	Merge branch 'FabLab61-master' into dev	2017-03-28 13:30:50 +02:00
Sylvain	69fe609288	Merge branch 'master' of git://github.com/FabLab61/fab-manager into FabLab61-master	2017-03-28 13:30:31 +02:00
Sylvain	57ad5ca50e	updated schema	2017-03-28 13:30:10 +02:00
Sylvain	c65525de60	updated changelog	2017-03-21 15:55:41 +01:00
Sylvain	ff8e804750	Merge branch 'week' into dev	2017-03-21 15:51:52 +01:00
Sylvain	1c483944b9	updated changelog	2017-03-21 15:48:13 +01:00
Sylvain	f4187d0b4b	[bug] news plans statistics are not shown	2017-03-21 15:47:25 +01:00
Sylvain	5abc85ae0a	[feature] weekly plans	2017-03-21 13:06:02 +01:00
Sylvain	21560dd5d9	show space details on image-click	2017-03-21 12:06:58 +01:00
Sylvain	8e206cd3c5	[bug] subscription name is not shown in invoices	2017-03-15 16:31:51 +01:00
Sylvain	2c1b65eab9	Merge branch 'hotfix' into dev	2017-03-15 13:07:28 +01:00
Sylvain	d9cf6af21f	Merge branch 'hotfix' for release 2.4.11	2017-03-15 12:52:20 +01:00
Sylvain	b1abf35ae1	Version 2.4.11	2017-03-15 12:51:53 +01:00
Sylvain	8d5966396d	[bug] editing a plan remove the rolling attribute	2017-03-15 12:50:19 +01:00
Nicolas Florentin	2255335727	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2017-03-15 12:08:05 +01:00
Pavel Serikov	a58513a608	Portability of docker-compose.yml file has been improved	2017-03-14 00:17:54 +03:00
Sylvain	9978319b01	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2017-03-13 10:21:50 +01:00
Sylvain	38ce1b23b7	fix duplicates SLOT_DURATION declarations	2017-03-13 10:21:41 +01:00
Peng DU	e09b15daf0	supervisor can save more log	2017-03-07 14:04:35 +01:00
Sylvain	796f0a87ae	ability to remove an unused custom price for an event (#61)	2017-03-02 18:36:54 +01:00
Sylvain	0f6358011f	improved space explications style	2017-03-02 17:04:47 +01:00
Sylvain	462dbcf75b	updated changelog	2017-03-02 16:52:20 +01:00
Sylvain	20ccc809aa	prevent polling notifications when the page is in background	2017-03-02 16:50:02 +01:00
Sylvain	853a3160d3	add notice about availabilities export	2017-03-02 13:39:49 +01:00
Sylvain	d8b8c39cb3	add day of week to availabilities export	2017-03-02 13:31:12 +01:00
Sylvain	c21f7ed5dc	export events availabilities	2017-03-02 13:05:29 +01:00
Sylvain	056060a88d	export spaces availabilities	2017-03-02 12:57:07 +01:00
Sylvain	d9b30fa2b0	export trainings availabilities	2017-03-02 12:44:59 +01:00
Sylvain	504fe49964	export machines availabilities	2017-03-02 12:34:28 +01:00
Sylvain	4d09ed37a3	export machines availabilities	2017-03-02 12:34:16 +01:00