snipe-it/resources/views
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
..
accessories Add additional info on accessories view page 2021-09-26 03:59:04 -07:00
account Updated more fa icons 2021-09-26 01:11:08 -07:00
asset_maintenances Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
auth Updated more fa icons 2021-09-26 01:11:08 -07:00
categories Updated more fa icons 2021-09-26 01:11:08 -07:00
companies Updated more fa icons 2021-09-26 01:11:08 -07:00
components Use Helper alias 2021-09-28 19:44:55 -07:00
consumables Use Helper alias 2021-09-28 19:44:55 -07:00
custom_fields Center custom fields email icon 2021-10-18 18:39:46 -07:00
departments Add a hidden field to handle departments inside Full Company Support config 2021-07-29 13:28:57 -05:00
depreciations Use Helper alias 2021-09-28 19:44:55 -07:00
errors More fa icons 2021-09-24 07:21:30 -07:00
groups Updated more fa icons 2021-09-26 01:11:08 -07:00
hardware Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
importer Updated more fa icons 2021-09-26 01:11:08 -07:00
kits Updated more fa icons 2021-09-26 01:11:08 -07:00
layouts Removed dupe bars 2021-10-12 12:31:08 -07:00
licenses Use Helper alias 2021-09-28 19:44:55 -07:00
livewire A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working. 2021-10-04 22:07:29 -07:00
locations Use Helper alias 2021-09-28 19:44:55 -07:00
manufacturers Updated more fa icons 2021-09-26 01:11:08 -07:00
modals Fixed SVG XSS vuln 2021-10-06 12:26:45 -07:00
models Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
notifications Use Helper alias 2021-09-28 19:44:55 -07:00
paginator Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
partials Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
reports Enable display of deleted acceptances, strike deleted users, add date, enable sorting 2021-10-07 21:03:46 +02:00
settings Use Helper alias 2021-09-28 19:44:55 -07:00
setup Use Helper alias 2021-09-28 19:44:55 -07:00
statuslabels Updated more fa icons 2021-09-26 01:11:08 -07:00
suppliers Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
users Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
vendor Fixes a couple blade templates for relative URLs (#9170) 2021-02-26 15:59:36 -08:00
dashboard.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
notifications.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00