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
..
Recipients	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Traits	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Accessory.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Actionlog.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Asset.php	Validates if model and model->category exist before return the checkin_email property	2022-02-10 13:53:49 -06:00
AssetMaintenance.php	Shift cleanup	2021-06-10 20:19:27 +00:00
AssetModel.php	Fixed category factory methods	2021-12-02 13:40:16 -08:00
Category.php	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
CheckoutAcceptance.php	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
CheckoutRequest.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Company.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
CompanyableChildScope.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CompanyableChildTrait.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CompanyableScope.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CompanyableTrait.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Component.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Consumable.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
ConsumableAssignment.php	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
CustomField.php	Make is_unique fillable	2022-02-16 13:45:44 -08:00
CustomFieldset.php	Check for uniqueness constraint	2022-02-16 13:46:22 -08:00
Department.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Depreciable.php	added rounding	2022-02-14 09:34:42 -08:00
Depreciation.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Group.php	Shift cleanup	2021-06-10 20:19:27 +00:00
ICompanyableChild.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Import.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Ldap.php	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
License.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
LicenseSeat.php	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
Location.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Loggable.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
Manufacturer.php	Shift cleanup	2021-06-10 20:19:27 +00:00
PredefinedKit.php	Shift bindings	2021-06-10 20:16:56 +00:00
Requestable.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Setting.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
SnipeModel.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Statuslabel.php	Applies PR #9761 to integration	2021-06-28 13:11:22 -07:00
Supplier.php	Applies #10470 to develop	2021-12-27 13:22:47 -08:00
User.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00