Bill Burke
|
7594be8014
|
merge
|
2014-04-28 18:05:03 -04:00 |
|
Bill Burke
|
62f8811a46
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
bundled-war-example/src/main/java/org/keycloak/server/KeycloakServerApplication.java
bundled-war-example/src/main/webapp/WEB-INF/web.xml
|
2014-04-28 18:04:50 -04:00 |
|
Bill Burke
|
2d1dc4a874
|
application refactor
|
2014-04-28 17:34:06 -04:00 |
|
Stian Thorgersen
|
0546aebc84
|
More fixes to bundled war example
|
2014-04-28 14:32:25 +01:00 |
|
Stian Thorgersen
|
c06009d5fb
|
KEYCLOAK-430 Fix bundled war example
|
2014-04-28 13:36:34 +01:00 |
|
Stian Thorgersen
|
3d02fd5d0e
|
KEYCLOAK-429 Remove role from composite roles when deleted
|
2014-04-28 12:55:04 +01:00 |
|
Bill Burke
|
562f6703b6
|
Merge remote-tracking branch 'upstream/master'
|
2014-04-25 13:15:00 -04:00 |
|
Stian Thorgersen
|
573c88564b
|
Temporarily disabled unique constraint on Realm names as it breakes tests
|
2014-04-25 17:58:49 +01:00 |
|
Stian Thorgersen
|
dabf101d96
|
Merge pull request #347 from stianst/master
Ensure Realm names are unique
|
2014-04-25 17:02:29 +01:00 |
|
Stian Thorgersen
|
292089cee8
|
Ensure Realm names are unique
|
2014-04-25 17:02:03 +01:00 |
|
Bill Burke
|
5594c73ceb
|
Merge remote-tracking branch 'upstream/master'
|
2014-04-25 10:34:35 -04:00 |
|
Stian Thorgersen
|
ce6652efb1
|
Merge pull request #346 from stianst/master
KEYCLOAK-347 Link realm and realm-permissions application
|
2014-04-25 15:32:47 +01:00 |
|
Stian Thorgersen
|
f64f55a4c6
|
KEYCLOAK-347 Link realm and realm-permissions application
|
2014-04-25 15:32:28 +01:00 |
|
Bill Burke
|
9a3a8c39f4
|
merge
|
2014-04-25 10:03:56 -04:00 |
|
Bill Burke
|
1de4c31750
|
wtf
|
2014-04-25 10:02:49 -04:00 |
|
Bill Burke
|
bda85f700a
|
Merge pull request #343 from matzew/master
Adding simple CDI injection into resources
|
2014-04-25 09:58:59 -04:00 |
|
Stian Thorgersen
|
3471ce6c63
|
Merge pull request #345 from stianst/master
KEYCLOAK-385 Add CORS support to refresh token
|
2014-04-25 14:09:56 +01:00 |
|
Stian Thorgersen
|
b8dfac391a
|
KEYCLOAK-385 Add CORS support to refresh token
|
2014-04-25 14:09:39 +01:00 |
|
Stian Thorgersen
|
28546ad031
|
Merge pull request #344 from stianst/master
Theme support for admin
|
2014-04-25 13:59:41 +01:00 |
|
Stian Thorgersen
|
d6e5e376bf
|
Theme support for admin
|
2014-04-25 13:58:58 +01:00 |
|
Matthias Wessendorf
|
9b055c6ad6
|
Adding simple CDI injection into resources
|
2014-04-25 13:24:21 +02:00 |
|
Stian Thorgersen
|
a3c17d1071
|
Merge pull request #342 from stianst/master
Added support for common resources to themes
|
2014-04-24 09:27:02 +01:00 |
|
Stian Thorgersen
|
d57cd1aa91
|
Added support for common resources to themes
|
2014-04-24 09:26:19 +01:00 |
|
Bill Burke
|
3405330d92
|
Merge pull request #341 from patriot1burke/master
brute force fixes
|
2014-04-23 17:56:34 -04:00 |
|
Bill Burke
|
541e865fe8
|
brute force fixes
|
2014-04-23 17:55:13 -04:00 |
|
Davide Ungari
|
c03b97d2d4
|
#cfg update version
|
2014-04-20 12:06:31 +02:00 |
|
Davide Ungari
|
5d275de8b2
|
#dev integrated adapter tomcat7
|
2014-04-18 08:32:42 +02:00 |
|
Bill Burke
|
80f3a3152c
|
Merge pull request #340 from patriot1burke/master
brute force settings
|
2014-04-15 11:37:49 -04:00 |
|
Bill Burke
|
54abfb670c
|
brute force settings
|
2014-04-15 11:37:27 -04:00 |
|
Bill Burke
|
b41bf9f231
|
Merge pull request #339 from patriot1burke/master
more brute force detection
|
2014-04-14 18:59:09 -04:00 |
|
Bill Burke
|
2b8d2288fb
|
more brute force detection
|
2014-04-14 18:58:45 -04:00 |
|
Bill Burke
|
b556ff8a83
|
Merge pull request #338 from patriot1burke/master
move things around
|
2014-04-14 16:53:51 -04:00 |
|
Bill Burke
|
4c8471ef43
|
move things around
|
2014-04-14 16:51:53 -04:00 |
|
Bill Burke
|
1aa58ec580
|
Merge pull request #337 from patriot1burke/master
app/keycloak self bootstrapping bundle
|
2014-04-11 13:26:22 -04:00 |
|
Bill Burke
|
272806a3f3
|
app/keycloak self bootstrapping bundle
|
2014-04-11 13:24:07 -04:00 |
|
Bill Burke
|
51a718f337
|
Merge pull request #336 from patriot1burke/master
workarounds for resteasy 2.3.7 bugs
|
2014-04-10 22:34:19 -04:00 |
|
Bill Burke
|
cc982cf246
|
workarounds for resteasy 2.3.7 bugs
|
2014-04-11 10:33:53 -04:00 |
|
Bill Burke
|
0896808625
|
Merge pull request #334 from mposolda/master
Reenable AuthProvidersIntegrationTest.registerUserLdapSuccess. Add varia...
|
2014-04-10 12:16:08 -04:00 |
|
Bill Burke
|
c562e88e75
|
Merge pull request #335 from patriot1burke/master
fix server jboss-deployment-structure
|
2014-04-10 12:15:57 -04:00 |
|
Bill Burke
|
abd7163205
|
fix server jboss-deployment-structure
|
2014-04-11 00:15:35 -04:00 |
|
mposolda
|
1701afb6d4
|
Fix standalone KeycloakServer
|
2014-04-10 14:59:54 +02:00 |
|
mposolda
|
d8937b11cf
|
Reenable AuthProvidersIntegrationTest.registerUserLdapSuccess. Add variable sleep after undertow stop in testsuite (some windows envs have issues when server is not fully stopped)
|
2014-04-10 10:29:13 +02:00 |
|
Bill Burke
|
de871585e0
|
Merge pull request #333 from patriot1burke/master
remove transitive dependencies
|
2014-04-09 23:30:16 -04:00 |
|
Bill Burke
|
b41c45d40a
|
remove transitive dependencies
|
2014-04-10 11:29:47 -04:00 |
|
Bill Burke
|
ecaa0d1401
|
use resteasy 2.3.7
|
2014-04-10 05:21:07 -04:00 |
|
Bill Burke
|
cdc35d99bc
|
cleanup
|
2014-04-09 22:34:36 -04:00 |
|
Bill Burke
|
f5f96c5021
|
Merge pull request #332 from patriot1burke/master
use resteasy 2.3.7
|
2014-04-09 17:21:37 -04:00 |
|
Bill Burke
|
29a139f56b
|
Merge pull request #331 from patriot1burke/master
cleanup
|
2014-04-09 14:00:19 -04:00 |
|
Stian Thorgersen
|
daf1f2ed45
|
Merge pull request #330 from mposolda/master
Fix LDAP test on windows. Ensure that directory with data for embedded A...
|
2014-04-09 18:44:57 +01:00 |
|
mposolda
|
eb37890924
|
Fix LDAP test on windows. Ensure that directory with data for embedded ApacheDS is deleted
|
2014-04-09 18:56:36 +02:00 |
|