DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app/Models
History
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -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 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 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 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