52 Commits

Author	SHA1	Message	Date
Sylvain	e930e04ed6	add age&theme filters to statistics	2016-06-30 12:48:46 +02:00
Sylvain	e36df94f0f	server-side protection against deleting used filters	2016-06-30 11:39:56 +02:00
Sylvain	c8b42f1b7f	add slugs to event filters + add categories into statistics + prevent remove linked elements in front	2016-06-30 11:24:57 +02:00
Sylvain	812d7a3c05	server-side protection against last category deletion	2016-06-30 09:57:40 +02:00
Sylvain	eb7ee6300e	remove associations with events on filter deletion	2016-06-29 17:26:41 +02:00
Sylvain	cbbd697d38	age_range & theme for event model	2016-06-28 15:56:37 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Peng DU	df8dbfae8c	fix conflt of changelog	2016-06-27 12:42:57 +02:00
Peng DU	702e35650f	event cache	2016-06-24 18:26:11 +02:00
Peng DU	60f504c660	event categoriy is required	2016-06-22 18:56:45 +02:00
Peng DU	4dff74827b	optimise machine/training availabilities query	2016-06-22 12:54:12 +02:00
Sylvain	1a8d2db53c	[feature][UI][profile banner] set default picture	2016-05-18 16:53:10 +02:00
Sylvain	a66b314e7b	[feature] background picture of profile banner customization	2016-05-18 16:15:54 +02:00
Sylvain	0061c3dca6	reorganize profile header zone	2016-05-17 16:41:32 +02:00
Sylvain	93edd6eaa8	[ongoing] UI refactoring of public profile	2016-05-16 18:20:22 +02:00
Nicolas Florentin	7f032526cb	implements open_api various endpoints	2016-05-04 18:17:50 +02:00
Nicolas Florentin	92b3471032	creates models open_api client and calls_count_tracing, adds worker to trace calls count	2016-05-04 11:48:14 +02:00
Nicolas Florentin	1a446bf646	frontend openlab search view, ctrl, services	2016-04-22 18:17:55 +02:00
Nicolas Florentin	5ee27da51e	index updated_at, created_at, published_at datetimes	2016-04-21 18:19:55 +02:00
Nicolas Florentin	ec203a8ef8	adds minimal validation to projects	2016-04-21 17:10:50 +02:00
Nicolas Florentin	f65bb95575	almost finishes synchro with openlab system	2016-04-21 11:42:43 +02:00
Nicolas Florentin	711b18f6cd	initial commit	2016-04-20 18:13:36 +02:00
Nicolas Florentin	ed478f95c7	UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox	2016-04-20 11:24:28 +02:00
Sylvain	d880a8f0f4	fix unable to reserve Event	2016-04-13 18:21:01 +02:00
Sylvain	eb2bc54cec	Merge branch '2-0-rc1' into tests	2016-04-13 14:03:28 +02:00
Sylvain	a0397a2c15	[bug taiga#25] allow event update if changing ng_places	2016-04-13 13:37:05 +02:00
Sylvain	e1567ba7c5	[bug taiga#25] allow event update if removing nb places	2016-04-13 13:05:16 +02:00
Sylvain	11b43afc9a	[bug taiga#25] allow event update if no places nb was set	2016-04-13 12:09:00 +02:00
Sylvain	ef72d07a9e	[bug taiga#21] undefined method[] on notify_admin_profile_complete	2016-04-12 14:18:07 +02:00
Nicolas Florentin	1344e09f96	adds comments to model reservation	2016-04-08 16:59:09 +02:00
Nicolas Florentin	fa64fd7a2e	remove useless method	2016-04-08 16:58:46 +02:00
Nicolas Florentin	d104403af0	little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine	2016-04-08 11:17:52 +02:00
Nicolas Florentin	c78e010888	refacto method generate_invoice_items using UsersCredits::Manager service	2016-04-08 11:12:03 +02:00
Nicolas Florentin	7649e953e4	refacto subscription extension with first training using a service	2016-04-07 17:57:48 +02:00
Nicolas Florentin	7748d601f8	uses users_credits/manager service in models reservation and subscription, and adds integration tests	2016-04-07 16:02:09 +02:00
Nicolas Florentin	2ab8d04a68	adds comment to model invoice_item	2016-04-07 16:00:12 +02:00
Sylvain	b72609c072	test and validation from plan group	2016-04-07 12:28:25 +02:00
Nicolas Florentin	752f40a951	Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests	2016-04-06 18:24:51 +02:00
Nicolas Florentin	f12646aaf9	adds integration tests for reservation	2016-04-06 18:23:32 +02:00
Sylvain	6027fb5f38	Merge branch 'hotfix' into tests	2016-04-06 17:47:10 +02:00
Sylvain	929e756b10	[bug] fix incorrect VAT rate on invoices	2016-04-06 17:46:24 +02:00
Sylvain	150e58d47f	test invalid abuse	2016-04-06 14:58:53 +02:00
Nicolas Florentin	3e112c13eb	removes model and migrations relative to old model machines_pricings	2016-04-05 10:52:29 +02:00
Nicolas Florentin	5d38f1e3a5	does not validate length of availability if start_at or end_at are blank and already missing	2016-04-05 09:57:09 +02:00
Nicolas Florentin	fafec2153c	setup test environment and add the first test	2016-04-04 17:42:45 +02:00
Sylvain	32d5184164	[fix taiga#15] empty workshop attachment not added	2016-03-31 14:02:16 +02:00
Sylvain	232bdbd102	bug fixes ... - [bug] credits not reset on new plan subscription - [bug] admin notification (user merged his account) never sent	2016-03-30 15:37:33 +02:00
Sylvain	8a53ae2d2c	fix invoice attachement name	2016-03-29 18:02:40 +02:00
cyril	d1450f65f6	release 2.0 rc	2016-03-23 18:39:41 +01:00
Nicolas Florentin	4686a8c843	rejects project cao file if all blank	2015-05-18 10:16:21 +02:00