Commit graph

172 commits

Author SHA1 Message Date
Stian Thorgersen
db20077c37 Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421
Conflicts:
	testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
2015-07-02 14:15:54 +02:00
mposolda
09994d1730 KEYCLOAK-1487 Support for multiple values of one UserModel attribute. LDAP multivalued attribute support 2015-06-29 14:56:40 +02:00
Vlastimil Elias
f5a80c3007 KEYCLOAK-1421 patched source formatting 2015-06-22 10:37:27 +02:00
Vlastimil Elias
7cff37e707 KEYCLOAK-1421 Added timestamp of keycloak user creation into user models
and persistence
2015-06-22 10:37:26 +02:00
Vlastimil Elias
4e8c6b3fc4 KEYCLOAK-1421 patched source formatting 2015-06-22 10:33:57 +02:00
Vlastimil Elias
d7379f29da KEYCLOAK-1421 Added timestamp of keycloak user creation into user models
and persistence
2015-06-22 10:32:37 +02:00
Bill Burke
adff0d5da0 make authenticator config optional 2015-06-19 21:16:45 -04:00
Bill Burke
2c327d9eee Merge pull request #1389 from patriot1burke/master
access code checks
2015-06-17 15:59:23 -04:00
Stian Thorgersen
caeb710444 KEYCLOAK-1476 2015-06-17 19:34:41 +02:00
Marko Strukelj
0b0b101184 KEYCLOAK-1476 NotSerializableException: org.keycloak.models.cache.entities.CachedClientRole
Conflicts:
	model/api/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java
2015-06-17 19:34:38 +02:00
Bill Burke
1aa338fe3e Merge remote-tracking branch 'upstream/master' 2015-06-17 09:43:14 -04:00
Stian Thorgersen
fbc2b845ad KEYCLOAK-1476 NotSerializableException: org.keycloak.models.cache.entities.CachedClientRole 2015-06-17 14:05:55 +02:00
Bill Burke
dddc5181e7 required actions storage/display 2015-06-16 22:48:39 -04:00
Bill Burke
3b78fa2d5d required actions model 2015-06-16 18:17:38 -04:00
Bill Burke
38a2ea2fdf fix merge conflict mistakes 2015-06-15 09:28:11 -04:00
Bill Burke
43bad9a608 merge 2015-06-15 09:02:15 -04:00
Stian Thorgersen
28a50df746 KEYCLOAK-1411
DefaultCacheUserProvider addUser returns UserModel instance which is not cached/managed by the cache
2015-06-12 15:33:22 +02:00
Stian Thorgersen
38c1945ce4 Bump version 2015-06-12 14:35:34 +02:00
Bill Burke
fa99b5415d flow alias lookup 2015-06-11 18:02:49 -04:00
Bill Burke
c52d16da6d default required actions in model 2015-06-11 15:18:09 -04:00
Marko Strukelj
9a37696d29 Fixed pom issues that were generating tons of Maven warnings 2015-06-11 16:57:33 +02:00
Bill Burke
95349e6e2e clientsession.action to String 2015-06-10 09:21:23 -04:00
Bill Burke
dc0d9a8dce merge 2015-06-05 14:44:37 -04:00
Stian Thorgersen
f50570e350 KEYCLOAK-1325
Public/private SPI
2015-06-04 15:59:47 +02:00
Bill Burke
c12fe28b2d phased auth spi introduction 2015-06-03 10:55:03 -04:00
Stian Thorgersen
1dd0b563b6 KEYCLOAK-1386 Direct Grant API always on 2015-06-03 16:24:15 +02:00
Niko Köbler
492e6cd856 KEYCLOAK-1305 Add possibility to change username 2015-06-02 14:08:19 +02:00
Bill Burke
f5e301fe0d merge 2015-05-22 16:15:55 -04:00
Bill Burke
68976f5b0c auth spi datamodel 2015-05-22 16:03:26 -04:00
mposolda
7476ee51e4 KEYCLOAK-886 Model and representations for UserFederationMappers 2015-05-22 21:09:50 +02:00
mposolda
a9f1fda68a KEYCLOAK-630 Added Role Federation mapper. Fixes and refactoring 2015-05-22 21:08:33 +02:00
mposolda
975337f225 KEYCLOAK-1300 Added FullNameLDAPFederationMapper 2015-05-22 21:08:21 +02:00
mposolda
1490f106f2 KEYCLOAK-599 Added UserFederationMappers. Added UserAttributeLDAPFederationMapper 2015-05-22 21:07:32 +02:00
Stian Thorgersen
4e0a32a37a Version bump 2015-05-22 09:04:30 +02:00
Bill Burke
3851a2fe72 merge 2015-05-18 16:41:51 -04:00
Bill Burke
338300df32 1st phase auth/required action spi 2015-05-18 16:32:38 -04:00
girirajsharma
ccd5deb85f [KEYCLOAK 392] Audit admin events 2015-05-13 16:47:30 +05:30
Stian Thorgersen
698660c92a Added isPrivate to Spi 2015-05-12 08:25:24 +02:00
Stian Thorgersen
d00e0021b6 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master
Conflicts:
	connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
	services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java
2015-05-11 13:36:30 +02:00
mposolda
91eb80beb0 Minor improvements 2015-05-07 20:07:30 +02:00
Stian Thorgersen
035529d7a2 Version bump 2015-05-05 11:45:21 +02:00
girirajsharma
70f53c6c06 [KEYCLOAK-392] - Admin audit events 2015-05-03 01:46:52 +05:30
mposolda
553f8a6f27 KEYCLOAK-1240 Fix stale cache issue 2015-04-28 20:20:50 +02:00
Bill Burke
4166393396 model migration 2015-04-27 16:12:43 -04:00
mposolda
c942a8ac4f KEYCLOAK-1070 ClientModel.setName/getName 2015-04-23 18:21:21 +02:00
Bill Burke
a7d245b1fb finish 2015-04-23 11:40:29 -04:00
Bill Burke
1f4df58e6c broker token exchange refactor 2015-04-23 11:26:44 -04:00
Stian Thorgersen
870f29d797 Merge pull request #1172 from stianst/master
Dist work
2015-04-23 12:40:38 +02:00
Stian Thorgersen
e17105cc8e Updated distribution and cleaning of maven modules 2015-04-23 11:15:05 +02:00
mposolda
34e033e351 KEYCLOAK-1070 JSON representation and export/import for userConsent 2015-04-22 11:29:43 +02:00