snipe-it/app/Http/Controllers
snipe 9091385182 Merge branch 'hotfixes/purchase_cost' into develop
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	config/version.php
2016-09-27 19:13:21 -07:00
..
Auth Translate emails (#2652) 2016-09-26 14:13:07 -07:00
AccessoriesController.php Merge branch 'hotfixes/purchase_cost' into develop 2016-09-27 19:13:21 -07:00
AssetMaintenancesController.php Fix companyable reult in maintenances 2016-09-27 19:07:45 -07:00
AssetModelsController.php Merge branch 'hotfixes/eol' into develop 2016-09-27 07:04:45 -07:00
AssetsController.php Merge branch 'hotfixes/purchase_cost' into develop 2016-09-27 19:13:21 -07:00
CategoriesController.php Fix 2347 (#2394) 2016-08-16 13:02:42 -07:00
CompaniesController.php Use updated redirect() reference 2016-04-28 21:06:41 -07:00
ComponentsController.php Merge branch 'hotfixes/purchase_cost' into develop 2016-09-27 19:13:21 -07:00
ConsumablesController.php Merge branch 'hotfixes/purchase_cost' into develop 2016-09-27 19:13:21 -07:00
Controller.php Updated docblocks 2016-04-07 13:21:09 -07:00
CustomFieldsController.php Store new fields in the database 2016-08-25 17:08:08 -07:00
DashboardController.php Actionlog Class: Improvements and polymorphism (#2561) 2016-09-06 19:39:42 -07:00
DepreciationsController.php Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
GroupsController.php Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
LicensesController.php Merge branch 'hotfixes/purchase_cost' into develop 2016-09-27 19:13:21 -07:00
LocationsController.php Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
ManufacturersController.php Add manufacturer to licenses (#2436) 2016-08-16 18:49:54 -07:00
ProfileController.php Fixes #2399 2016-08-30 12:34:23 -07:00
ReportsController.php Added customfields to asset CSV export 2016-09-27 15:09:47 -07:00
SettingsController.php Fix pre-flight port number check. (#2681) 2016-09-26 18:23:56 -07:00
StatuslabelsController.php Added show in nav for status label views and controller 2016-08-23 18:52:42 -07:00
SuppliersController.php Fix for missing input variable in suppliers ajax method 2016-07-13 22:35:21 -07:00
UsersController.php Fixes bug where 12-hour fprmat for hours was used 2016-09-26 22:35:51 -07:00
ViewAssetsController.php Fixes bug where 12-hour fprmat for hours was used 2016-09-26 22:35:51 -07:00