Commit graph

23768 commits

Author SHA1 Message Date
Bill Burke
4b6ebc339f readme conflict 2014-01-13 11:30:16 -05:00
Bill Burke
5df362a523 Merge remote-tracking branch 'upstream/master'
Conflicts:
	examples/wildfly-demo/README.md
2014-01-13 11:30:01 -05:00
stianst
b684357022 Merge pull request #152 from stianst/master
Keycloak welcome-page. Added logo to login and registration forms. Some minor updates to WildFly example README.md
2014-01-13 07:18:17 -08:00
Stian Thorgersen
354abf8a4a Added Keycloak logo to login and registration forms 2014-01-13 15:11:06 +00:00
Stian Thorgersen
f2c0eed8f2 Minor tweaks to login. Display 'Keycloak Administration' instead of 'Keycloak' when login to admin console. Add link to powered by Keycloak 2014-01-13 15:06:03 +00:00
Stian Thorgersen
8ef194a205 Added Keycloak welcome page 2014-01-13 15:04:53 +00:00
Stian Thorgersen
6146dd48f7 Some minor changes to WildFly example README.md 2014-01-13 13:56:05 +00:00
Stian Thorgersen
739866de0c KEYCLOAK-255 Added tmp redirect to admin/index.html as work-around to WildFly issue 2014-01-13 11:27:02 +00:00
Stian Thorgersen
90f125b03a KEYCLOAK-236 Fix removing registration realm role 2014-01-13 11:10:11 +00:00
Stian Thorgersen
50082de51d KEYCLOAK-257 Fixed styling of import realm 2014-01-13 10:36:16 +00:00
Bill Burke
8b66234ab9 docs 2014-01-12 20:57:31 -05:00
stianst
86b9fb688c Merge pull request #150 from stianst/master
KEYCLOAK-258 Fix roles missing for apps in registration
2014-01-10 09:41:03 -08:00
Stian Thorgersen
4dd9170a99 KEYCLOAK-258 Fix roles missing for apps in registration 2014-01-10 17:40:20 +00:00
stianst
626839f0f3 Merge pull request #149 from stianst/master
Added oauth client installation to admin console. Rename JWT prn to sub.
2014-01-10 09:07:15 -08:00
Stian Thorgersen
6647ddb66e KEYCLOAK-252 Show error page (or 406) if realm requires https and http is used 2014-01-10 17:04:52 +00:00
Stian Thorgersen
0a57ba026b KEYCLOAK-180 Renamed JWT prn to sub 2014-01-10 10:22:58 +00:00
Stian Thorgersen
f14931d234 KEYCLOAK-251 Added installation page for oauth clients to admin console 2014-01-10 10:17:39 +00:00
stianst
fcac30d3a2 Merge pull request #148 from stianst/master
Update instructions to add Google. Updated Undertow to version in WildFly CR1
2014-01-09 09:12:05 -08:00
Stian Thorgersen
aaae0ff2f7 Updated Undertow to same version as in WildFly CR1 2014-01-09 17:06:58 +00:00
Stian Thorgersen
f63872b8b0 KEYCLOAK-228 Updated instructions to add Google 2014-01-09 17:06:29 +00:00
Bill Burke
ddbb63f3d1 wildfly example readme 2014-01-07 15:01:17 -05:00
Bill Burke
7daa6f492e Merge pull request #147 from patriot1burke/master
distro
2014-01-07 11:39:11 -08:00
Bill Burke
60f30446ba Merge remote-tracking branch 'upstream/master' 2014-01-07 14:38:25 -05:00
Bill Burke
734bc5c902 distro 2014-01-07 14:37:50 -05:00
Bill Burke
d8ef13c133 Merge pull request #145 from patriot1burke/master
wildfly deployment structure.xml
2014-01-02 13:35:14 -08:00
Bill Burke
a1b7297f25 wildfly deployment structure.xml 2014-01-02 16:24:04 -05:00
Bill Burke
e393a347cc Merge pull request #144 from patriot1burke/master
undertow logout
2013-12-19 15:35:53 -08:00
Bill Burke
30cb9df307 undertow logout 2013-12-19 18:32:47 -05:00
Bill Burke
834baf0e27 refactor admin actions 2013-12-19 15:22:15 -05:00
Bill Burke
f78a306ba0 Merge pull request #143 from ammendonca/KEYCLOAK-127
KEYCLOAK-127: Add different message when using "View all users", since m...
2013-12-19 06:52:52 -08:00
ammendonca
69b25407b1 KEYCLOAK-127: Add different message when using "View all users", since modifying the query won't help. 2013-12-19 12:45:17 +00:00
Bill Burke
e17c7c2c1b Merge pull request #142 from patriot1burke/master
undertow/wildfly adapter
2013-12-18 15:11:32 -08:00
Bill Burke
40e8a26a3b threadlocal 2013-12-18 18:10:28 -05:00
Bill Burke
0ec80f6590 remove ThreadLocal SkeletonKeySession 2013-12-18 18:08:48 -05:00
Bill Burke
16f5bbc54e undertow/wildfly adapter fixes 2013-12-18 18:01:47 -05:00
Stian Thorgersen
212aec8ae3 KEYCLOAK-235 Fix test 2013-12-18 16:58:31 +00:00
Bill Burke
dd84679e3f Merge pull request #140 from cardosogabriel/master
Design for KEYCLOAK-238
2013-12-17 15:17:19 -08:00
Bill Burke
c755c7562c Merge pull request #141 from patriot1burke/master
installation text
2013-12-17 15:17:00 -08:00
Bill Burke
cbf46720c7 installation text 2013-12-17 18:16:17 -05:00
Gabriel Cardoso
bbd3ac22d1 Merge remote-tracking branch 'upstream/master' 2013-12-17 17:05:21 -02:00
Gabriel Cardoso
d1693c9c7e Design for KEYCLOAK-238 2013-12-17 17:05:07 -02:00
Bill Burke
36bdd43488 Merge pull request #139 from patriot1burke/master
fix dependency
2013-12-17 09:22:36 -08:00
Bill Burke
1f63e87cd6 fix dependency 2013-12-17 12:22:16 -05:00
Bill Burke
addefbb587 Merge pull request #138 from patriot1burke/master
refactor out resteasy from adapters
2013-12-17 09:08:00 -08:00
Bill Burke
1f8081629e Merge remote-tracking branch 'upstream/master' 2013-12-17 12:07:20 -05:00
Bill Burke
6380dc3d1b refactor out resteasy from adapters 2013-12-17 12:07:02 -05:00
Bill Burke
6fe9a03997 Merge pull request #137 from patriot1burke/master
factor out jwt/jose/jws
2013-12-16 08:21:16 -08:00
Bill Burke
ac64eba667 Merge remote-tracking branch 'upstream/master' 2013-12-16 11:20:04 -05:00
Bill Burke
d22b6f8df7 factor out jwt/jose/jws 2013-12-16 11:19:46 -05:00
Bill Burke
4e03ca51af Merge pull request #136 from patriot1burke/master
refactor core/adapter
2013-12-13 16:54:01 -08:00