DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources/views/hardware
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
..
audit-due.blade.php WIP: Upgrade develop to Laravel 6.6.1 (#7637) 2019-12-10 19:32:50 -08:00
audit-overdue.blade.php WIP: Upgrade develop to Laravel 6.6.1 (#7637) 2019-12-10 19:32:50 -08:00
audit.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
bulk-checkout.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
bulk-delete.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
bulk.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
checkin.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00
checkout.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
edit.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
history.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
index.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
labels.blade.php Manually re-add support for Label Logos in Labels (#9552) 2021-05-07 17:01:32 -07:00
quickscan-checkin.blade.php added the notes field to allow users to quickly add notes to multiple checkins at once 2021-12-23 17:37:48 -05:00
quickscan.blade.php Added localized strings for hardware 2021-11-02 14:02:48 +01:00
requested.blade.php Added missed translation strings, fixed the column width for the date selector (too small in certain languages) 2022-01-10 09:21:23 +01:00
view.blade.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00