aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-06fixed error messageFlorian Reimair2-1/+2
2014-03-05merge fr apBojan Suzic2-52/+46
2014-03-05Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3Bojan Suzic9-37/+75
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
2014-03-05merge ar-bsBojan Suzic4-0/+4
2014-03-05Merge branch 'moa2_0_tlenz_bs_3' into moa2_0_tlenz_bs_3_arBojan Suzic219-4350/+30391
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
2014-03-05storkid derivation pro countryBojan Suzic21-2106/+2104
2014-03-05land selection changeBojan Suzic7-1340/+1410
2014-03-05fixed throws declarationFlorian Reimair1-1/+2
2014-03-05ap plugins can be configured to listen to certain attributesFlorian Reimair7-13/+34
2014-03-05config gui fixesFlorian Reimair2-7/+10
2014-03-05fixed bug in loop preventionFlorian Reimair1-0/+1
2014-03-05check whether attributes obtained from different sources matchFlorian Reimair1-0/+7
2014-03-04after merging, inspecting, fixing, tbc.Bojan Suzic4-16/+5
2014-03-04after chaningBojan Suzic6-62/+2
2014-03-04after merge bs_3_frBojan Suzic14-226/+253
2014-03-04after merge apBojan Suzic5-0/+6
2014-03-04Merge branch 'ap' into moa2_0_tlenz_bs_3Bojan Suzic164-123/+25634
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/DataContainer.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
2014-03-04Merge branch 'ap' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into apBojan Suzic165-94/+25634
2014-03-04attrBojan Suzic2-9/+8
2014-03-04resolving problems related to commons and slf4j librariesBojan Suzic14-110/+252
2014-03-04after merge, having problemBojan Suzic15-311/+308
2014-03-04fixed samlengine serializablesFlorian Reimair2-4/+5
2014-03-04fixed response handlingFlorian Reimair2-15/+16
2014-03-04fixed eHVD pluginFlorian Reimair2-13/+30
2014-03-04vidp can handle attrquery and authnrequestFlorian Reimair6-77/+169
2014-03-04refactored attributecollector urlFlorian Reimair1-1/+1
2014-03-04Merge branch 'ap' into moa2_0_tlenz_bs_3Bojan Suzic2-57/+52
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
2014-03-03attribut testBojan Suzic9-57/+120
2014-03-03merged ap into bs_3Florian Reimair165-83/+25593
2014-03-03treated possible infinite loop in ap collectionFlorian Reimair1-16/+43
2014-03-03fixed spCountryCode in Stork AttrQuery PluginFlorian Reimair4-11/+10
2014-03-03cleanupFlorian Reimair1-43/+48
2014-03-03remove overrideBojan Suzic1-3/+0
2014-03-03putting attrrequest in main endpointBojan Suzic2-43/+63
2014-03-03remove attr testBojan Suzic1-1/+0
2014-03-03remove attr testBojan Suzic1-18/+0
2014-03-03aatributesBojan Suzic7-74/+110
2014-03-03remove commentsBojan Suzic1-19/+6
2014-03-03attr supporTBojan Suzic7-76/+222
2014-03-03added tweaked stork2-commons sourceFlorian Reimair159-0/+25475
2014-03-03cleanupFlorian Reimair2-17/+27
2014-03-03refactoringFlorian Reimair2-17/+41
2014-03-03cleanBojan Suzic1-36/+3
2014-02-28protocol changeBojan Suzic1-2/+2
2014-02-28Use LightweightSourceResolver in PEPSConnector to get the DataSourceAndreas Reiter1-10/+11
2014-02-28merge apBojan Suzic2-80/+134
2014-02-28Merge remote-tracking branch 'remotes/origin/ap' into moa2_0_tlenz_bs_3_arAndreas Reiter6-8/+21
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
2014-02-28url fix, attribute comparison fix, samlengine profile fixFlorian Reimair2-53/+143
2014-02-28Merge branch 'ap' into moa2_0_tlenz_bs_3Bojan Suzic2-3/+3
2014-02-28Merge branch 'ap' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into apBojan Suzic2-3/+3