snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # 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		2019-03-20 02:17:02 -07:00
..
alerts.blade.php	Label bugs in alerts settings (#6808)	2019-03-14 10:53:05 -07:00
api.blade.php	Pass urls to passport vue components to make work in subdirectories. (#4090)	2017-10-01 13:59:07 -07:00
asset_tags.blade.php	Add autocomplete=off to settings forms for #4210	2017-10-17 17:18:17 -07:00
backups.blade.php	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00
barcodes.blade.php	Add autocomplete=off to settings forms for #4210	2017-10-17 17:18:17 -07:00
branding.blade.php	Allow multiple upload fields and add logo option to labels (#6736)	2019-03-01 15:25:42 -08:00
general.blade.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
index.blade.php	Added attempted logins admin screen (#6018)	2018-08-01 03:51:59 -07:00
labels.blade.php	Fixed labels labels (wha?)	2019-03-13 19:50:35 -07:00
ldap.blade.php	[WIP] v5 Develop: New LDAP implementation (#6352)	2018-12-06 14:05:43 -08:00
localization.blade.php	Add autocomplete=off to settings forms for #4210	2017-10-17 17:18:17 -07:00
logins.blade.php	Added attempted logins admin screen (#6018)	2018-08-01 03:51:59 -07:00
phpinfo.blade.php	Fixed #5742 - create_function() is deprecated	2018-07-05 20:49:01 -07:00
purge-form.blade.php	Add autocomplete=off to settings forms for #4210	2017-10-17 17:18:17 -07:00
purge.blade.php	Reformat all view files. (#3105)	2016-12-27 12:03:47 -08:00
security.blade.php	Only allow remote user settings to be saved if the app is not in demo mode	2018-05-31 10:55:48 -07:00
slack.blade.php	Style updates	2018-10-05 00:57:18 -07:00