Daniel Meltzer e9605891f3 Merge upstream and fix changes.

2016-06-10 07:44:45 -05:00

..

Auth

…

AccessoriesController.php

…

AssetMaintenancesController.php

…

AssetModelsController.php

…

AssetsController.php

Merge upstream and fix changes.

2016-06-10 07:44:45 -05:00

CategoriesController.php

Fixes format for users in category view

2016-06-09 02:26:43 -07:00

CompaniesController.php

…

ComponentsController.php

Fix license Checkout.

2016-06-07 07:58:08 -05:00

ConsumablesController.php

…

Controller.php

…

CustomFieldsController.php

…

DashboardController.php

…

DepreciationsController.php

…

GroupsController.php

…

LicensesController.php

Fixes #2132

2016-06-09 13:27:50 -07:00

LocationsController.php

…

ManufacturersController.php

…

ProfileController.php

…

ReportsController.php

…

SettingsController.php

Allow superadmins to print labels

2016-06-10 03:40:49 -07:00

StatuslabelsController.php

…

SuppliersController.php

…

UsersController.php

Allow admin to add user on checkout screen

2016-06-09 00:36:52 -07:00

ViewAssetsController.php

…