Sylvain 68f9324725 Merge branch 'steps' into dev ...

Conflicts:
	app/assets/javascripts/controllers/projects.coffee.erb
	db/schema.rb

2016-07-13 16:10:18 +02:00

..

abuses_controller.rb

release 2.0 rc

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

admins_controller.rb

avoid N+1 for users list

2016-06-24 18:43:22 +02:00

api_controller.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

auth_providers_controller.rb

release 2.0 rc

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

availabilities_controller.rb

fix bug: cant get member training availability

2016-06-27 13:38:50 +02:00

categories_controller.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

components_controller.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

credits_controller.rb

release 2.0 rc

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

custom_assets_controller.rb

release 2.0 rc

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

events_controller.rb

cache last event and optimise last subscript api

2016-06-27 10:55:51 +02:00

feeds_controller.rb

release 2.0 rc

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

groups_controller.rb

release 2.0 rc

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

invoices_controller.rb

[feature] partial load of invoices list

2016-05-31 10:02:27 +02:00

licences_controller.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

machines_controller.rb

release 2.0 rc

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

members_controller.rb

fix merge

2016-06-27 12:49:20 +02:00

notifications_controller.rb

release 2.0 rc

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

open_api_clients_controller.rb

admin open_api_client managing

2016-05-09 18:15:04 +02:00

openlab_projects_controller.rb

openlab_projects ctrl, rescue all standard error

2016-04-25 10:07:54 +02:00

plans_controller.rb

optimise load plans json

2016-06-21 14:49:39 +02:00

prices_controller.rb

release 2.0 rc

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

pricing_controller.rb

release 2.0 rc

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

projects_controller.rb

[feature] basic ability manage steps order

2016-06-02 12:49:00 +02:00

reservations_controller.rb

refacto subscription extension with first training using a service

2016-04-07 17:57:48 +02:00

settings_controller.rb

release 2.0 rc

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

slots_controller.rb

refacto subscription extension with first training using a service

2016-04-07 17:57:48 +02:00

statistics_controller.rb

[bug] scroll statistics tables not working when elastic is not localhost

2016-06-23 11:11:54 +02:00

stylesheets_controller.rb

release 2.0 rc

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

subscriptions_controller.rb

prevent subscription creation/modification if card_token is invalid

2016-04-11 18:37:15 +02:00

tags_controller.rb

release 2.0 rc

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

themes_controller.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

trainings_controller.rb

improve trainings load times

2016-06-15 12:01:09 +02:00

trainings_pricings_controller.rb

price cache

2016-06-21 16:04:44 +02:00

translations_controller.rb

release 2.0 rc

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

users_controller.rb

release 2.0 rc

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