snipe-it/resources/views/users
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
..
bulk-edit.blade.php Allow bulk language update in user edit 2018-01-10 05:33:26 -08:00
confirm-bulk-delete.blade.php Fixes #4256 - double encoding on user bulk checkin and delete blade 2017-10-19 03:17:55 -07:00
edit.blade.php Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop 2019-02-13 23:02:21 -08:00
index.blade.php Added ability to trigger forgotten password emails for users 2018-07-30 20:31:02 -07:00
ldap.blade.php [WIP] v5 Develop: New LDAP implementation (#6352) 2018-12-06 14:05:43 -08:00
print.blade.php Show user's signature in print view (#6471) 2019-01-15 14:03:40 -08:00
view.blade.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00