Bill Burke
fa7a7d35a9
Merge remote-tracking branch 'upstream/master'
2015-11-13 09:30:37 -05:00
Bill Burke
fe5809db4d
token group roles
2015-11-13 09:30:25 -05:00
Bill Burke
1510d9672a
Merge pull request #1803 from gerbermichi/user
...
KEYCLOAK-2024 - username guessing
2015-11-13 08:53:05 -05:00
Bill Burke
9b93468131
Merge pull request #1818 from patriot1burke/master
...
group membership ui
2015-11-13 08:49:23 -05:00
bystrikhorvath
2e16a55815
KEYCLOAK-2077: correcting paths in custom-attributes.xml
2015-11-13 14:00:20 +01:00
Marek Posolda
f65665b5eb
Merge pull request #1822 from mposolda/broker-reauthentication
...
KEYCLOAK-1750 first broker login - events and tests
2015-11-13 10:27:38 +01:00
mposolda
ce4a865579
KEYCLOAK-1750 First broker login - tests
2015-11-13 09:32:46 +01:00
mposolda
f2e4e67ba0
KEYCLOAK-1750 First broker login - events
2015-11-13 09:32:46 +01:00
Stian Thorgersen
37f1eaae0e
Merge pull request #1821 from stianst/master
...
KEYCLOAK-2037 Update documentation
2015-11-13 09:04:17 +01:00
Stian Thorgersen
6c3a3517b8
KEYCLOAK-2037 Update documentation
2015-11-13 09:03:58 +01:00
Thomas Darimont
c4416a25e0
KEYCLOAK-2068 - Fix Potential NPE when using Servlet-Filter Adapter.
...
When using the `org.keycloak.adapters.servlet.KeycloakOIDCFilter` a `NullPointerException`
can be thrown in the `org.keycloak.adapters.servlet.FilterSessionStore` within the `getParam`
method of the generated wrapper in `buildWrapper` when the `content-type` is not set.
Since the `content-type` is only used to parse the body. We just check whether the `body`
is `null` and if so avoid touching the `content-type` which prevents the NPE.
If the `body` is null we return an empty `MultivaluedHashMap` for the parameters.
2015-11-13 00:14:34 +01:00
Bill Burke
550f773293
Merge remote-tracking branch 'upstream/master'
2015-11-12 13:16:50 -05:00
Bill Burke
d7ea66ad44
group membership ui
2015-11-12 13:16:30 -05:00
Bill Burke
2022a8d36b
Merge pull request #1817 from patriot1burke/master
...
user group membership ui
2015-11-12 13:09:37 -05:00
Bill Burke
0d20e3c7ff
Merge remote-tracking branch 'upstream/master'
2015-11-12 11:31:55 -05:00
Bill Burke
21119604c6
user group membership
2015-11-12 11:31:44 -05:00
Stian Thorgersen
973609d39b
Merge pull request #1816 from stianst/master
...
KEYCLOAK-2066
2015-11-12 14:44:03 +01:00
Stian Thorgersen
77bccda7a4
KEYCLOAK-2066
...
View details on import client not working
2015-11-12 14:03:09 +01:00
Stian Thorgersen
0c9f0ea3e6
Merge pull request #1813 from vmuzikar/missing-ids
...
Add missing IDs to some UI elements; add POs to Client Mappers
2015-11-12 13:36:19 +01:00
Stian Thorgersen
73197332c4
Merge pull request #1814 from pdrozd/federation-tests
...
Add Federation tests for admin console.
2015-11-12 13:36:03 +01:00
Stian Thorgersen
ee0dd7e200
Merge pull request #1815 from abstractj/KEYCLOAK-2064
...
KEYCLOAK-2064: Update pax-web to make use of SecureRandom
2015-11-12 13:35:33 +01:00
Bruno Oliveira
9203971809
KEYCLOAK-2064: Update pax-web to make use of SecureRandom
2015-11-12 09:46:45 -02:00
Pavel Drozd
4e7fe1de8d
Add Federation tests for admin console.
2015-11-12 12:23:37 +01:00
Stian Thorgersen
4646a4aceb
Merge pull request #1811 from stianst/master
...
KEYCLOAK-2060
2015-11-12 11:59:00 +01:00
Stian Thorgersen
64baa28301
Merge pull request #1810 from lkubik/updateJettyScope
...
Change scope of jetty dependencies in jetty-adapter-spi
2015-11-12 09:23:44 +01:00
Stian Thorgersen
db84571546
Merge pull request #1807 from vramik/KEYCLOAK-2031
...
KEYCLOAK-2031: Input validation in OTP Policy page fix, test
2015-11-12 09:23:13 +01:00
Stian Thorgersen
99cddcef6c
Merge pull request #1805 from velias/KEYCLOAK-2033
...
KEYCLOAK-2033 - Allow custom SPI Providers to show additional info on
2015-11-12 09:21:38 +01:00
Stian Thorgersen
1891019067
Merge pull request #1802 from equinux/pr/fix-js-parameter-encoding
...
Fix parameter encoding in JS adapter
2015-11-12 09:19:21 +01:00
Stian Thorgersen
b0b4d26fa3
KEYCLOAK-2060
...
Upgrade to WildFly 9.0.2.Final
2015-11-12 09:17:47 +01:00
Bill Burke
6cc76b2e3d
Merge pull request #1788 from patriot1burke/master
...
groups data model
2015-11-11 19:38:01 -05:00
Bill Burke
33ac048c8c
resolve conflicts
2015-11-11 18:06:39 -05:00
Bill Burke
e25157655b
group ui
2015-11-11 18:03:53 -05:00
Stian Thorgersen
213abb87ba
Merge pull request #1808 from stianst/master
...
KEYCLOAK-2055
2015-11-11 20:24:08 +01:00
Lukas Kubik
825a68c6c9
Change scope of jetty dependencies in jetty-adapter-spi.
2015-11-11 17:01:46 +01:00
Stian Thorgersen
816ed9419b
Merge pull request #1809 from lkubik/unifyJettyVersionWithOthers
...
Unify jetty version in keycloak-jetty-adapter-spi with other jetty versions
2015-11-11 16:10:17 +01:00
Stian Thorgersen
15f1a38b51
KEYCLOAK-2055
...
Invalid links in docs index.html
2015-11-11 14:32:43 +01:00
Lukas Kubik
1f75f85a20
Unify jetty version in keycloak-jetty-adapter-spi with other versions
2015-11-11 13:58:22 +01:00
Vaclav Muzikar
dfb39d13a2
Removed IDs from Password Policy
...
(cherry picked from commit 35376b7)
2015-11-11 12:00:44 +01:00
Bill Burke
b8391e0935
Merge pull request #1778 from girirajsharma/keycloak-1994
...
[KEYCLOAK-1994] It's not possible to create flow with same name as deleted nested flow
2015-11-10 10:58:57 -05:00
vramik
ab56460325
KEYCLOAK-2031: Input validation in OTP Policy page fix, test
2015-11-10 16:57:29 +01:00
Vaclav Muzikar
059ebacffc
Removed IDs from redirect URIs and Web Origins in Client
...
(cherry picked from commit 5c68854)
2015-11-10 15:46:55 +01:00
Stian Thorgersen
e1a07bd5a8
Merge pull request #1806 from tkyjovsk/karaf-fuse-update
...
Karaf fuse update
2015-11-10 15:28:36 +01:00
Tomas Kyjovsky
37d7182fc9
Merge upstream-master into karaf-fuse-update
...
Conflicts:
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java
2015-11-10 13:44:23 +01:00
Tomas Kyjovsky
e1ba26bcae
KEYCLOAK-1661 Added support for testing adapters/examples on fuse 6.2. Moved CustomKarafContainer from the base module to the adapters/karaf module.
2015-11-10 13:39:59 +01:00
Vlastimil Elias
b39146f6f5
KEYCLOAK-2033 - Allow custom SPI Providers to show additional info on
...
Server Info page
2015-11-10 12:55:36 +01:00
Marek Posolda
caea1a3458
Merge pull request #1804 from mposolda/broker-reauthentication
...
KEYCLOAK-1750 First broker login changes
2015-11-10 11:52:47 +01:00
Dominique d'Argent
7ef747e7c4
Fix parameter encoding in JS adapter
...
- fixes https://issues.jboss.org/browse/KEYCLOAK-2047
- relates to keycloak/keycloak-js-bower#7
2015-11-10 11:20:06 +01:00
mposolda
4ca442d1b2
KEYCLOAK-1750 Option updateProfileOnFirstLogin moved from IdentityProvider to IdpReviewProfile authenticator
2015-11-10 11:06:23 +01:00
mposolda
99e75c69a0
KEYCLOAK-1750 First broker login - support for change password after first social login
2015-11-10 10:25:31 +01:00
Michael Gerber
1437f7da35
KEYCLOAK-2024 - username guessing
2015-11-10 09:04:10 +01:00
