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
..
_data	Avoid populating db manually. (#5255)	2018-03-27 17:43:28 -07:00
_envs	Avoid populating db manually. (#5255)	2018-03-27 17:43:28 -07:00
_output	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
_support	Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847)	2018-07-16 14:41:51 -07:00
acceptance	Fixed #6703 - fixes password confirmation (#6711)	2019-02-13 23:01:19 -08:00
api	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
functional	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
unit	(develop): Fix failing Unit Tests (#6807)	2019-03-13 10:57:43 -07:00
_bootstrap.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
acceptance.suite.yml	Switched configs around a little	2016-04-13 02:41:55 -07:00
api.suite.yml	Avoid populating db manually. (#5255)	2018-03-27 17:43:28 -07:00
functional.suite.yml	Avoid populating db manually. (#5255)	2018-03-27 17:43:28 -07:00
TestCase.php	Discussion: Moving to policies for controller based authorization (#3080)	2016-12-19 11:04:28 -08:00
TODO.testing	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
unit.suite.yml	Disable broken tests (#5073)	2018-02-22 21:46:58 -08:00