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
about.coffee	[feature] link to CGV in about page	2016-03-31 12:59:29 +02:00
application.coffee.erb	Revert "ask for user agreement to CGV on signup"	2016-03-31 13:00:54 +02:00
calendar.coffee	change calendar default view to agendDay if screen width <= 480px	2016-07-18 18:10:39 +02:00
dashboard.coffee	reorganize profile header zone	2016-05-17 16:41:32 +02:00
events.coffee.erb	Fix i18n for payment dialog	2016-07-25 12:10:10 +02:00
home.coffee	release 2.0 rc	2016-03-23 18:39:41 +01:00
machines.coffee.erb	Fix i18n for payment dialog	2016-07-25 12:10:10 +02:00
main_nav.coffee.erb	change machines list icon	2016-07-18 17:57:50 +02:00
members.coffee	Merge remote-tracking branch 'origin/plugin' into dev	2016-06-16 17:13:36 +02:00
notifications.coffee	release 2.0 rc	2016-03-23 18:39:41 +01:00
plans.coffee.erb	Fix i18n for payment dialog	2016-07-25 12:10:10 +02:00
profile.coffee	[bug] is not defined after sso profile sync	2016-05-03 09:37:15 +02:00
projects.coffee.erb	Merge branch 'steps' into dev	2016-07-13 16:10:18 +02:00
trainings.coffee.erb	Fix i18n for payment dialog	2016-07-25 12:10:10 +02:00
wallet.coffee	show wallet transactions of user	2016-07-21 16:32:54 +02:00