1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-03 14:24:23 +01:00
fab-manager/app/views/api
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 abuses test 2016-04-06 14:45:39 +02:00
admins release 2.0 rc 2016-03-23 18:39:41 +01:00
auth_providers [bug] prevent linking field User.merged_at from SSO 2016-06-20 11:46:41 +02:00
availabilities optimise machine/training availabilities query 2016-06-22 12:54:12 +02:00
categories init depot fabmanager 2015-05-05 03:10:25 +02:00
components init depot fabmanager 2015-05-05 03:10:25 +02:00
credits release 2.0 rc 2016-03-23 18:39:41 +01:00
custom_assets release 2.0 rc 2016-03-23 18:39:41 +01:00
events cache last event and optimise last subscript api 2016-06-27 10:55:51 +02:00
feeds init depot fabmanager 2015-05-05 03:10:25 +02:00
groups update jbuilder and add cache in progress 2016-06-20 19:41:05 +02:00
invoices members & invoices lists: display 20 items by default + do not display 'load more' button if all items were initially loaded 2016-05-31 17:01:26 +02:00
licences init depot fabmanager 2015-05-05 03:10:25 +02:00
machines cancel cache machine index json 2016-07-06 11:22:01 +02:00
members Merge branch 'projects' into dev 2016-07-13 15:57:45 +02:00
notifications [bug] project gain collaborator i18n key FR 2016-05-18 10:54:50 +02:00
open_api_clients admin open_api_client managing 2016-05-09 18:15:04 +02:00
plans cancel cache for plant and training_prcings 2016-06-27 12:37:44 +02:00
prices price cache 2016-06-21 16:04:44 +02:00
pricing release 2.0 rc 2016-03-23 18:39:41 +01:00
projects Merge branch 'steps' into dev 2016-07-13 16:10:18 +02:00
reservations release 2.0 rc 2016-03-23 18:39:41 +01:00
settings release 2.0 rc 2016-03-23 18:39:41 +01:00
shared release 2.0 rc 2016-03-23 18:39:41 +01:00
slots release 2.0 rc 2016-03-23 18:39:41 +01:00
statistics release 2.0 rc 2016-03-23 18:39:41 +01:00
subscriptions release 2.0 rc 2016-03-23 18:39:41 +01:00
tags release 2.0 rc 2016-03-23 18:39:41 +01:00
themes init depot fabmanager 2015-05-05 03:10:25 +02:00
trainings remove order for avoid N+1 2016-06-24 18:36:36 +02:00
trainings_pricings cancel cache for plant and training_prcings 2016-06-27 12:37:44 +02:00
users release 2.0 rc 2016-03-23 18:39:41 +01:00