snipe_it/app
snipe e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/Loggable.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
#	resources/assets/less/overrides.less
#	resources/macros/macros.php
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/labels.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	routes/web/fields.php
#	tests/unit/UserTest.php
2020-08-31 12:14:44 -07:00
..
Console Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Events Assorted licenses UI fixes while testing. 2020-05-12 14:38:21 -04:00
Exceptions Fix invalidJSON exception 2019-08-14 22:18:48 -07:00
Helpers Refactor big switch to lookup in array. A bit cleaner/codacy happier. 2020-05-23 12:17:56 -04:00
Http Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Importer Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Jobs Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
LegacyEncrypter Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Listeners Valo/checkin date in history of asset (#6733) 2019-03-13 21:36:32 -07:00
Models Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Notifications Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Observers Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Policies Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
Presenters Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
Providers [WIP] fix ldap-sync for v5 with AdLdap2 2020-08-14 14:45:05 -07:00
Services Merge pull request #8372 from snipe/fix_adldap_sync 2020-08-26 13:34:07 -07:00