Bill Burke
3f62cee836
Merge remote-tracking branch 'upstream/master'
2016-01-04 17:14:19 -05:00
Bill Burke
3bacbdf6ff
set framework for template config
2016-01-04 17:13:15 -05:00
Thomas Darimont
edcc39d906
KEYCLOAK-2253 - Use string representation for boolean properties in GenericUserFederationCtrl.
...
Adapted due to code review.
2016-01-04 23:07:08 +01:00
Thomas Darimont
3ec516d14c
KEYCLOAK-2253 - Add support for ConfiguredProvider based UserFederationProviderFactory.
...
UserFederationProvidersResource is now aware of ConfiguredProvider and allows sophisticated
configuration of configuration properties via ProviderConfigProperty definitions.
See DummyUserFederationProviderFactory. getConfigProperties() for example.
Previously UserFederationProvidersResource did only support simple key-value pairs for expressing
configurable options.
Tested this by launching a standalone KeycloakServer and creating a new Dummy UserFederationProvider.
The default values, labels and help messages are correctly displayed and the values are stored correctly.
2016-01-04 22:23:14 +01:00
Dane Barentine
d8d0298498
KEYCLOAK-2255 Location header should return IdP alias instead of provider ID.
2016-01-04 11:30:57 -08:00
Thomas Raehalme
8356409b44
Fixed some typos in the docs and added paragraph regarding GrantedAuthoritiesMapper.
2016-01-04 21:16:37 +02:00
Thomas Raehalme
57971ce0b2
Changed docs to match the new code.
2016-01-04 21:09:36 +02:00
Stian Thorgersen
b708cd671e
Merge pull request #1969 from vmuzikar/ui-stability
...
[KEYCLOAK-1865] Enable LdapUserFederationTest#invalidSettingsTest - already fixed
2016-01-04 20:07:52 +01:00
Bruno Oliveira
1b857387f2
Minor change for client registration documentation
2016-01-04 16:31:39 -02:00
Bruno Oliveira
cea70337ef
Tooltips for initial access token fields
2016-01-04 15:49:57 -02:00
Bill Burke
6d5de7b44e
Merge remote-tracking branch 'upstream/master'
2016-01-04 11:26:15 -05:00
Bill Burke
10eba78036
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileProtocolFactory.java
2016-01-04 11:25:14 -05:00
Stian Thorgersen
dd6b05224d
Merge pull request #1968 from stianst/master
...
KEYCLOAK-2250
2016-01-04 14:33:39 +01:00
Stian Thorgersen
e7009cac47
KEYCLOAK-2204 Add test to make sure disabled client can't refresh token
2016-01-04 13:15:58 +01:00
Stian Thorgersen
eece3689f2
KEYCLOAK-2228
...
Deleting of realm when using JPA requires server restart
2016-01-04 13:04:33 +01:00
Vaclav Muzikar
f48753f6e1
Enable LdapUserFederationTest#invalidSettingsTest - already fixed
2016-01-04 12:36:38 +01:00
Stian Thorgersen
392ce0b323
KEYCLOAK-2250
...
Infinispan offline sessions cache is missing from configuration files
2016-01-04 11:53:25 +01:00
Jean Merelis
2fce7f8498
fix doLogIn key (pt_BR)
2016-01-03 21:02:32 -02:00
Jean Merelis
c5f19ff2b3
fix some missing translation (pt_BR)
2016-01-02 23:23:04 -02:00
Jean Merelis
b24dfa0009
translation of messages to pt_BR
2016-01-02 00:37:47 -02:00
Stian Thorgersen
a9b5d07263
Merge pull request #1964 from stianst/master
...
KEYCLOAK-2242
2015-12-23 14:39:41 +01:00
Stian Thorgersen
eddf3eef17
KEYCLOAK-2242
...
Remove built-in admin account
2015-12-23 13:46:11 +01:00
Bill Burke
dbac147419
client config refactor
2015-12-22 17:50:03 -05:00
Marek Posolda
6752a4f9b0
Merge pull request #1963 from mposolda/master
...
KEYCLOAK-1899 Added HardcodedLDAPRoleMapper
2015-12-22 20:43:09 +01:00
Pedro Igor
35804aa0df
Merge pull request #1961 from pedroigor/KEYCLOAK-2202
...
[KEYCLOAK-2202] - Removing LoginProtocol in order to reuse SAML settings.
2015-12-22 13:48:54 -02:00
mposolda
41d22986d5
KEYCLOAK-1899 Added HardcodedLDAPRoleMapper
2015-12-22 16:22:02 +01:00
Pedro Igor
9172b5472e
[KEYCLOAK-2202] - Removing LoginProtocol in order to reuse SAML settings.
2015-12-22 12:53:39 -02:00
Marek Posolda
b27b0411a6
Merge pull request #1960 from mposolda/master
...
KEYCLOAK-2154 Group mapper fixes
2015-12-22 13:19:40 +01:00
mposolda
0c293089c3
KEYCLOAK-2154 Group mapper fixes
2015-12-22 12:32:37 +01:00
Marek Posolda
5403296ac6
Merge pull request #1959 from mposolda/master
...
KEYCLOAK-2154 Added Group mapper for LDAP. LDAP mappers improvements and fixes
2015-12-22 10:15:26 +01:00
mposolda
20548b402d
Separate package for LDAP tests
2015-12-22 09:35:53 +01:00
mposolda
1747e0981f
KEYCLOAK-2154 Added Group mapper for LDAP. LDAP mappers improvements and fixes
2015-12-22 08:54:09 +01:00
Bill Burke
ea6374163d
Merge pull request #1957 from stianst/master
...
KEYCLOAK-2043
2015-12-21 16:56:01 -05:00
Bill Burke
4782780857
Merge pull request #1958 from patriot1burke/master
...
refactor client create
2015-12-21 16:55:52 -05:00
Bill Burke
b90409c5e4
refactor client create
2015-12-21 16:36:13 -05:00
Stian Thorgersen
9a921f66ff
KEYCLOAK-2043
...
.well-known/openid-configuration doesn't set cache-control header
2015-12-21 15:35:23 +01:00
Stian Thorgersen
4a492ce13c
Merge pull request #1956 from stianst/master
...
KEYCLOAK-2240
2015-12-21 14:29:17 +00:00
Stian Thorgersen
39904548eb
KEYCLOAK-2240
...
Internationalize admin console title
2015-12-21 13:16:54 +01:00
Stian Thorgersen
18268f686c
Merge pull request #1955 from stianst/master
...
Support for branding
2015-12-21 12:00:56 +00:00
Stian Thorgersen
1594e07628
KEYCLOAK-2239
...
Add link to keycloak.org to Keycloak logo
2015-12-21 12:15:36 +01:00
Stian Thorgersen
606e6fa479
KEYCLOAK-1934
...
Add display-name and display-name-html to realm
2015-12-21 12:15:13 +01:00
Stian Thorgersen
1afd3d422c
Merge pull request #1952 from vmuzikar/ui-stability
...
KEYCLOAK-1865 Fix stability of some UI arquillian tests
2015-12-21 07:50:11 +00:00
Bill Burke
80fae7116b
Merge pull request #1953 from patriot1burke/master
...
client template scope
2015-12-18 18:32:00 -05:00
Bill Burke
86a0995f29
fix test
2015-12-18 17:31:53 -05:00
Bill Burke
a7c684b909
oops
2015-12-18 17:19:31 -05:00
Bill Burke
5caf3e0a2d
Merge remote-tracking branch 'upstream/master'
2015-12-18 17:15:40 -05:00
Bill Burke
d939b6a431
template scope
2015-12-18 17:15:27 -05:00
Vaclav Muzikar
42d17577d0
Upstream sync
2015-12-18 17:28:57 +01:00
Vaclav Muzikar
eaf326dd37
Fix Client Mappers tests
...
(cherry picked from commit b9f9db0)
2015-12-18 17:18:59 +01:00
Vaclav Muzikar
53a542d1e2
Enable TokensTest (already fixed by previous commit bf70927)
...
(cherry picked from commit 6783bcb)
2015-12-18 17:15:20 +01:00
