Bill Burke
714e2fa7a5
Merge pull request #2022 from patriot1burke/master
...
KEYCLOAK-2098
2016-01-13 19:44:29 -05:00
Bill Burke
f9c458aa0e
Merge remote-tracking branch 'upstream/master'
2016-01-13 16:18:42 -05:00
Bill Burke
9dc21224bd
clean up most redirects
2016-01-13 16:18:24 -05:00
Stian Thorgersen
30c3a5ed70
Merge pull request #2020 from stianst/master
...
Mark all SPIs as internal
2016-01-13 19:24:43 +01:00
Bill Burke
b3967263d1
Merge remote-tracking branch 'upstream/master'
2016-01-13 10:16:06 -05:00
Bill Burke
b9c9b58727
refactor
2016-01-13 10:15:54 -05:00
Stian Thorgersen
f8841d2365
Mark all SPIs as internal
2016-01-13 15:49:53 +01:00
Stian Thorgersen
1619624691
Merge pull request #2018 from stianst/master
...
KEYCLOAK-2142
2016-01-13 15:06:48 +01:00
Stian Thorgersen
e572d45bea
KEYCLOAK-2142
...
Drop support to deploy server to EAP 6.4
2016-01-13 14:32:04 +01:00
Stian Thorgersen
ddb41e2c58
Merge pull request #2017 from mposolda/master
...
KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthent…
2016-01-13 11:10:09 +01:00
Stian Thorgersen
50fdf33040
Merge pull request #2011 from mhajas/eap64
...
KEYCLOAK-1646 Run adapter tests on EAP 6.4
2016-01-13 11:09:49 +01:00
Stian Thorgersen
3a83adae77
Merge pull request #2016 from stianst/master
...
Version bump
2016-01-13 11:09:26 +01:00
mposolda
4642876323
KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthenticator
2016-01-13 10:12:20 +01:00
Stian Thorgersen
0193c696ab
Version bump
2016-01-13 09:20:38 +01:00
Stian Thorgersen
75d715d8a7
Merge pull request #2015 from stianst/master
...
Remove reference to built-in admin account from docs
2016-01-13 09:03:15 +01:00
Stian Thorgersen
62b90ee4e3
Remove reference to built-in admin account from docs
2016-01-13 09:02:52 +01:00
Stian Thorgersen
2f88868e20
Merge pull request #2014 from ssilvert/KEYCLOAK-2294-pi-testrealm
...
KEYCLOAK-2294 Partial import can fail with 'Removing a detached insta…
2016-01-13 08:37:49 +01:00
Stan Silvert
b0de77013c
KEYCLOAK-2294 Partial import can fail with 'Removing a detached instance'
2016-01-12 15:46:48 -05:00
Stian Thorgersen
25cd3e3ba8
Merge pull request #2013 from stianst/master
...
KEYCLOAK-2298
2016-01-12 20:31:37 +01:00
Stian Thorgersen
1b0bf966b6
KEYCLOAK-2298
...
Demo doesn't have add-user-keycloak.bat
2016-01-12 19:46:34 +01:00
Marek Posolda
d8e28ad96b
Merge pull request #2012 from mposolda/master
...
KEYCLOAK-2290 Migration fixes. Bulk update of algorithm field during migration
2016-01-12 18:49:34 +01:00
mposolda
3336d4d7ac
KEYCLOAK-2290 bulk update of algorithm field during migration from 1.7
2016-01-12 18:04:50 +01:00
Stian Thorgersen
ee3a880a55
Merge pull request #1999 from pedroigor/KEYCLOAK-2266
...
[KEYCLOAK-2266] - OAuth2 Token Introspection.
2016-01-12 15:37:41 +01:00
Pedro Igor
c9f9ee9799
[KEYCLOAK-2266] - OAuth2 Token Introspection.
2016-01-12 11:16:42 -02:00
mhajas
c0d3d9cf6b
Remove unnecessary lines
2016-01-12 12:52:26 +01:00
mhajas
c93db980a6
Merge remote-tracking branch 'upstream/master' into eap64
2016-01-12 12:02:56 +01:00
mhajas
acf0100411
Ignore DemoServletsAdapterTest on EAP6
2016-01-12 11:56:10 +01:00
Marek Posolda
0536f2c247
Merge pull request #2010 from mposolda/master
...
KEYCLOAK-2229 Fix NoClassDefFoundError when IdpEmailVerificationAuthe…
2016-01-12 11:31:16 +01:00
mposolda
6f262423f1
KEYCLOAK-2229 Fix NoClassDefFoundError when IdpEmailVerificationAuthenticator is used for link accounts during first broker login
2016-01-12 10:37:44 +01:00
Stian Thorgersen
3c5e7872a7
Merge pull request #2009 from stianst/master
...
KEYCLOAK-2290
2016-01-12 10:32:22 +01:00
Stian Thorgersen
421dc6043d
KEYCLOAK-2290
...
Migration: empty algorithm field on user credentials of type 'password'
2016-01-12 09:46:35 +01:00
Stian Thorgersen
9402f89d8e
Merge pull request #2008 from stianst/master
...
KEYCLOAK-2229
2016-01-12 09:18:57 +01:00
Stian Thorgersen
81a0135fa6
KEYCLOAK-2229
...
First broker login throws NoClassDefFoundError: org/keycloak/broker/provider/BrokeredIdentityContext
2016-01-12 09:18:03 +01:00
Bill Burke
43dc250bf2
Merge pull request #2006 from thomasdarimont/issue/KEYCLOAK-2040-Conditional-OTP-Authentication
...
KEYCLOAK-2040 - Add support for Conditional OTP auth.
2016-01-11 14:56:48 -05:00
Marek Posolda
bc3222ab67
Merge pull request #2007 from mposolda/master
...
Fix DB tests. Cleanup after AddUserTest
2016-01-11 18:56:56 +01:00
mposolda
e761d6ce10
Fix DB tests. Cleanup after AddUserTest
2016-01-11 18:00:56 +01:00
Thomas Darimont
46991764d4
KEYCLOAK-2040 - Add support for Conditional OTP auth.
...
Previously it was not possible to conditionally show a OTP authentication
form. This PR adds support to conditionally require OTP authentication
based on a custom user attribute, a role, a request header pattern
(with black- and whitelisting) as well as a configurable default in
case no condition matches.
2016-01-11 17:39:42 +01:00
Stian Thorgersen
747c0f9869
Merge pull request #2004 from stianst/master
...
KEYCLOAK-2288
2016-01-11 17:32:38 +01:00
Marek Posolda
5424cd80a8
Merge pull request #2005 from mposolda/master
...
Fix MySQL - fixing transactions during bootstrap
2016-01-11 17:02:08 +01:00
Stian Thorgersen
8d2becf681
Fix import of com.mongodb.util.MyAsserts.assertFalse
2016-01-11 15:47:09 +01:00
mposolda
c3f69fdc54
Fix MySQL - fixing transactions during bootstrap
2016-01-11 15:31:45 +01:00
Stian Thorgersen
45215f361f
KEYCLOAK-2288
...
Upgrade Mongo driver version to 3.2.0
2016-01-11 15:10:00 +01:00
Stian Thorgersen
802488cea0
Merge pull request #2003 from mposolda/master
...
Fix mongo model
2016-01-11 13:58:06 +01:00
Stian Thorgersen
3ac3d79e30
Merge pull request #2002 from stianst/master
...
KEYCLOAK-2284
2016-01-11 13:22:44 +01:00
mposolda
fe8755d4a4
Fix mongo model
2016-01-11 13:00:56 +01:00
Stian Thorgersen
e2b889d727
KEYCLOAK-2284
...
Setup of background tasks doesn't close KeycloakSession
2016-01-11 11:41:36 +01:00
Stian Thorgersen
2ec4cb82cc
Merge pull request #2001 from stianst/master
...
KEYCLOAK-2278
2016-01-11 11:41:15 +01:00
Stian Thorgersen
bc14cade62
KEYCLOAK-2278
...
NoSuchMethodError org.infinispan.Cache.entrySet() in EAP6 server overlay
2016-01-11 10:07:04 +01:00
Stian Thorgersen
a6c852603e
Merge pull request #2000 from mstruk/truststore
...
KEYCLOAK-1717 Truststore SPI and file provider
2016-01-11 09:24:53 +01:00
Stian Thorgersen
f1602b3b8d
Merge pull request #1998 from ssilvert/partial-import
...
KEYCLOAK-1979: Partial import
2016-01-11 09:22:09 +01:00