snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php		2022-04-28 17:49:06 +01:00
..
Recipients	Added trim to CC email as well	2022-03-04 06:20:34 -08: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	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
Asset.php	Merge master back down into develop	2022-03-29 16:28:43 +01: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	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
License.php	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01: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 branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01: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
SCIMUser.php	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end	2022-04-05 20:26:37 +01: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
SnipeSCIMConfig.php	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end	2022-04-05 20:26:37 +01:00
Statuslabel.php	Backporting #10829 to master	2022-03-25 13:00:16 +00:00
Supplier.php	Applies #10470 to develop	2021-12-27 13:22:47 -08:00
User.php	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00