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

..

export_members.xls.erb

release 2.0 rc

2016-03-23 18:39:41 +01:00

export_reservations.xls.erb

[#16] add email field to reservations export

2016-03-31 11:52:49 +02:00

export_subscriptions.xls.erb

release 2.0 rc

2016-03-23 18:39:41 +01: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