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
..
admin	Merge branch 'events' into dev	2016-07-13 18:32:30 +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
dashboard.coffee	reorganize profile header zone	2016-05-17 16:41:32 +02:00
events.coffee.erb	simplify event view in index if event on a single day	2016-06-30 16:56:13 +02:00
home.coffee	release 2.0 rc	2016-03-23 18:39:41 +01:00
machines.coffee.erb	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00
main_nav.coffee.erb	Merge branch 'events' into dev	2016-07-13 18:32:30 +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	do not retrieve full users list on plans page	2016-06-16 14:26: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	Merge branch 'training' into dev	2016-07-13 18:15:14 +02:00