diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-08-06 10:33:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-08-06 10:33:36 +0200 |
| commit | 845d7241c2556d36cfd91cdca8ddeb11f0395e6e (patch) | |
| tree | fdae99cc4c4fc136dffa12aff5437b6239411b53 /repository/iaik/prod/iaik_moa | |
| parent | 420cfafa9137bbf8c5e0ebae0baa118dca2cc31a (diff) | |
| parent | 4e33913549b65ec9b16b4d0f3ffea9f97279ca65 (diff) | |
| download | moa-id-spss-845d7241c2556d36cfd91cdca8ddeb11f0395e6e.tar.gz moa-id-spss-845d7241c2556d36cfd91cdca8ddeb11f0395e6e.tar.bz2 moa-id-spss-845d7241c2556d36cfd91cdca8ddeb11f0395e6e.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAPVP2Config.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/ValidationHelper.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASAML1ConfigValidation.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASSOConfigValidation.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
id/ConfigWebTool/src/main/resources/applicationResources_de.properties
id/ConfigWebTool/src/main/resources/struts.xml
id/ConfigWebTool/src/main/webapp/css/index.css
id/ConfigWebTool/src/main/webapp/js/common.js
id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
Diffstat (limited to 'repository/iaik/prod/iaik_moa')
0 files changed, 0 insertions, 0 deletions