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
asset_maintenances
auth
categories
companies
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
custom_fields	Added UI elements for is_unique	2022-02-16 13:47:48 -08:00
departments
depreciations
errors
groups
hardware	Fixes 10708: change size of fa-hdd to 2x	2022-02-24 11:05:40 +01:00
importer
kits
layouts
licenses
livewire
locations
manufacturers
modals
models	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
notifications	Prevents showing double values	2022-02-25 08:19:46 +01:00
paginator
partials
reports
settings	Fixed #10436 on master, applies #10449	2022-02-22 21:06:54 -08:00
setup
statuslabels
suppliers
users	Fixed #10659 - wrong translation string reference	2022-02-10 21:03:09 -08:00
vendor	🧑‍🔧 Added 2 breaks in message.blade.php	2022-02-18 10:27:12 +01:00
dashboard.blade.php
notifications.blade.php