snipe 533649f24e Merge branch 'develop' into dev-master-integration ... # Conflicts: # .gitignore # .travis.yml # app/Console/Commands/LdapSync.php # app/Console/Commands/SendExpectedCheckinAlerts.php # app/Console/Commands/SendExpirationAlerts.php # app/Console/Commands/SendInventoryAlerts.php # app/Console/Kernel.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/ResetPasswordController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/UsersController.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/Importer.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/License.php # app/Models/Location.php # app/Models/Recipients/AlertRecipient.php # app/Models/User.php # app/Providers/AppServiceProvider.php # composer.json # composer.lock # config/trustedproxy.php # config/version.php # 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/lang/ar/admin/settings/general.php # resources/lang/bg/admin/settings/general.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/passwords.php # resources/lang/en/passwords.php # resources/lang/es-CO/passwords.php # resources/lang/es-ES/passwords.php # resources/lang/es-MX/passwords.php # resources/lang/es-VE/passwords.php # resources/lang/fi/admin/settings/general.php # resources/lang/id/admin/settings/general.php # resources/lang/id/passwords.php # resources/lang/ja/passwords.php # resources/lang/nl/passwords.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/passwords.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/passwords.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/admin/statuslabels/table.php # resources/lang/ru/passwords.php # resources/lang/sr-CS/general.php # resources/lang/sr-CS/mail.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/passwords.php # resources/lang/vi/admin/models/message.php # resources/lang/vi/admin/users/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/views/importer/import.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/users/edit.blade.php # resources/views/users/view.blade.php # tests/unit/ImporterTest.php		2019-02-13 06:42:52 -08:00
..
ForgotPasswordController.php	Use username instead of email address in password reset (#6382)	2018-10-31 18:03:24 -07:00
LoginController.php	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
RegisterController.php	Stub and 404 registration routes	2017-12-19 22:14:51 -08:00
ResetPasswordController.php	Use username instead of email address in password reset (#6382)	2018-10-31 18:03:24 -07:00