snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php		2022-03-03 21:59:38 -08:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Account
Api	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Assets
Auth	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Components	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Consumables	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Kits
Licenses
Users	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
ActionlogController.php
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetModelsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
BulkAssetModelsController.php
CategoriesController.php
CheckInOutRequest.php
CompaniesController.php
Controller.php
CustomFieldsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
CustomFieldsetsController.php
DashboardController.php
DepartmentsController.php
DepreciationsController.php
GroupsController.php
HealthController.php
ImportsController.php
LocationsController.php
ManufacturersController.php
ModalController.php
ProfileController.php
ReportsController.php
SettingsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
StatuslabelsController.php
SuppliersController.php	Added gate to supplier	2022-02-13 11:58:12 -07:00
ViewAssetsController.php