diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-09 12:31:39 +0200 |
| commit | 408246a7cd0f8931f224d9d4d8e4469ab7bc6a21 (patch) | |
| tree | 9726e6807e9cc0ca4b7603068f314a31a14349d1 /id/ConfigWebTool/src/main/webapp/js/common.js | |
| parent | bb06ad890498e2428c3f4268ae2f732a0f75bd77 (diff) | |
| parent | 719b06ae04a8d96bf24268a4e25a0cd7b0768e95 (diff) | |
| download | moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.gz moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.tar.bz2 moa-id-spss-408246a7cd0f8931f224d9d4d8e4469ab7bc6a21.zip | |
merge SSO interfederation into Snapshot branch
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/js/common.js')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/js/common.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index 18c755f4b..32e79bb66 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -204,7 +204,7 @@ function oaOnLoad() { AdminTarget(); oaTargetSubSector(); - oaVIDP(); +// oaVIDP(); $(".colorfield").each( function() { |