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
..
_bootstrap.php	Components Assets view + stubbed API tests (#3325)	2017-02-21 14:26:46 -08:00
ApiAccessoriesCest.php	Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847)	2018-07-16 14:41:51 -07:00
ApiAssetsCest.php	Port/reenable most unit tests. (#5921)	2018-07-23 06:48:21 -07:00
ApiCategoriesCest.php	Use laravel v5.5 withCount manual aliases	2019-05-22 00:50:48 -07:00
ApiCheckoutAssetsCest.php	Port/reenable most unit tests. (#5921)	2018-07-23 06:48:21 -07:00
ApiCompaniesCest.php	Use laravel v5.5 withCount manual aliases	2019-05-22 00:50:48 -07:00
ApiComponentsAssetsCest.php	Disable broken tests (#5073)	2018-02-22 21:46:58 -08:00
ApiComponentsCest.php	Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847)	2018-07-16 14:41:51 -07:00
ApiConsumablesCest.php	Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847)	2018-07-16 14:41:51 -07:00
ApiLicensesCest.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
ApiLocationsCest.php	Fixed more camel-casing -> snake-casing	2019-05-24 16:01:12 -07:00
ApiManufacturersCest.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
ApiModelsCest.php	Use laravel v5.5 withCount manual aliases	2019-05-22 00:50:48 -07:00
ApiStatusLabelsCest.php	Use laravel v5.5 withCount manual aliases	2019-05-22 00:50:48 -07:00
ApiUsersCest.php	Use laravel v5.5 withCount manual aliases	2019-05-22 00:50:48 -07:00