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
..
AccessoryPresenter.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ActionlogPresenter.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
AssetAuditPresenter.php	Added text-right to presenters for money values	2021-11-18 15:09:17 -08:00
AssetMaintenancesPresenter.php	Added text-right to presenters for money values	2021-11-18 15:09:17 -08:00
AssetModelPresenter.php	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -07:00
AssetPresenter.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
CategoryPresenter.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
CompanyPresenter.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
ComponentPresenter.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ConsumablePresenter.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
DepreciationPresenter.php	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
DepreciationReportPresenter.php	Added text-right to presenters for money values	2021-11-18 15:09:17 -08:00
LicensePresenter.php	Merge branch 'develop' into sum_cost_by_quantity	2021-11-21 18:59:34 +00:00
LicenseSeatPresenter.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LocationPresenter.php	Updated map icons	2021-09-24 14:30:36 -07:00
ManufacturerPresenter.php	Updated more fa icons	2021-09-26 01:11:08 -07:00
PredefinedKitPresenter.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Presentable.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Presenter.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
UserPresenter.php	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00