8b60c9633d
i18n for error message in login
2015-02-28 19:36:44 +01:00
12926f7f33
Merge remote-tracking branch 'upstream/master' into i18n
2015-02-28 14:15:11 +01:00
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
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
5a7ea3ba5d
Merge pull request #1007 from patriot1burke/master
...
add saml mapper interfaces
2015-02-27 21:21:41 -05:00
9dd9c9b37f
add saml mapper interfaces
2015-02-27 20:16:34 -05:00
724789e114
Merge pull request #1006 from patriot1burke/master
...
add mapper category and help text
2015-02-27 18:38:58 -05:00
07b038e126
add mapper category and help text
2015-02-27 18:21:42 -05:00
ccb3a618b1
Merge pull request #1005 from patriot1burke/master
...
initial protocol mapper ui
2015-02-27 18:03:22 -05:00
8533d49dfb
Merge remote-tracking branch 'upstream/master'
2015-02-27 17:28:09 -05:00
1c6e90c4ef
protocol mapper ui
2015-02-27 17:21:02 -05:00
610f7084de
Merge branch 'i18n' of https://github.com/gerbermichi/keycloak into i18n
2015-02-27 17:45:09 +01:00
2cfe3e957a
Merge remote-tracking branch 'upstream/master' into i18n
2015-02-27 17:30:31 +01:00
7ea5d411d7
[KEYCLOAK-1058] - Can't choose again the same realm.
2015-02-27 19:32:03 +05:30
ea98d26683
Merge pull request #1003 from mposolda/master
...
Kerberos documentation
2015-02-27 13:50:10 +01:00
aaf3c18a1b
Kerberos documentation
2015-02-27 13:48:40 +01:00
e75d5efa90
i18n for error messages
2015-02-27 11:58:58 +01:00
64ea438546
added parameters to setSuccess, setWarning, setError
2015-02-27 11:08:44 +01:00
5cf70957ae
Merge branch 'i18n' of https://github.com/gerbermichi/keycloak into i18n
2015-02-27 10:27:02 +01:00
cca337aae7
Merge remote-tracking branch 'upstream/master' into i18n
...
Conflicts:
connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml
2015-02-27 10:25:40 +01:00
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
b45d6b896a
[KEYCLOAK-883] - Configuration option to disable token retrieval from applications.
2015-02-27 02:13:27 -03:00
2cce96d34a
change file encoding
2015-02-26 22:31:46 +01:00
2189a69498
Merge remote-tracking branch 'upstream/master' into i18n
2015-02-26 22:22:31 +01:00
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
17653e7e74
[KEYCLOAK-883] - Reverting change that redirects to error page when federating identities..
2015-02-26 15:27:32 -03:00
69da51cc56
Merge pull request #1000 from pedroigor/master
...
[KEYCLOAK-883] - Examples config and logging changes.
2015-02-26 12:34:47 -03:00
8f263a43e3
[KEYCLOAK-883] - Examples config and logging changes.
2015-02-26 12:34:33 -03:00
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
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
6e38964838
[KEYCLOAK-883] - Minor changes to the configuration of identity providers for clients.
2015-02-25 21:00:49 -03:00
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
0c893b6175
Kerberos fixes for jboss-modules refactoring. Fix environment specific test failures
2015-02-25 22:36:27 +01:00
8dcc595150
change locale type form String to Locale
2015-02-25 19:20:55 +01:00
386447b790
set default locale to english
2015-02-25 18:35:46 +01:00
efd912959b
Merge remote-tracking branch 'upstream/master' into i18n
...
Conflicts:
core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java
2015-02-25 18:07:50 +01:00
6118c510ac
i18n for emails
2015-02-25 17:53:46 +01:00
8d4d497063
Merge pull request #993 from patriot1burke/master
...
claim mappings next phase
2015-02-25 11:46:13 -05:00
430daf4c39
Merge remote-tracking branch 'upstream/master'
2015-02-25 11:35:04 -05:00
9f759ed77c
rest interface for claim mapping
2015-02-25 11:34:51 -05:00
ba083baf85
Merge remote-tracking branch 'upstream/master' into i18n
2015-02-25 16:40:09 +01:00
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
b8e712e10b
Merge pull request #996 from pedroigor/master
...
[KEYCLOAK-1036] - Revert.
2015-02-25 11:22:15 -03:00
128cd98ce2
[KEYCLOAK-1036] - Revert.
2015-02-25 11:21:56 -03:00
5a10bbc8ca
KEYCLOAK-1017 Add server version to cached resources to prevent problems with browser cache
2015-02-25 15:03:01 +01:00
12dc159326
Merge pull request #994 from stianst/modules
...
KEYCLOAK-934 Extract dependencies into modules
2015-02-25 12:55:36 +01:00
b6a512b494
KEYCLOAK-934 Extract dependencies into modules
2015-02-25 12:05:48 +01:00
1704a6c643
Merge remote-tracking branch 'upstream/master'
2015-02-24 19:37:22 -05:00
c20ad93807
claim mappings next phase
2015-02-24 19:37:07 -05:00
b6280e90bf
add i18n for emails
2015-02-24 19:31:06 +01:00
Michael Gerber