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
..
accessories	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
asset_maintenances	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
categories	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
companies	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
components	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
consumables	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
custom_fields	Added strings for unique	2022-02-16 13:47:59 -08:00
departments	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
depreciations	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
groups	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
hardware	Merge pull request #10455 from adagioajanes/features/quickscan_checkin	2022-02-01 20:19:45 -08:00
importer	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
kits	Updated language strings	2022-01-28 12:40:03 -08:00
licenses	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
locations	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
manufacturers	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
models	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
reports	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
settings	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
statuslabels	Updated language strings	2022-01-28 12:40:03 -08:00
suppliers	Normalize array format in en language to the new shitty way	2022-01-13 21:30:35 -08:00
users	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00