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	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
account	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
asset_maintenances	Create asset maintenance - Added orange bar for required asset to edit view (#5520)	2018-05-16 19:23:23 -07:00
auth	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -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	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
consumables	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
custom_fields	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381)	2018-12-06 20:05:04 -08:00
departments	More help text updates	2018-10-04 21:14:45 -07:00
depreciations	More help text updates	2018-10-04 21:14:45 -07:00
errors	Nicer formatting on 503	2017-10-28 07:01:45 -07:00
groups	Fixed weird display for self options	2018-07-24 12:41:58 -07:00
hardware	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
importer	Import page is blank [ch90] (#6636)	2019-01-24 15:34:50 -08:00
kits	Added translation, removed commented out code	2019-03-13 12:15:48 -07:00
layouts	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
licenses	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
locations	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
manufacturers	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00
modals	RTF support added (#7024)	2019-05-15 15:47:40 -07:00
models	Fixes #6794: Fix URLs to access some 'missing' images (#6795)	2019-03-08 12:47:37 -08:00
notifications	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	Make status label required	2019-08-14 23:46:09 -07:00
reports	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
settings	Add support for custom remote user header (#7370)	2019-09-03 11:07:26 -07:00
setup	Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop	2019-02-13 23:02:21 -08:00
statuslabels	Added: #6246 - CSS Cleanup (#6247)	2018-09-28 14:09:48 -07:00
suppliers	Fixes #6794: Fix URLs to access some 'missing' images (#6795)	2019-03-08 12:47:37 -08:00
users	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
vendor	Added ability to upload favicon and email logo	2018-12-05 19:56:12 -08:00
dashboard.blade.php	Remove test data for Pie (#6793)	2019-03-08 12:46:47 -08:00
notifications.blade.php	Feedback for Kits; Fix checkins for accessories (#7060)	2019-05-23 19:39:30 -07:00