172 Commits

Author	SHA1	Message	Date
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	13689fd707	set spaces disabled by default	2017-03-01 15:50:49 +01:00
Sylvain	c9d6df13f9	disable space projects	2017-03-01 14:30:53 +01:00
Sylvain	cdefcebf4c	fix typo	2017-03-01 12:59:59 +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	a0e7e7951f	[ongoing] display spaces in public calendar	2017-02-28 11:59:48 +01:00
Sylvain	847a0ba140	display correct slot status in space reservation calendar	2017-02-27 16:15:27 +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	8e86c4b212	[ongoing] spaces reservation calendar	2017-02-23 17:45:55 +01:00
Sylvain	8ea611882b	fix training reservation	2017-02-23 11:13:25 +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	1959856235	use the cart directive in training reservation	2017-02-22 16:45:13 +01:00
Sylvain	5a41424579	fixed & improved js routing	2017-02-21 15:41:45 +01:00
Sylvain	23b9851218	allow enable/disable spaces -> disabled by default	2017-02-15 15:41:25 +01:00
Sylvain	1855935322	interface to create space availabilities	2017-02-15 11:32:29 +01:00
Sylvain	0adb9e29c6	space edition interface	2017-02-14 13:36:10 +01:00
Sylvain	73a5689140	inteface to display spaces	2017-02-14 12:41:51 +01:00
Sylvain	05d4b7b3c5	spaces api	2017-02-13 16:10:12 +01:00
Sylvain	c479502dd0	[bug] too many unread notifications cause system memory overflow	2017-01-05 15:06:54 +01:00
Sylvain	a7fdc4d741	fix potentital issue with sso + enterprise profile	2016-12-14 15:55:12 +01:00
Sylvain	3ce41f0c5c	[to test] send cash coupon to user by mail	2016-11-24 18:17:49 +01:00
Sylvain	0a08c4c32d	check cash coupons does not exceed cart amount for subscriptions	2016-11-24 16:38:22 +01:00
Sylvain	04e10c8bb6	check cash coupons does not exceed cart amount for trainings & machines	2016-11-24 13:58:41 +01:00
Sylvain	c13f640e81	remove rails find_by_* helpers	2016-11-23 16:30:19 +01:00
Sylvain	cc06bcab85	fix cash coupon creation on stripe + store amount in centimes	2016-11-23 15:44:59 +01:00
Sylvain	ad2911529c	db model, api and interface for cash coupons	2016-11-23 12:43:42 +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
Peng DU	99cca406d5	fix bug: event date period dant show correct in invoice	2016-11-03 12:17:19 +01:00
Peng DU	9dca65786a	fix project step images height bug	2016-11-03 11:26:01 +01:00
Peng DU	ba5e5752a4	allow add more picture for project step	2016-11-02 14:58:06 +01:00
Sylvain	c500518c28	[bug] sharing project or event w/o image on social network render error 500	2016-10-11 16:07:34 +02:00
Kenneth Lim	18bc37749b	locale: informations --> information ... Not sure if this helps but information does not require an `s`. :) Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>	2016-10-07 17:11:58 +08:00
Sylvain	1ef2c11355	add links to RSS feeds into application header	2016-09-29 11:54:08 +02:00
Sylvain	34ad1c9056	move RSS code into separate folders	2016-09-29 10:53:20 +02:00
Sylvain	376cb6dbe9	Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds	2016-09-29 10:09:15 +02:00
cyril	a0fef8d046	bug fix: not to force https in env production for root_url helper	2016-09-28 13:58:22 +02:00
Sylvain	60d60fdd65	use slugs in projects URL opened from notifications	2016-09-27 16:58:57 +02:00
Sylvain	e48bb88f1f	use slug in traning show url	2016-09-27 16:00:22 +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	6401b321ef	[feature] display fab-manager's version, when logged as admin	2016-09-22 16:46:14 +02:00
Peng DU	5d6aa163b5	change groups cache key name	2016-09-20 11:39:49 +02:00
Vincent	6920793ce1	add RSS feed to events index	2016-09-15 22:22:35 +02:00
Vincent	a5c6ba5f7d	add RSS feed to projects index	2016-09-15 21:50:08 +02:00
Sylvain	13f416a101	[sso] save and restore field data mapping	2016-09-15 15:58:21 +02:00
Sylvain	50543b8d09	[sso] give informations about the expected data in sso mapping	2016-09-14 16:41:45 +02:00
Sylvain	ec0f597067	[sso] display strategy name in providers list	2016-09-13 12:06:25 +02:00