snipe 5fded57ec6 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php		2022-02-01 18:53:05 -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 branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
Actionlog.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Asset.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08: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	Shift cleanup	2021-06-10 20:19:27 +00:00
Consumable.php	Merge remote-tracking branch 'origin/master' into develop	2021-11-15 19:24:38 -08:00
ConsumableAssignment.php	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
CustomField.php	Shift cleanup	2021-06-10 20:19:27 +00:00
CustomFieldset.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Department.php	Shift cleanup	2021-06-10 20:19:27 +00:00
Depreciable.php	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07: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	Adopt Laravel coding style	2021-06-10 20:15:52 +00: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