diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-10-24 15:40:17 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-10-24 15:40:17 +0200 |
| commit | a36f28e84cd86196c8b750cbaa4f61977996aa6e (patch) | |
| tree | fcf995faff5dd4bb08fdbe972f545c2b7aa4d61e /id/server/idserverlib | |
| parent | bda377810ebe5467439d2098d683788ba4e7e602 (diff) | |
| parent | 481963320bb314cd5b3fd459abe93f448bd677e9 (diff) | |
| download | moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.gz moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.tar.bz2 moa-id-spss-a36f28e84cd86196c8b750cbaa4f61977996aa6e.zip | |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/server/idserverlib')
3 files changed, 6 insertions, 2 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 00d128ca5..08c406cf1 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -241,6 +241,10 @@ <groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html index ef070b8eb..7e2ddc491 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html @@ -720,7 +720,7 @@ } } function onChangeChecks() { - if (top.innerWidth < 650) { + if (self.innerWidth < 650) { document.getElementById("moaidform").setAttribute("target","_parent"); } else { document.getElementById("moaidform").removeAttribute("target"); diff --git a/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm b/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm index cac0bda76..8beb601c6 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm +++ b/id/server/idserverlib/src/main/resources/resources/templates/saml2-post-binding-moa.vm @@ -18,7 +18,7 @@ </p> </noscript> - <form action="${action}" method="post" target="_parent"> + <form action="${action}" method="post" target="_top"> <div> #if($RelayState)<input type="hidden" name="RelayState" value="${RelayState}"/>#end |