1101 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Sylvain	31f3c00b3a	fix pay many space slots by stripe	2017-02-27 16:51:11 +01:00
Sylvain	b5a0b43689	fix manage reservations	2017-02-27 16:43:39 +01:00
Sylvain	6a132948af	fixed slots display in space reservation calendar	2017-02-27 16:35:41 +01:00
Sylvain	847a0ba140	display correct slot status in space reservation calendar	2017-02-27 16:15:27 +01:00
Sylvain	af5f3c777d	fix space slot status in API	2017-02-27 13:48:35 +01:00
Sylvain	03d922e214	change DB model to allow many_to_many relationship between Slot and Reservation	2017-02-27 13:15:31 +01:00
Sylvain	fd2d18bf94	fix message on delete availability error	2017-02-27 10:14:19 +01:00
Sylvain	8e86c4b212	[ongoing] spaces reservation calendar	2017-02-23 17:45:55 +01:00
Sylvain	1efd506a5d	fix display in all trainings calendar	2017-02-23 13:50:45 +01:00
Sylvain	59384698f7	clean controllers imports	2017-02-23 13:46:16 +01:00
Sylvain	32a2a220bf	clean trainings reservation locales	2017-02-23 12:52:54 +01:00
Sylvain	b25e69d131	fix do not subscribe	2017-02-23 12:50:12 +01:00
Sylvain	201eefc7bd	fix reservation through all trainings calendar	2017-02-23 12:39:50 +01:00
Sylvain	b098281155	fix reservation through all trainings calendar	2017-02-23 12:23:00 +01:00
Sylvain	ad83d38305	prevent book full event	2017-02-23 11:24:44 +01:00
Sylvain	8ea611882b	fix training reservation	2017-02-23 11:13:25 +01:00
Sylvain	26bf520c4d	fix typo	2017-02-22 18:09:41 +01:00
Sylvain	49951034f2	updated changelog	2017-02-22 17:55:31 +01:00
Sylvain	082fba4466	Merge branch 'cart' into spaces	2017-02-22 17:48:33 +01:00