snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration ... # Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php		2019-11-18 19:49:39 -08:00
..
accessories	More help text updates	2018-10-04 21:14:45 -07:00
asset_maintenances	Added softwarew support and hardware support to maintenance types	2019-09-24 01:34:23 -07:00
categories	More help text updates	2018-10-04 21:14:45 -07:00
companies	More help text updates	2018-10-04 21:14:45 -07:00
components	More help text updates	2018-10-04 21:14:45 -07:00
consumables	More help text updates	2018-10-04 21:14:45 -07:00
custom_fields	Updated languages	2018-05-21 14:54:36 -07:00
departments	Dept strings	2017-05-23 02:50:16 -07:00
depreciations	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
groups	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
hardware	More help text updates	2018-10-04 21:14:45 -07:00
kits	Added translation, removed commented out code	2019-03-13 12:15:48 -07:00
licenses	Fixes #4001 - license checkout not working	2017-09-25 21:40:43 -07:00
locations	Add support for location-specific LDAP OUs. (#3176)	2017-01-11 23:37:14 -08:00
manufacturers	Fixed #2402 - add ability to restore manufacturers	2018-03-03 18:46:19 -08:00
models	Feature/custom fields default values (#5389)	2018-04-23 21:16:55 -07:00
reports	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
settings	Add support for custom remote user header (#7370)	2019-09-03 11:07:26 -07:00
statuslabels	Fixed #5138 - added default_label flag to status labels	2018-03-05 22:04:16 -08:00
suppliers	Disallow deleting suppliers with associated assets, licenses or maintenances	2017-10-18 05:47:20 -07:00
users	NIcer UI for activated user + email credentials	2018-08-01 14:18:37 -07:00