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
account	Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js	2018-10-03 00:56:09 -07:00
asset_maintenances	Create asset maintenance - Added orange bar for required asset to edit view (#5520)	2018-05-16 19:23:23 -07:00
auth	Use username instead of email address in password reset (#6382)	2018-10-31 18:03:24 -07: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	Remove company select option if the user is not an admin and FCS is enabled	2018-10-05 07:30:42 -07:00
consumables	More help text updates	2018-10-04 21:14:45 -07:00
custom_fields	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381)	2018-12-06 20:05:04 -08:00
departments	More help text updates	2018-10-04 21:14:45 -07:00
depreciations	More help text updates	2018-10-04 21:14:45 -07:00
errors	Nicer formatting on 503	2017-10-28 07:01:45 -07:00
groups	Fixed weird display for self options	2018-07-24 12:41:58 -07:00
hardware	Fixed #6634: Asset Import History fixes and optimizations (#6657)	2019-02-08 16:05:56 -08:00
importer	Import page is blank [ch90] (#6636)	2019-01-24 15:34:50 -08:00
layouts	Removed extraneous js call	2019-02-13 04:24:37 -08:00
licenses	Fix an issue when trying to checkin a license seat. [ch46] (#6599)	2019-01-17 20:36:40 -08:00
locations	Pass variable to edit-form to determine whether we should have a top submit button	2018-10-04 21:19:25 -07:00
manufacturers	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00
modals	Added XML to uploadable file type - re: #6099	2018-12-12 16:45:09 -08:00
models	Pass variable to edit-form to determine whether we should have a top submit button	2018-10-04 21:19:25 -07:00
notifications	Fixed #6323 - typo in link for low inventory	2018-10-11 15:31:10 -07:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	Handle asset maintenances that do not have a valid asset associated	2019-01-16 02:26:42 -08:00
reports	Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report	2019-01-25 20:59:54 -08:00
settings	[WIP] v5 Develop: New LDAP implementation (#6352)	2018-12-06 14:05:43 -08:00
setup	Check for minimum PHP version in setup	2018-08-02 21:36:18 -07:00
statuslabels	Added: #6246 - CSS Cleanup (#6247)	2018-09-28 14:09:48 -07:00
suppliers	Fixed #6028 - added supplier url to list view	2018-08-01 17:37:58 -07:00
users	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
vendor	Added ability to upload favicon and email logo	2018-12-05 19:56:12 -08:00
dashboard.blade.php	Fixed: #6395 - Adjusted graph size (#6518)	2019-01-15 14:02:49 -08:00
notifications.blade.php	Added UI fade out when bootstrap alerts are dismissed	2017-11-08 03:13:18 -08:00