1168 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Sylvain	03758d336c	fix move & cancel training reservation + fix display after cancel for machines & training	2017-02-22 17:45:22 +01:00
Sylvain	40ec38465c	fix display: after event move, starting a new move does not reset the previous move summary	2017-02-22 17:31:02 +01:00
Sylvain	c12366c9f1	[bug] unable to see reserved trainings for admin in booking calendar	2017-02-22 17:29:35 +01:00
Sylvain	71a3c8b41f	pluralize selection helper in cart	2017-02-22 16:53:58 +01:00
Sylvain	1959856235	use the cart directive in training reservation	2017-02-22 16:45:13 +01:00
Sylvain	dbc5d8836d	ability to add only one item in the cart	2017-02-22 14:41:49 +01:00
Sylvain	3e49c35414	improved comments	2017-02-22 13:50:13 +01:00
Sylvain	c2c400107d	improved tag management in cart	2017-02-22 11:23:32 +01:00
Sylvain	4bb9728502	clean machines controller	2017-02-22 11:01:52 +01:00
Sylvain	ce087ae778	refacto wording to make cart reservableType agnostic	2017-02-22 10:51:07 +01:00
Sylvain	c4824f99ba	fix summary after event moved	2017-02-22 10:28:14 +01:00
Sylvain	7a21a907a8	offer slot from cart + [ongoing] refacto cart translations	2017-02-22 09:44:15 +01:00
Sylvain	a463ad6a2a	[ongoing] refacto cart translations	2017-02-21 17:45:53 +01:00
Sylvain	86371a42df	fix display alter when exchanging events if tag missmatch	2017-02-21 17:44:27 +01:00
Sylvain	9b2ba8528f	fix machines controller JSDoc	2017-02-21 17:43:39 +01:00
Sylvain	76478bc075	display reservable name in summary after payment	2017-02-21 17:26:54 +01:00
Sylvain	4fa171da9d	display summary after payment + ongoing clean template from references to machine	2017-02-21 17:23:53 +01:00
Sylvain	11619dc6c5	remove reference to machine in cart directive code	2017-02-21 16:41:53 +01:00
Sylvain	5a41424579	fixed & improved js routing	2017-02-21 15:41:45 +01:00
Sylvain	3837604dd6	fix remove slot from cart	2017-02-21 15:26:11 +01:00
Sylvain	fe6f85eb7c	fix after payment update calendar	2017-02-21 14:48:59 +01:00
Sylvain	3db55019c9	split calendar & cart logic for machines	2017-02-21 13:42:12 +01:00
Sylvain	d00ce4d409	[bug] unable to delete admin	2017-02-21 10:36:54 +01:00
Sylvain	afd1cb4ce7	[bug] unable to delete admin	2017-02-21 10:36:00 +01:00
Sylvain	85572a03db	[ongoing] move payment to cart component	2017-02-20 17:17:27 +01:00
Sylvain	9b7f74e02d	handle coupons & plans & user change in cart directive	2017-02-20 15:07:14 +01:00
Sylvain	62860a45fc	fix typo	2017-02-20 09:32:43 +01:00
Sylvain	049606b450	[ongoing] reservation cart refactoring	2017-02-16 17:57:14 +01:00
Sylvain	8343c1503d	disabled ability to create space availabilities if no spaces	2017-02-16 12:06:44 +01:00
Sylvain	1851ef9543	update setup instructions to fix non-creation of f_unaccent function	2017-02-16 11:27:31 +01:00
Sylvain	e7d18eac81	update setup instructions to fix non-creation of f_unaccent function	2017-02-16 11:21:43 +01:00
Sylvain	64b79e014f	updated db schema	2017-02-16 08:53:51 +01:00
Sylvain	f850c66f01	prevent add space availability if disabled	2017-02-15 16:58:17 +01:00