Merge branch 'master' into 655/php-edit-state (f4c4381f) · Commits · Perun / Perun ProxyIdP / v1 / simplesamlphp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

simplesamlphp
- Activity
- Members
- Labels
- Jira
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

f4c4381f

Unverified Commit f4c4381f authored 6 years ago by Tim van Dijen Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into 655/php-edit-state

parents dd8e62d4 837e7e28

No related branches found

No related tags found

No related merge requests found

Changes 303

Expand all Hide whitespace changes

Inline Side-by-side

Showing

composer.json 2 additions, 2 deletions

composer.json
composer.lock 527 additions, 452 deletions

composer.lock
config-templates/config.php 6 additions, 1 deletion

config-templates/config.php
dictionaries/admin.translation.json 1 addition, 2 deletions

dictionaries/admin.translation.json
lib/SimpleSAML/Auth/LDAP.php 54 additions, 30 deletions

lib/SimpleSAML/Auth/LDAP.php
lib/SimpleSAML/Auth/ProcessingChain.php 2 additions, 2 deletions

lib/SimpleSAML/Auth/ProcessingChain.php
lib/SimpleSAML/AuthMemCookie.php 3 additions, 2 deletions

lib/SimpleSAML/AuthMemCookie.php
lib/SimpleSAML/IdP.php 1 addition, 1 deletion

lib/SimpleSAML/IdP.php
lib/SimpleSAML/Locale/Localization.php 28 additions, 0 deletions

lib/SimpleSAML/Locale/Localization.php
lib/SimpleSAML/Locale/Translate.php 31 additions, 21 deletions

lib/SimpleSAML/Locale/Translate.php
lib/SimpleSAML/Memcache.php 4 additions, 3 deletions

lib/SimpleSAML/Memcache.php
lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php 3 additions, 2 deletions

lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
lib/SimpleSAML/Metadata/Signer.php 3 additions, 2 deletions

lib/SimpleSAML/Metadata/Signer.php
lib/SimpleSAML/Session.php 3 additions, 24 deletions

lib/SimpleSAML/Session.php
lib/SimpleSAML/Utils/Auth.php 20 additions, 0 deletions

lib/SimpleSAML/Utils/Auth.php
lib/SimpleSAML/XHTML/IdPDisco.php 48 additions, 2 deletions

lib/SimpleSAML/XHTML/IdPDisco.php
lib/SimpleSAML/XHTML/TemplateLoader.php 13 additions, 6 deletions

lib/SimpleSAML/XHTML/TemplateLoader.php
lib/SimpleSAML/XML/Parser.php 6 additions, 4 deletions

lib/SimpleSAML/XML/Parser.php
lib/SimpleSAML/XML/Shib13/AuthnResponse.php 6 additions, 5 deletions

lib/SimpleSAML/XML/Shib13/AuthnResponse.php
lib/SimpleSAML/XML/Signer.php 1 addition, 1 deletion

lib/SimpleSAML/XML/Signer.php

with 762 additions and 562 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