Commit graph

2943 commits

Author SHA1 Message Date
Bill Burke
07b038e126 add mapper category and help text 2015-02-27 18:21:42 -05:00
Bill Burke
ccb3a618b1 Merge pull request #1005 from patriot1burke/master
initial protocol mapper ui
2015-02-27 18:03:22 -05:00
Bill Burke
8533d49dfb Merge remote-tracking branch 'upstream/master' 2015-02-27 17:28:09 -05:00
Bill Burke
1c6e90c4ef protocol mapper ui 2015-02-27 17:21:02 -05:00
girirajsharma
7ea5d411d7 [KEYCLOAK-1058] - Can't choose again the same realm. 2015-02-27 19:32:03 +05:30
Marek Posolda
ea98d26683 Merge pull request #1003 from mposolda/master
Kerberos documentation
2015-02-27 13:50:10 +01:00
mposolda
aaf3c18a1b Kerberos documentation 2015-02-27 13:48:40 +01:00
Pedro Igor
663560a185 Merge pull request #1002 from pedroigor/master
[KEYCLOAK-883] - Configuration option to disable token retrieval from applications.
2015-02-27 02:13:49 -03:00
pedroigor
b45d6b896a [KEYCLOAK-883] - Configuration option to disable token retrieval from applications. 2015-02-27 02:13:27 -03:00
Pedro Igor
cd39d5292a Merge pull request #1001 from pedroigor/master
[KEYCLOAK-883] - Reverting change that redirects to error page when fede...
2015-02-26 15:27:56 -03:00
pedroigor
17653e7e74 [KEYCLOAK-883] - Reverting change that redirects to error page when federating identities.. 2015-02-26 15:27:32 -03:00
Pedro Igor
69da51cc56 Merge pull request #1000 from pedroigor/master
[KEYCLOAK-883] - Examples config and logging changes.
2015-02-26 12:34:47 -03:00
pedroigor
8f263a43e3 [KEYCLOAK-883] - Examples config and logging changes. 2015-02-26 12:34:33 -03:00
Vlastimil Eliáš
86b5f1b66c Updated target java to 1.7
Updated target java to 1.7 as Keycloak source codes are not compilable under java 1.6 due some core java classes (unknown constructor in AssertionError, bad visibility of method in InetAddress). 
This change eases import of Keycloak project into Eclipse also as Eclipse uses this maven property to set Java version for project. Without this change there are compilation errors in Eclipse after project import.
2015-02-26 10:26:07 +01:00
Pedro Igor
bccffadc7c Merge pull request #998 from pedroigor/master
[KEYCLOAK-883] - Minor changes to the configuration of identity providers for clients.
2015-02-25 21:02:43 -03:00
pedroigor
6e38964838 [KEYCLOAK-883] - Minor changes to the configuration of identity providers for clients. 2015-02-25 21:00:49 -03:00
Marek Posolda
21992ddd31 Merge pull request #997 from mposolda/master
Kerberos fixes for jboss-modules refactoring. Fix environment specific t...
2015-02-25 23:35:50 +01:00
mposolda
0c893b6175 Kerberos fixes for jboss-modules refactoring. Fix environment specific test failures 2015-02-25 22:36:27 +01:00
Bill Burke
8d4d497063 Merge pull request #993 from patriot1burke/master
claim mappings next phase
2015-02-25 11:46:13 -05:00
Bill Burke
430daf4c39 Merge remote-tracking branch 'upstream/master' 2015-02-25 11:35:04 -05:00
Bill Burke
9f759ed77c rest interface for claim mapping 2015-02-25 11:34:51 -05:00
Stian Thorgersen
195a5dffdc Merge pull request #995 from stianst/master
KEYCLOAK-1017 Add server version to cached resources to prevent problems...
2015-02-25 16:15:11 +01:00
Pedro Igor
b8e712e10b Merge pull request #996 from pedroigor/master
[KEYCLOAK-1036] - Revert.
2015-02-25 11:22:15 -03:00
pedroigor
128cd98ce2 [KEYCLOAK-1036] - Revert. 2015-02-25 11:21:56 -03:00
Stian Thorgersen
5a10bbc8ca KEYCLOAK-1017 Add server version to cached resources to prevent problems with browser cache 2015-02-25 15:03:01 +01:00
Stian Thorgersen
12dc159326 Merge pull request #994 from stianst/modules
KEYCLOAK-934 Extract dependencies into modules
2015-02-25 12:55:36 +01:00
Stian Thorgersen
b6a512b494 KEYCLOAK-934 Extract dependencies into modules 2015-02-25 12:05:48 +01:00
Bill Burke
1704a6c643 Merge remote-tracking branch 'upstream/master' 2015-02-24 19:37:22 -05:00
Bill Burke
c20ad93807 claim mappings next phase 2015-02-24 19:37:07 -05:00
Stian Thorgersen
e0da63c985 Merge pull request #992 from girirajsharma/master
[KEYCLOAK-1049]-Inconsistent name for Type information in Event viewer.
2015-02-24 15:34:34 +01:00
girirajsharma
427d840441 [KEYCLOAK-1049]-Inconsistent name for Type information in Event viewer. 2015-02-24 19:43:01 +05:30
Stian Thorgersen
76d154b9ab Merge pull request #991 from girirajsharma/master
[KEYCLOAK-1030]-Unable to delete Password Policy.
2015-02-24 15:08:33 +01:00
girirajsharma
55190d7808 [KEYCLOAK-1030]-Unable to delete Password Policy. 2015-02-24 18:43:38 +05:30
Stian Thorgersen
0ad3c72c0a Merge pull request #982 from girirajsharma/master
[KEYCLOAK-1031]-Multiple accounts with the same email.
2015-02-24 13:35:15 +01:00
Bill Burke
40a865bf9f Merge pull request #990 from patriot1burke/master
ProviderFactory.postInit()
2015-02-23 13:02:05 -05:00
Bill Burke
6c5f35720a Merge remote-tracking branch 'upstream/master' 2015-02-23 12:12:08 -05:00
Bill Burke
100dbd5fd7 ProviderFactory.postInit() 2015-02-23 12:11:48 -05:00
Bill Burke
1a43309333 Merge pull request #989 from patriot1burke/master
provider events
2015-02-23 12:11:30 -05:00
girirajsharma
f83f76b143 [KEYCLOAK-1031]-Multiple accounts with the same email. 2015-02-23 22:29:00 +05:30
Bill Burke
d06b7a47ac Merge remote-tracking branch 'upstream/master' 2015-02-23 11:39:39 -05:00
Bill Burke
1dde3e1459 provider events 2015-02-23 11:39:24 -05:00
Marek Posolda
175b397eb2 Merge pull request #988 from mposolda/master
Kerberos automated tests, fixes
2015-02-23 17:30:37 +01:00
mposolda
4b6b48dc34 Increase MaxPermSize for tests 2015-02-23 17:05:10 +01:00
mposolda
9f8b59dfb6 Kerberos/LDAP fixes 2015-02-23 14:07:55 +01:00
mposolda
9dd5ecd464 Kerberos automated test 2015-02-23 13:13:34 +01:00
Bill Burke
58299d3373 Merge pull request #987 from patriot1burke/master
more claims work
2015-02-21 10:50:54 -05:00
Bill Burke
169e3a50be Merge remote-tracking branch 'upstream/master' 2015-02-21 10:30:05 -05:00
Bill Burke
e9f0b8999e Merge remote-tracking branch 'upstream/master' 2015-02-21 10:28:27 -05:00
Bill Burke
1ee68bca5b Merge pull request #984 from patriot1burke/master
refactor for claims, fixed XSS bugs
2015-02-21 10:27:37 -05:00
Bill Burke
69582ee3be more claims work 2015-02-21 10:26:55 -05:00