DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app
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
..
Console Switch to searching on semicolon instead of & 2022-02-09 15:55:22 -08:00
Events Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Exceptions Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
Helpers Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
Http Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
Importer Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
Jobs
LegacyEncrypter Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Listeners Fixed notification tests 2021-12-02 20:01:03 -08:00
Models Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
Notifications Fixed notification tests 2021-12-02 20:01:03 -08:00
Observers Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Policies Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Presenters Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Providers Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
Services Add new UserAccountControl to permitted UAC's for AD. 2022-01-12 12:07:51 -08:00