Bill Burke
8fbc8fc736
Merge remote-tracking branch 'upstream/master'
2014-10-14 18:39:08 -04:00
Bill Burke
7760887ac1
app cert support, bug fixes
2014-10-14 18:38:48 -04:00
Stian Thorgersen
7e7ab86821
Merge pull request #763 from stianst/master
...
KEYCLOAK-755 Support env variables in keycloak-server.json
2014-10-14 15:06:57 +02:00
Stian Thorgersen
106a0cb48d
KEYCLOAK-755 Support env variables in keycloak-server.json
2014-10-14 15:06:18 +02:00
Stian Thorgersen
75be776aa1
Removed properties from server keycloak-server.json
2014-10-14 15:06:18 +02:00
Stian Thorgersen
2dbebd164f
Merge pull request #762 from stianst/master
...
KEYCLOAK-753 Add 'username:' prefix to remember me cookie to prevent iss...
2014-10-14 13:49:59 +02:00
Stian Thorgersen
1021e8af5c
KEYCLOAK-753 Add 'username:' prefix to remember me cookie to prevent issue with old cookie
2014-10-14 13:44:03 +02:00
Stian Thorgersen
2ad688a663
Merge pull request #761 from stianst/liquibase
...
KEYCLOAK-736 Fix class-path issues
2014-10-14 13:05:25 +02:00
Stian Thorgersen
bf7effc6f2
KEYCLOAK-736 Fix class-path issues
2014-10-14 13:04:38 +02:00
Stian Thorgersen
d86547620a
Merge pull request #760 from stianst/liquibase
...
KEYCLOAK-736 Database migration support"
2014-10-14 10:41:48 +02:00
Stian Thorgersen
94de88ef3b
KEYCLOAK-736 Database migration support"
2014-10-14 10:07:41 +02:00
Stian Thorgersen
101c7697fd
Merge pull request #759 from stianst/master
...
KEYCLOAK-744 Document view-event and manage-event roles
2014-10-13 14:02:47 +02:00
Stian Thorgersen
cf94f4f84a
KEYCLOAK-744 Document view-event and manage-event roles
2014-10-13 14:02:20 +02:00
Stian Thorgersen
6855b2f0e4
Merge pull request #758 from stianst/master
...
KEYCLOAK-746 Allow linking to account from external provider
2014-10-13 13:19:36 +02:00
Stian Thorgersen
4d401224de
KEYCLOAK-746 Allow linking to account from external provider
2014-10-13 10:48:45 +02:00
Bill Burke
4d007c776a
generate/store realm certificate
2014-10-11 10:49:04 -04:00
Bill Burke
eac1fb23cf
Merge pull request #757 from patriot1burke/master
...
use id for oauth in admin console
2014-10-10 16:56:47 -04:00
Bill Burke
d9ff44b870
Merge remote-tracking branch 'upstream/master'
2014-10-10 16:56:16 -04:00
Bill Burke
deffa9b4e1
oauth id in admin console
2014-10-10 16:55:57 -04:00
Bill Burke
3d7fca885e
Merge pull request #756 from patriot1burke/master
...
freeotp
2014-10-10 16:08:03 -04:00
Bill Burke
08c5fed1b3
freeotp
2014-10-10 16:07:35 -04:00
Bill Burke
23d0361168
Merge pull request #755 from patriot1burke/master
...
admin console and model attributes
2014-10-09 18:31:16 -04:00
Bill Burke
0ace5cd746
merge conflicts
2014-10-09 18:26:14 -04:00
Bill Burke
94da99bf10
use app id in admin console urls
2014-10-09 18:22:02 -04:00
Marek Posolda
3d5d7777f6
Merge pull request #754 from mposolda/master
...
KEYCLOAK748 cluster-aware logout for non-distributable applications
2014-10-09 21:36:13 +02:00
mposolda
9954d68a1f
KEYCLOAK-748 cluster-aware logout for non-distributable apps
2014-10-09 21:33:07 +02:00
mposolda
00716b7bfc
Docker config update
2014-10-09 21:33:06 +02:00
Stian Thorgersen
6d1555262e
Merge branch 'abstractj-totp-name'
2014-10-09 13:08:54 +02:00
Bruno Oliveira
c00c712c39
KEYCLOAK-745 Display the realm name for OTP QR code scan
2014-10-09 13:03:48 +02:00
Marek Posolda
63f4a32f2e
Merge pull request #752 from mposolda/stateless-session-mgmt
...
Test for KEYCLOAK-741
2014-10-09 12:36:40 +02:00
mposolda
2445575a04
Test for KEYCLOAK-741
2014-10-09 12:30:30 +02:00
Marek Posolda
56fe821bef
Merge pull request #751 from mposolda/stateless-session-mgmt
...
Fix mongo to pass with testsuite
2014-10-09 11:38:59 +02:00
mposolda
36cc298b32
Fix mongo to pass with testsuite
2014-10-09 11:37:42 +02:00
Marek Posolda
a00d36eea2
Merge pull request #750 from mposolda/stateless-session-mgmt
...
Stateless session mgmt
2014-10-08 23:32:51 +02:00
mposolda
ac8b43358d
Reduce logging
2014-10-08 23:28:02 +02:00
mposolda
1e33931f23
KEYCLOAK-741 Failure to refresh token should invalidate http session
2014-10-08 22:18:11 +02:00
mposolda
7e7406ddb7
KEYCLOAK-743 Stateless session mgmt. Drop statistics for adapters.
2014-10-08 22:18:10 +02:00
mposolda
84e1ace539
KEYCLOAK-742 Added always-refresh-token option to adapters
2014-10-08 22:18:10 +02:00
Bill Burke
a1d1877751
ClientModel attributes and protocol
2014-10-08 10:54:13 -04:00
Bill Burke
390ca0930b
Merge pull request #749 from patriot1burke/master
...
undertow slash redirect problem
2014-10-08 09:46:20 -04:00
Bill Burke
13a2108846
undertow slash redirect problem
2014-10-08 09:45:49 -04:00
Bill Burke
9ffd517b53
Merge pull request #747 from patriot1burke/master
...
saml backchannel logout
2014-10-07 18:18:54 -04:00
Bill Burke
5f1e6f3a23
merge
2014-10-07 18:17:44 -04:00
Bill Burke
6d5ab0f66b
saml backchannel logout
2014-10-07 18:06:02 -04:00
Marek Posolda
bc85be23b7
Merge pull request #746 from mposolda/master
...
KEYCLOAK-738 Possible NPE in MemUserSessionProvider.getUserSessions
2014-10-07 19:21:14 +02:00
mposolda
6522455b44
KEYCLOAK-738 Possible NPE in MemUserSessionProvider.getUserSessions
2014-10-07 19:19:46 +02:00
Stian Thorgersen
2e76be45fa
Merge pull request #744 from pilhuhn/patch-1
...
Update adapter-config.xml
2014-10-07 13:15:05 +02:00
Marek Posolda
0c3a9be1a1
Merge pull request #745 from mposolda/docker
...
Possibility to test EAP6 cluster with docker+fig
2014-10-07 12:42:08 +02:00
mposolda
a6bbc492b8
Possibility to test EAP6 cluster with docker+fig
2014-10-07 12:33:44 +02:00
Heiko W. Rupp
3d4ef91bf1
Update adapter-config.xml
...
Fix some minor typos in the json, Otherwise it is invalid.
Also deploying in the keycloak 1.0.1 appliance, the line
"cors-allowed-methods" : [ "POST", "PUT", "DELETE", "GET" ],
makes parsing fail with
11:19:10,121 ERROR [org.jboss.as.controller.management-operation] (DeploymentScanner-threads - 1) JBAS014613: Operation ("full-replace-deployment") failed - address: ([]) - failure description: {"JBAS014671: Failed services" => {"jboss.undertow.deployment.default-server.default-host./rhq-metrics" => "org.jboss.msc.service.StartException in service jboss.undertow.deployment.default-server.default-host./rhq-metrics: Failed to start service
Caused by: java.lang.RuntimeException: org.codehaus.jackson.map.JsonMappingException: Can not deserialize instance of java.lang.String out of START_ARRAY token
at [Source: java.io.BufferedInputStream@1605c2fe; line: 9, column: 24] (through reference chain: org.keycloak.representations.adapters.config.AdapterConfig[\"cors-allowed-methods\"])
Caused by: org.codehaus.jackson.map.JsonMappingException: Can not deserialize instance of java.lang.String out of START_ARRAY token
at [Source: java.io.BufferedInputStream@1605c2fe; line: 9, column: 24] (through reference chain: org.keycloak.representations.adapters.config.AdapterConfig[\"cors-allowed-methods\"])"}}
2014-10-07 11:21:15 +02:00
