DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app/Models
History
snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration 
# Conflicts:
#	.env.example
#	.travis.yml
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Middleware/EncryptCookies.php
#	app/Http/Requests/AssetRequest.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/AssetMaintenance.php
#	app/Models/Location.php
#	app/Models/User.php
#	composer.json
#	composer.lock
#	config/backup.php
#	config/database.php
#	config/version.php
#	public/mix-manifest.json
#	resources/lang/en-ID/general.php
#	resources/lang/vi/admin/settings/general.php
#	resources/views/accessories/edit.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
..
Recipients Patch for 5965 - multiple email recipients no longer working (#6238) 2018-09-26 15:47:53 -07:00
Traits Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Accessory.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Actionlog.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Asset.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08:00
AssetMaintenance.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08:00
AssetModel.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Category.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CheckoutAcceptance.php Fixed Eloquent Builder path in docblock 2019-08-20 18:10:36 -07:00
CheckoutRequest.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Company.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
CompanyableChildScope.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CompanyableChildTrait.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
CompanyableScope.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CompanyableTrait.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
Component.php Cleanup of model attributes 2018-08-06 14:46:10 +02:00
Consumable.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ConsumableAssignment.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
CustomField.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CustomFieldset.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Department.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
Depreciable.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Depreciation.php Improvement: Better documentation, small refactors (#6017) 2018-08-01 00:06:41 -07:00
Group.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
ICompanyableChild.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
Import.php Importer mapping - v1 (#3677) 2017-06-21 16:37:37 -07:00
License.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08:00
LicenseSeat.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Location.php Fixes nested location selectlist (#7483) 2019-10-02 03:56:56 -07:00
Loggable.php Allow null for logCheckin $action_date 2019-03-14 01:22:29 -07:00
Manufacturer.php Improvement: Better documentation, small refactors (#6017) 2018-08-01 00:06:41 -07:00
PredefinedKit.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Requestable.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Setting.php Add support for custom remote user header (#7370) 2019-09-03 11:07:26 -07:00
SnipeModel.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Statuslabel.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Supplier.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
User.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08:00