mhajas
f9f1e36df6
Ignore DemoServletAdapterTest on EAP6
2016-01-08 14:49:48 +01:00
mhajas
27f6390d00
Fix grantServerBasedApp test
2016-01-08 14:09:06 +01:00
mhajas
8c4f071003
Merge remote-tracking branch 'upstream/master' into eap64
2016-01-08 13:28:35 +01:00
Bill Burke
280725a2ae
Merge pull request #1985 from patriot1burke/master
...
KEYCLOAK-1990 KEYCLOAK-1991
2016-01-07 18:24:31 -05:00
Bill Burke
2892b093ab
Merge remote-tracking branch 'upstream/master'
2016-01-07 17:25:58 -05:00
Bill Burke
78fe064cf0
2213
2016-01-07 17:25:47 -05:00
Stian Thorgersen
30aaea73e4
Merge pull request #1989 from stianst/master
...
KEYCLOAK-2127 Re-enable set admin user with welcome page
2016-01-07 16:20:28 +01:00
Stian Thorgersen
4b1b697aa3
KEYCLOAK-2127 Re-enable set admin user with welcome page
2016-01-07 16:19:59 +01:00
Stian Thorgersen
112a44676d
Merge pull request #1988 from stianst/KEYCLOAK-2269
...
KEYCLOAK-2269
2016-01-07 14:08:01 +01:00
Stian Thorgersen
f7282d71e5
Merge pull request #1987 from stianst/master
...
KEYCLOAK-2252
2016-01-07 14:07:49 +01:00
Stian Thorgersen
9840c47970
Merge pull request #1986 from mhajas/master
...
KEYCLOAK-2127 Use add-user script for admin user creating
2016-01-07 13:17:47 +01:00
Stian Thorgersen
8695e16971
KEYCLOAK-2269
...
add-user script adds identityFederationEnabled field to keycloak-add-user.json
2016-01-07 13:17:10 +01:00
Stian Thorgersen
65f5ce9f13
KEYCLOAK-2252
...
Cannot delete client mapper with delete icon
2016-01-07 13:10:01 +01:00
Stian Thorgersen
77962ec896
Merge pull request #1984 from mstruk/providers-init
...
Prevent ProviderFactories being loaded twice
2016-01-07 11:57:12 +01:00
mhajas
54712e29aa
Use user script for admin user creating
2016-01-07 11:24:51 +01:00
Bill Burke
71b6ed80ae
Merge remote-tracking branch 'upstream/master'
2016-01-06 16:51:24 -05:00
Bill Burke
4a4bbf26f4
installation provider
2016-01-06 16:51:02 -05:00
Bill Burke
64de96d34b
installation provider
2016-01-06 16:49:58 -05:00
Stian Thorgersen
084873f7fb
Merge pull request #1981 from stianst/master
...
KEYCLOAK-2247 Upgrade to WildFly 10.0.0.CR5
2016-01-06 19:19:35 +01:00
Stian Thorgersen
c684dac625
Tweak mem for Travis
2016-01-06 16:15:00 +01:00
Stian Thorgersen
a5c159eeff
KEYCLOAK-2247
...
Upgrade to WildFly 10.0.0.CR5
2016-01-06 16:15:00 +01:00
Bill Burke
1cbe5c4c80
Merge remote-tracking branch 'upstream/master'
2016-01-06 10:03:27 -05:00
Bill Burke
4a472b8272
KEYCLOAK-1990 KEYCLOAK-1991
2016-01-06 10:02:56 -05:00
Stian Thorgersen
ddf74c0d9c
Merge pull request #1983 from mstruk/ispn-conf
...
Fix missing offlineSessions local-cache config for demo-dist
2016-01-06 14:49:04 +01:00
Stian Thorgersen
b2a3918fc3
Merge pull request #1982 from abstractj/KEYCLOAK-1919
...
Make use of display name by default for TOTP
2016-01-06 14:26:05 +01:00
Marko Strukelj
aca00dd42c
Prevent ProviderFactories being loaded twice
2016-01-05 23:07:13 +01:00
Marko Strukelj
2a8e868bc1
Fix missing offlineSession local-cache config for demo-dist
2016-01-05 22:56:44 +01:00
Bruno Oliveira
7ec0dad88f
Make use of display name by default for TOTP
...
- use realm name just in case of display name is not available
2016-01-05 18:31:13 -02:00
Marek Posolda
1e3ec1983d
Merge pull request #1980 from mposolda/master
...
LDAP testing: added activation
2016-01-05 20:54:56 +01:00
mposolda
7ec02761ef
LDAP testing: added activation
2016-01-05 20:53:25 +01:00
Bill Burke
7b30a6c9c4
Merge pull request #1979 from mposolda/master
...
Docs for LDAP mappers. Fix testsuite to pass with MSAD
2016-01-05 14:19:50 -05:00
Bill Burke
0d56713871
Merge pull request #1978 from patriot1burke/master
...
KEYCLOAK-2221
2016-01-05 14:19:33 -05:00
mposolda
658f204d92
Documentation for new LDAP mappers
2016-01-05 18:50:54 +01:00
mposolda
04401af470
Fix testsuite to pass with MSAD
2016-01-05 17:25:42 +01:00
Bill Burke
39d5a07218
KEYCLOAK-2221
2016-01-05 10:59:13 -05:00
Bill Burke
a65f619c9a
Merge pull request #1977 from mposolda/master
...
KEYCLOAK-2258 Removing leftovers of file model from docs and testsuite
2016-01-05 10:06:07 -05:00
Bill Burke
01c408ba68
Merge pull request #1975 from thomasdarimont/issue/KEYCLOAK-2256
...
KEYCLOAK-2256 - Guarantee deterministic ordering for custom user attributes in admin console.
2016-01-05 10:05:36 -05:00
Bill Burke
63975886cb
Merge pull request #1974 from patriot1burke/master
...
set frameork for template config
2016-01-05 10:03:48 -05:00
Bill Burke
c3f2ae1cd1
Merge pull request #1973 from thomasdarimont/issue/KEYCLOAK-2253
...
KEYCLOAK-2253 - Add support for ConfiguredProvider based UserFederationProviderFactory.
2016-01-05 10:03:40 -05:00
mposolda
133e4c59e5
KEYCLOAK-2258 Removing leftovers of file model from docs and testsuite
2016-01-05 15:25:22 +01:00
Marek Posolda
d3247bc66a
Merge pull request #1976 from mposolda/master
...
KEYCLOAK-2178 KEYCLOAK-1744 Added MSADUserAccountControlMapper. Remov…
2016-01-05 13:16:32 +01:00
mposolda
b6718b44a1
KEYCLOAK-2178 KEYCLOAK-1744 Added MSADUserAccountControlMapper. Removing enableUserAccountControlAfterPasswordUpdate option
2016-01-05 12:11:48 +01:00
Thomas Darimont
15506e3db3
KEYCLOAK-2256 - Guarantee deterministic ordering for custom user attributes in admin console.
...
We now iterate over custom-user attributes in a deterministic way such that new attributes don't lead
to a complete reordering of the properties in the custom user attributes listings.
Previously the order of custom attributes in the user attributes listings was not deterministic which lead
to cases where keys that shared a common prefix where not placed at arbitrary positions.
Introduced a custom angularjs flter "toOrderedMapSortedByKey" that helps to deterministically iterate
over object properites.
2016-01-05 00:04:40 +01:00
Bill Burke
977f4051b3
Merge remote-tracking branch 'upstream/master'
2016-01-04 17:23:15 -05:00
Bill Burke
49c15f200e
Merge pull request #1972 from dbarentine/master
...
KEYCLOAK-2255 Location header should return IdP alias instead of prov…
2016-01-04 17:18:42 -05:00
Bill Burke
3e5874b2a1
Merge pull request #1971 from abstractj/tooltip-initial-access-token
...
Tooltips for initial access token fields
2016-01-04 17:15:45 -05:00
Bill Burke
f7ac5fae2a
Merge pull request #1945 from raehalme/KEYCLOAK-1579
...
KEYCLOAK-1579: Replaced AdapterDeploymentContextBean with AdapterDeploymentContextFactoryBean
2016-01-04 17:15:25 -05:00
Bill Burke
22ba4847f4
Merge pull request #1965 from jean-merelis/translate
...
translation of messages to pt_BR
2016-01-04 17:14:55 -05:00
Bill Burke
90822e5b34
Merge pull request #1970 from abstractj/minor-update
...
Minor change for client registration documentation
2016-01-04 17:14:43 -05:00
Bill Burke
3f62cee836
Merge remote-tracking branch 'upstream/master'
2016-01-04 17:14:19 -05:00