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
..
AccessoriesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
AssetMaintenancesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
AssetModelsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
AssetsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
CategoriesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
CompaniesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
ComponentsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
ConsumablesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
CustomFieldsController.php	Fixed #7250 - permission issue for API fieldsets and fields endpoints	2019-07-24 11:00:42 -07:00
CustomFieldsetsController.php	Fixed #7250 - permission issue for API fieldsets and fields endpoints	2019-07-24 11:00:42 -07:00
DepartmentsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
DepreciationsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
GroupsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
ImportController.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
LicensesController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
LocationsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
ManufacturersController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
PredefinedKitsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ProfileController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ReportsController.php	Change ->has() to ->filled()	2019-05-23 17:39:50 -07:00
SettingsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
StatuslabelsController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
SuppliersController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00
UsersController.php	Merge branch 'develop' into v5-master-develop-integration	2019-11-18 19:49:39 -08:00