snipe 453fc718d9 Merge branch 'develop' into integrations/2020-08-31-dev-into-master ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.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/Models/Ldap.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/less/overrides.less # resources/views/custom_fields/fieldsets/view.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 # tests/unit/UserTest.php		2020-08-31 12:44:03 -07:00
..
admin	Squashed commit of the following:	2020-08-31 12:17:19 -07:00
auth	Added #542: add saml authentication	2020-05-06 00:06:19 +10:00
button.php	Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388)	2019-09-03 11:02:55 -07:00
general.php	Merge branch 'develop' into integrations/2020-08-31-dev-into-master	2020-08-31 12:44:03 -07:00
help.php	More help text updates	2018-10-04 21:14:45 -07:00
mail.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
pagination.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
passwords.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00
reminders.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
table.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
validation.php	Validate when editing the quantity of a component that the new quantity is > the amount checked out	2020-04-29 13:25:04 -04:00