Sylvain 6839e8db38 Merge branch 'events' into dev ... Conflicts: CHANGELOG.md config/locales/app.shared.en.yml config/locales/app.shared.fr.yml		2016-07-13 18:32:30 +02:00
..
admins	release 2.0 rc	2016-03-23 18:39:41 +01:00
authentications	i18n authentication provider type	2016-03-30 10:05:50 +02:00
calendar	release 2.0 rc	2016-03-23 18:39:41 +01:00
events	add info message on categories management + fix existing categories slugs	2016-06-30 16:12:24 +02:00
groups	release 2.0 rc	2016-03-23 18:39:41 +01:00
invoices	[feature] partial load of invoices list	2016-05-31 10:02:27 +02:00
members	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
open_api_clients	fix api doc link	2016-06-27 18:08:19 +02:00
plans	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00
pricing	various fix	2016-03-24 15:39:24 +01:00
project_elements	release 2.0 rc	2016-03-23 18:39:41 +01:00
settings	[feature] background picture of profile banner customization	2016-05-18 16:15:54 +02:00
statistics	[feature] statistics: username link leads to admin edition	2016-06-21 14:46:00 +02:00
subscriptions	release 2.0 rc	2016-03-23 18:39:41 +01:00
tags	release 2.0 rc	2016-03-23 18:39:41 +01:00
trainings	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00