Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

simplesamlphp-module-privacyidea
- Activity
- Members
- Labels
- Jira
- Releases

Snippets Groups Projects

40707985

Unverified Commit 40707985 authored 3 years ago by lukasmatusiewicz Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge branch 'master' into labels

parents ed15b615 69c99bbb

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 3 additions, 4 deletions

.gitmodules
composer.json 2 additions, 1 deletion

composer.json
dictionaries/privacyidea.translation.json 34 additions, 0 deletions

dictionaries/privacyidea.translation.json
docs/privacyidea.md 2 additions, 2 deletions

docs/privacyidea.md
lib/Auth/Process/PrivacyideaAuthProc.php 4 additions, 3 deletions

lib/Auth/Process/PrivacyideaAuthProc.php
lib/Auth/Source/AuthSourceLoginHandler.php 2 additions, 0 deletions

lib/Auth/Source/AuthSourceLoginHandler.php
lib/Auth/Source/PrivacyideaAuthSource.php 3 additions, 2 deletions

lib/Auth/Source/PrivacyideaAuthSource.php
lib/Auth/utils.php 28 additions, 14 deletions

lib/Auth/utils.php
lib/sdk-php 0 additions, 1 deletion

lib/sdk-php
templates/loginform.php 13 additions, 4 deletions

templates/loginform.php
www/js/webauthn-client 1 addition, 0 deletions

www/js/webauthn-client

with 92 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment