Bill Burke
4430d8efac
Merge remote-tracking branch 'upstream/master'
2015-03-03 12:02:54 -05:00
Bill Burke
608185f06a
boolean mapper property types
2015-03-03 12:00:40 -05:00
Stian Thorgersen
d74214cf56
Merge pull request #1014 from girirajsharma/master
...
[KEYCLOAK-1024] - Make sure docs point out password hashing iterations should be increased.
2015-03-03 13:03:11 +01:00
girirajsharma
634ae972c6
[KEYCLOAK-1024] - Make sure docs point out password hashing iterations
...
should be increased.
2015-03-03 14:30:52 +05:30
Bill Burke
0559c1df06
Merge remote-tracking branch 'upstream/master'
2015-03-02 21:40:01 -05:00
Bill Burke
753feae49e
fixes
2015-03-02 21:39:43 -05:00
Marek Posolda
eb43d0b779
Merge pull request #1013 from mposolda/krb-deleg-cred
...
Kerberos/SPNEGO login in SAML applications
2015-03-02 20:48:05 +01:00
mposolda
633696ab7d
Kerberos/SPNEGO login in SAML applications
2015-03-02 20:28:04 +01:00
Marek Posolda
5c30093554
Merge pull request #1012 from girirajsharma/master
...
[KEYCLOAK-1026] - Application Settings tooltip copy/paste error.
2015-03-02 19:56:45 +01:00
girirajsharma
7dffe82118
[KEYCLOAK-1026] - Application Settings tooltip copy/paste error.
2015-03-02 23:56:09 +05:30
Bill Burke
5e12ee3e7a
resolve conflicts
2015-03-02 09:00:10 -05:00
Bill Burke
6f88d50d4d
fix mongo
2015-03-02 08:55:11 -05:00
Marek Posolda
d1fbe1fd30
Merge pull request #1010 from mposolda/krb-deleg-cred
...
Configurable KDC encryption types, Mongo fix
2015-03-02 13:27:38 +01:00
mposolda
4741a9a91e
Configurable kdc encryption types for Kerberos test
2015-03-02 12:56:13 +01:00
mposolda
58a7e549b2
Fix mongo to pass with testsuite
2015-03-02 12:07:31 +01:00
Bill Burke
80553e0dd8
Merge pull request #1009 from patriot1burke/master
...
mapper refactoring, default saml mappers
2015-03-01 00:20:59 -05:00
Bill Burke
4361ce1d42
mapper refactoring
2015-02-28 19:48:50 -05:00
Bill Burke
1684f00922
Merge pull request #1008 from patriot1burke/master
...
saml attribute mappers
2015-02-28 11:33:16 -05:00
Bill Burke
f54da90d71
Merge remote-tracking branch 'upstream/master'
2015-02-28 11:17:19 -05:00
Bill Burke
2da925505e
saml attribute mappers
2015-02-28 11:17:06 -05:00
Bill Burke
42b3bc1eea
Merge pull request #1004 from girirajsharma/master
...
[KEYCLOAK-1058] - Can't choose again the same realm.
2015-02-27 21:22:43 -05:00
Bill Burke
2066a7ac89
Merge pull request #999 from velias/patch-1
...
Updated target java to 1.7 in parent pom.xml
2015-02-27 21:22:03 -05:00
Bill Burke
5a7ea3ba5d
Merge pull request #1007 from patriot1burke/master
...
add saml mapper interfaces
2015-02-27 21:21:41 -05:00
Bill Burke
9dd9c9b37f
add saml mapper interfaces
2015-02-27 20:16:34 -05:00
Bill Burke
724789e114
Merge pull request #1006 from patriot1burke/master
...
add mapper category and help text
2015-02-27 18:38:58 -05:00
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
