Skip to content

Commit

Permalink
Merge master into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Jun 9, 2021
2 parents b7c80a6 + 7d9d62f commit 765ccc8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core/orion
Submodule orion updated 145 files
2 changes: 1 addition & 1 deletion security/keyrock
Submodule keyrock updated 62 files
+4 −4 CREDITS
+0 −186 Dockerfile
+2 −2 README.md
+7 −0 apiary.apib
+11 −0 app.js
+27 −4 config.js
+24 −0 config.js.template
+5 −1 controllers/api/authenticate_oauth.js
+273 −0 controllers/authregistry/authregistry.js
+214 −0 controllers/authregistry/delegationEvidenceSchema.json
+198 −0 controllers/authregistry/delegationRequestSchema.json
+479 −0 controllers/extparticipant/extparticipant.js
+42 −0 controllers/extparticipant/utils.js
+11 −1 controllers/oauth2/oauth2.js
+94 −0 controllers/oidc/oidc.js
+1 −1 controllers/saml2/saml2.js
+93 −5 controllers/web/applications.js
+4 −0 controllers/web/users.js
+1 −1 doc.ja/eidas/introduction.md
+53 −0 doc.ja/installation_and_administration_guide/configuration.md
+12 −0 doc.ja/installation_and_administration_guide/environment_variables.md
+1 −1 doc.ja/installation_and_administration_guide/sanity_check.md
+3 −3 doc.ja/oauth/introduction.md
+4 −4 doc.ja/oauth/oauth_documentation.md
+1 −1 doc.ja/oidc/oidc_documentation.md
+27 −24 doc.ja/user_and_programmers_guide/application_guide.md
+54 −0 doc/installation_and_administration_guide/configuration.md
+12 −0 doc/installation_and_administration_guide/environment_variables.md
+2 −2 doc/oauth/introduction.md
+4 −4 doc/oauth/oauth_documentation.md
+2 −1 doc/oidc/oidc_documentation.md
+1 −1 doc/user_and_programmers_guide/application_guide.md
+2 −0 etc/escape_paths/paths.json
+4 −2 etc/translations/en.json
+2 −0 etc/translations/es.json
+46 −44 etc/translations/ja.json
+5 −1 etc/translations/ko.json
+7 −3 extras/docker/Dockerfile
+64 −1 lib/configService.js
+11 −0 migrations/20210422214057-init-visible_attributes.js
+15 −0 migrations/20210423161823-AddOidcNonce.js.js
+72 −0 migrations/20210603073911-hashed-access-tokens.js
+38 −0 migrations/20210607162019-CreateDelegationEvidenceTable.js
+37 −0 models/delegation_evidence.js
+52 −16 models/model_oauth_server.js
+4 −0 models/models.js
+8 −3 models/oauth2/oauth_access_token.js
+3 −2 models/oauth2/oauth_authorization_code.js
+1 −1 models/oauth2/oauth_client.js
+1 −1 models/oauth2/oauth_refresh_token.js
+222 −5 package-lock.json
+9 −5 package.json
+ public/img/applications/i4trust_party.png
+44 −0 routes/authregistry/authregistry.js
+25 −17 routes/oauth2/oauth2.js
+6 −0 routes/web/applications.js
+2 −0 templates/oauth_response/oauth_user_response.json
+39 −0 templates/oidc_discovery/oidc_discovery.json
+385 −0 test/unit/authregistry.js
+8 −0 views/applications/show.ejs
+1 −1 views/auth/_login.ejs
+1 −1 views/oauth/_login.ejs
2 changes: 1 addition & 1 deletion security/true-connector
2 changes: 1 addition & 1 deletion security/wilma

0 comments on commit 765ccc8

Please sign in to comment.