Sylvain 2c8001f38f Merge branch 'projects' into dev ...

Conflicts:
	app/views/api/members/show.json.jbuilder

2016-07-13 15:57:45 +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] prevent unmerged accounts (soo imported) from being displayed in lists/searches

2016-06-23 11:42:10 +02:00

list.json.jbuilder

[feature] prevent unmerged accounts (soo imported) from being displayed in lists/searches

2016-06-23 11:42:10 +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