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

..

admin

Merge branch 'xls' into dev

2016-07-25 16:56:22 +02:00

calendar

add an aside for filter caldendar in mobile

2016-07-18 16:31:14 +02:00

dashboard

fix locale key no found error

2016-07-21 16:32:56 +02:00

events

[Bug #28] Event type disappear when editing the event

2016-07-25 16:16:25 +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

Fix i18n for payment dialog

2016-07-25 12:10:10 +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

change some texts in reservation on site

2016-07-21 16:32:58 +02:00

stripe

Fix i18n for stripe payment dialog

2016-07-25 12:14:38 +02:00

trainings

Merge branch 'training' into dev

2016-07-13 18:15:14 +02:00

wallet

show invoice download link in wallet transaction debit operator

2016-07-21 16:32:57 +02:00

home.html.erb

[Bug #28] Event type disappear when editing the event

2016-07-25 16:16:25 +02:00