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
..
admin	Merge branch 'events' into dev	2016-07-13 18:32:30 +02:00
dashboard	Merge branch 'events' into dev	2016-07-13 18:32:30 +02:00
events	add filters in event index view	2016-07-04 11:11:00 +02:00
machines	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00
members	[feature] paginate public list of members	2016-06-16 16:09:22 +02:00
notifications	release 2.0 rc	2016-03-23 18:39:41 +01:00
plans	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
profile	[feature] profile website + edition of is_allow_contact	2016-05-16 14:46:57 +02:00
projects	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00
shared	Merge branch 'events' into dev	2016-07-13 18:32:30 +02:00
stripe	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
home.html.erb	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00