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
..
audit-due.blade.php	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992)	2019-05-05 22:32:52 -04:00
audit-overdue.blade.php	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992)	2019-05-05 22:32:52 -04:00
audit.blade.php	Reformatted help popover	2018-10-04 20:51:50 -07:00
bulk-checkout.blade.php	adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 (#5883)	2018-07-18 19:55:13 -07:00
bulk-delete.blade.php	Changed assetloc to location	2017-11-02 12:50:34 -07:00
bulk.blade.php	Remove old helpers (#5843)	2018-07-16 14:22:25 -07:00
checkin.blade.php	Valo/checkin date in history of asset (#6733)	2019-03-13 21:36:32 -07:00
checkout.blade.php	Display asset name if one exists and the user cannot edit	2018-10-15 17:02:31 -07:00
edit.blade.php	Make error text color match	2019-08-14 23:46:00 -07:00
history.blade.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
index.blade.php	Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388)	2019-09-03 11:02:55 -07:00
labels.blade.php	Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388)	2019-09-03 11:02:55 -07:00
qr-view.blade.php	PHP7.2 count fixes (#5427)	2018-04-29 06:10:49 -07:00
quickscan.blade.php	Insert audited items to the top of the list. (#6376)	2018-10-31 11:13:08 -07:00
requested.blade.php	WIP - Improved requested assets (#5289)	2018-04-04 17:33:02 -07:00
view.blade.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00