Sylvain 74154cf1f3 Merge branch 'xls' into dev ... Conflicts: CHANGELOG.md app/helpers/application_helper.rb config/locales/en.yml config/locales/fr.yml		2016-07-25 16:56:22 +02:00
..
export_members.xlsx.axlsx	fix members full export	2016-07-13 09:20:52 +02:00
export_reservations.xlsx.axlsx	migrate export reservations to axlsx	2016-07-12 13:00:56 +02:00
export_subscriptions.xlsx.axlsx	migrate export subscriptions to axlsx	2016-07-12 13:10:06 +02:00
index.json.jbuilder	[feature] ability to filter events by category, theme and age	2016-06-29 16:09:27 +02:00
list.json.jbuilder	[feature] ability to filter events by category, theme and age	2016-06-29 16:09:27 +02:00
mapping.json.jbuilder	optimize usernames mapping in statistics	2016-06-21 14:39:44 +02:00
search.json.jbuilder	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
show.json.jbuilder	Merge branch 'projects' into dev	2016-07-13 15:57:45 +02:00