2896 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Gerber	386447b790	set default locale to english	2015-02-25 18:35:46 +01:00
Michael Gerber	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
Michael Gerber	6118c510ac	i18n for emails	2015-02-25 17:53:46 +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
Michael Gerber	ba083baf85	Merge remote-tracking branch 'upstream/master' into i18n	2015-02-25 16:40:09 +01: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
Michael Gerber	b6280e90bf	add i18n for emails	2015-02-24 19:31:06 +01:00
Michael Gerber	1575bea45d	added dropdown to change locale for user.	2015-02-24 19:03:18 +01:00
Michael Gerber	c3ea6b1465	remove debug info	2015-02-24 18:53:36 +01:00
Michael Gerber	871469ae9b	added dropdown to choose locale to the account page. ... fixed the path of the cookie.	2015-02-24 18:46:09 +01:00
Michael Gerber	9e2eb60ce8	dropdown to choose language	2015-02-24 17:33:49 +01:00
Michael Gerber	33398b37a5	write cookie ... fix npe	2015-02-24 16:12:10 +01:00
Michael Gerber	1af62d59ce	Merge remote-tracking branch 'upstream/master' into i18n	2015-02-24 15:50:48 +01: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
Michael Gerber	57a805a7c1	improve locale helper	2015-02-23 22:19:22 +01:00
Michael Gerber	148158ba04	NPE fix	2015-02-23 21:52:56 +01:00
Michael Gerber	be921c8544	add HttpHeaders	2015-02-23 20:08:05 +01:00
Bill Burke	40a865bf9f	Merge pull request #990 from patriot1burke/master ... ProviderFactory.postInit()	2015-02-23 13:02:05 -05:00
Michael Gerber	0b1a2dd27d	Merge branch 'master' into i18n	2015-02-23 18:43:14 +01:00
Michael Gerber	2d54e6fb3b	fallback if no message can be found	2015-02-23 18:41:53 +01: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
Michael Gerber	74a0658346	rename localizatin to internationalization	2015-02-23 17:18:01 +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
Michael Gerber	764960a4ca	added locale support to ClassLoaderTheme and FolderTheme	2015-02-23 11:29:45 +01:00
Michael Gerber	c157cc3c1c	admin gui for localization support	2015-02-21 19:17:04 +01:00
Michael Gerber	120c39c683	Merge remote-tracking branch 'upstream/master' into i18n	2015-02-21 17:46:19 +01:00
Michael Gerber	b00764b49f	add localization support to realm	2015-02-21 17:36:47 +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