DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources/views/partials/forms/edit
History
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
2021-10-20 17:26:41 -07:00
..
accessory-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
address.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
asset-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
category-select.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
category.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
company-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
company.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
consumable-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
datepicker.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
department-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
depreciation.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
email.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
image-upload.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
item_number.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
kit-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
license-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
location-profile-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
location-select.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
location.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
maintenance_type.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
manufacturer-select.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
manufacturer.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
minimum_quantity.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
model-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
model_number.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
name.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
notes.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
order_number.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
permissions-base.blade.php Check for admin rights before displaying admin permission options 2021-09-22 19:31:49 -07:00
phone.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
purchase_cost.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
purchase_date.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
quantity.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
requestable.blade.php WIP: Upgrade develop to Laravel 6.6.1 (#7637) 2019-12-10 19:32:50 -08:00
serial.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
status.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
submit-button.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
submit.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
supplier-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
supplier.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
uploadLogo.blade.php Use Helper alias 2021-09-28 19:44:55 -07:00
user-select.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
warranty.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00