1170 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Sylvain	daefe626db	replace letter_opener by MailCatcher	2017-03-02 10:29:17 +01:00
Sylvain	f5ac9b1913	[bug] month navigation in client calendar (#59)	2017-03-01 17:23:46 +01:00
Sylvain	b9dcf5a512	[bug] delete event with custom price (#61)	2017-03-01 17:09:37 +01:00
Sylvain	1092257526	Merge branch 'spaces' into dev	2017-03-01 16:56:41 +01:00
Sylvain	2e094a501f	init spaces prices on plan creation	2017-03-01 16:45:05 +01:00
Sylvain	6df0a4090e	hide spaces in admin's price management and in plan edition if spaces are disabled	2017-03-01 15:58:40 +01:00
Sylvain	6e10377624	updated change log	2017-03-01 15:52:42 +01:00
Sylvain	7ba50a72b7	reorganize spaces menu entries	2017-03-01 15:51:13 +01:00
Sylvain	13689fd707	set spaces disabled by default	2017-03-01 15:50:49 +01:00
Sylvain	f208caf5b0	fix change space reservation when many users on the slot does not change the good user	2017-03-01 14:47:59 +01:00
Sylvain	3c6bcccd0d	reset reservation modification on user change	2017-03-01 14:38:29 +01:00
Sylvain	30c6954464	prevent modify reservation to a complete slot	2017-03-01 14:35:07 +01:00
Sylvain	c9d6df13f9	disable space projects	2017-03-01 14:30:53 +01:00
Sylvain	185084f244	prevent admin from creating space availabilities that are not multiples of 1h	2017-03-01 14:27:01 +01:00
Sylvain	1503e9b83f	fix typo	2017-03-01 14:20:50 +01:00
Sylvain	cdefcebf4c	fix typo	2017-03-01 12:59:59 +01:00
Sylvain	cf9181770b	export space statistics	2017-03-01 12:56:11 +01:00
Sylvain	05bf899393	delete old space stats when regenerating	2017-03-01 11:58:11 +01:00
Sylvain	b48451f9f8	improved space reservation optional explication message	2017-03-01 11:47:20 +01:00
Sylvain	d450301934	[to test] space reservations	2017-02-28 18:13:38 +01:00
Sylvain	2419a96010	spaces stats index in elastic	2017-02-28 17:49:19 +01:00
Sylvain	4a9fb5855f	filter spaces in client calendar	2017-02-28 17:17:43 +01:00
Sylvain	e1178df45b	show space details on click in client calendar	2017-02-28 16:59:28 +01:00
Sylvain	c936b283f7	display spaces status in client calendar	2017-02-28 16:51:56 +01:00
Sylvain	0e94f8c3d4	Redo "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 4cbfbdc4e0.	2017-02-28 13:23:31 +01:00
Sylvain	4cbfbdc4e0	Revert "change DB model to allow many_to_many relationship between Slot and Reservation" ... This reverts commit 03d922e214.	2017-02-28 12:36:50 +01:00
Sylvain	e86de06c45	fix revert migrations	2017-02-28 12:25:16 +01:00
Sylvain	a0e7e7951f	[ongoing] display spaces in public calendar	2017-02-28 11:59:48 +01:00
Sylvain	4703350de5	fix pay with stripe and coupon	2017-02-28 10:18:02 +01:00
Sylvain	b48557fd96	invoice generation for space reservation	2017-02-27 17:42:36 +01:00
Sylvain	43f78ff0e0	fix credits usage in space reservation	2017-02-27 17:38:15 +01:00