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
..
accessories	More help text updates	2018-10-04 21:14:45 -07:00
asset_maintenances	Added calibration as a maintenance type	2019-01-24 15:17:33 -08:00
categories	More help text updates	2018-10-04 21:14:45 -07:00
companies	More help text updates	2018-10-04 21:14:45 -07:00
components	More help text updates	2018-10-04 21:14:45 -07:00
consumables	More help text updates	2018-10-04 21:14:45 -07:00
custom_fields	Updated languages	2018-05-21 14:54:36 -07:00
departments	Dept strings	2017-05-23 02:50:16 -07:00
depreciations	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
groups	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
hardware	More help text updates	2018-10-04 21:14:45 -07:00
licenses	Fixes #4001 - license checkout not working	2017-09-25 21:40:43 -07:00
locations	Add support for location-specific LDAP OUs. (#3176)	2017-01-11 23:37:14 -08:00
manufacturers	Fixed #2402 - add ability to restore manufacturers	2018-03-03 18:46:19 -08:00
models	Feature/custom fields default values (#5389)	2018-04-23 21:16:55 -07:00
reports	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
settings	Added ability to upload favicon and email logo	2018-12-05 19:56:12 -08:00
statuslabels	Fixed #5138 - added default_label flag to status labels	2018-03-05 22:04:16 -08:00
suppliers	Disallow deleting suppliers with associated assets, licenses or maintenances	2017-10-18 05:47:20 -07:00
users	NIcer UI for activated user + email credentials	2018-08-01 14:18:37 -07:00