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

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
2021-11-15 19:24: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 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 Fixes not being able to search by checked out user in advanced search 2021-11-01 22:14:19 +01:00
AssetMaintenance.php Shift cleanup 2021-06-10 20:19:27 +00:00
AssetModel.php Shift cleanup 2021-06-10 20:19:27 +00: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 Merge branch 'develop-v6-integration' into develop-v6-rc1 2021-09-21 23:46:50 -07:00
License.php Shift cleanup 2021-06-10 20:19:27 +00: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 branch 'develop-v6-integration' into develop-v6-rc1 2021-09-21 23:46:50 -07: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 Shift cleanup 2021-06-10 20:19:27 +00:00
User.php Merge branch 'develop-v6-integration' into develop-v6-rc1 2021-09-21 23:46:50 -07:00