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
2ad7e870d8
Merge pull request #1374 from stianst/master
...
Fix testsuite/docker-cluster deps
2015-06-15 06:41:11 +01:00
Stian Thorgersen
87636669ae
Fix testsuite/docker-cluster deps
2015-06-15 07:40:19 +02:00
Stian Thorgersen
8d627f1329
Merge pull request #1369 from stianst/master
...
KEYCLOAK-1411
2015-06-15 06:32:49 +01:00
Bill Burke
c51cc4703b
kerberos fixes
2015-06-14 20:58:02 -04:00
mposolda
a1124c9e1f
KEYCLOAK-1260 Upgrade h2 version to fix locking issues in SAMLKeyCloakServerBrokerWithSignatureTest
2015-06-12 19:58:27 +02:00
mposolda
20e245cb05
KEYCLOAK-1298 Fix constraint names to be uppercased
2015-06-12 19:17:12 +02:00
mposolda
5c8e165080
Enable liquibase trace logging with JPA profile
2015-06-12 17:20:57 +02:00
mposolda
afe088a9e8
Fix Oracle together with Sybase
2015-06-12 17:20:38 +02:00
Stian Thorgersen
162f31baa2
Update server and adapter install docs
2015-06-12 16:14:03 +02: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
5a0d600322
Merge pull request #1367 from stianst/master
...
Bump version
2015-06-12 13:36:42 +01:00
Stian Thorgersen
38c1945ce4
Bump version
2015-06-12 14:35:34 +02:00
Stian Thorgersen
939527bd98
Bump version
2015-06-12 14:32:06 +02:00
Stian Thorgersen
cc2de52a1a
Revert to old RestEasy until we can drop support for EAP 6.4
2015-06-12 14:20:08 +02:00
Stian Thorgersen
4ccc37abbb
Add EAP6 standalone.xml to source instead of dl eap6 from techpreview repo
2015-06-12 14:20:08 +02:00
Stian Thorgersen
47d1681e90
Merge pull request #1365 from stianst/master
...
Error page is displayed if user rejects sign in with social provider
2015-06-12 13:03:08 +01:00
Stian Thorgersen
c89a412661
KEYCLOAK-1321
...
Error page is displayed if user rejects sign in with social provider
2015-06-12 13:32:30 +02:00
Stian Thorgersen
5bd53804f9
Fix admin-api to show that users are retrieved by ip, not username
2015-06-12 13:32:30 +02:00
Stian Thorgersen
0d957311b4
Merge pull request #1364 from mstruk/wf9cr2
...
KEYCLOAK-1441 Upgrade to WildFly 9 CR2
2015-06-12 11:30:42 +01:00
Marko Strukelj
c2495acca9
KEYCLOAK-1441 Upgrade to WildFly 9 CR2
2015-06-12 11:49:36 +02:00
Marek Posolda
c297b29a13
Merge pull request #1363 from mposolda/master
...
KEYCLOAK-1403 Update liquibase to newest version. Fix Sybase
2015-06-12 11:26:09 +02:00
mposolda
112ebf77d5
KEYCLOAK-1403 Update liquibase to newest version. Fix Sybase
2015-06-12 11:11:28 +02:00
Stian Thorgersen
5993d40fab
Merge pull request #1353 from Smartling/KEYCLOAK-1438
...
Fix Spring Security adapter logout handling
2015-06-12 07:50:00 +01:00
Stian Thorgersen
2d82d15e5b
Merge pull request #1361 from ssilvert/KEYCLOAK-1083-unlock-user-account
...
KEYCLOAK-1083: Provide a way for admin to unlock user account
2015-06-12 07:44:07 +01:00
Stian Thorgersen
656b157103
Merge pull request #1360 from mstruk/fix-poms
...
Fixed pom issues that were generating tons of Maven warnings
2015-06-12 07:43:38 +01:00
Bill Burke
392fa21f1e
finish reg
2015-06-11 21:15:53 -04:00
Bill Burke
fa99b5415d
flow alias lookup
2015-06-11 18:02:49 -04:00
Marek Posolda
514417ac2d
Merge pull request #1362 from mposolda/master
...
KEYCLOAK-1405 Fix MSSQL Server
2015-06-11 22:37:16 +02:00
mposolda
938cfe2555
KEYCLOAK-1405 Fix MSSQL Server
2015-06-11 22:23:45 +02:00
Stan Silvert
d6e64a2c5e
KEYCLOAK-1083: Provide a way for admin to unlock user account
2015-06-11 15:32:03 -04:00
Bill Burke
c52d16da6d
default required actions in model
2015-06-11 15:18:09 -04:00
Bill Burke
3f62cd9271
terms and conditions
2015-06-11 14:39:08 -04:00
Marek Posolda
df7cb4a9d0
Merge pull request #1359 from mposolda/master
...
Database fixes
2015-06-11 17:14:19 +02:00
Marko Strukelj
9a37696d29
Fixed pom issues that were generating tons of Maven warnings
2015-06-11 16:57:33 +02:00
mposolda
20fe7ec7b8
Database fixes
2015-06-11 16:56:38 +02:00
Stian Thorgersen
37cef49565
Merge pull request #1357 from mstruk/eap6
...
KEYCLOAK-1412 Server-overlay for EAP 6.4
2015-06-11 15:00:20 +01:00
Stian Thorgersen
b5ee395aac
Merge pull request #1358 from tkyjovsk/master
...
fixed some UI tests broken by KEYCLOAK-1431
2015-06-11 13:56:23 +01:00
fkiss
7b89b80f71
added ignore on role mappings test
2015-06-11 14:37:12 +02:00
Tomas Kyjovsky
08f2b0dea9
fixed UI tests broken by KEYCLOAK-1431
2015-06-11 14:15:05 +02:00
Marko Strukelj
92e17f4b40
KEYCLOAK-1412 Server-overlay for EAP 6.4
...
- Added as7-server-subsystem
- Added eap6-server-overlay
- Moved modules to eap6-server-modules
- Renamed wildfly-server-subsystem to wf9-server-subsystem for consistency
2015-06-11 09:40:47 +02:00
Stian Thorgersen
b8aedd5a3a
Merge pull request #1356 from matzew/ImportFix
...
Applying suggested import change from mstruk 💄
2015-06-11 08:06:27 +01:00
Matthias Wessendorf
d3e178d459
Applying suggested import change from mstruk 💄
2015-06-11 08:52:53 +02:00
Stian Thorgersen
996d8e8cd3
Merge pull request #1355 from stianst/master
...
KEYCLOAK-1439 Admin Console is not loaded when Keycloak is installed …
2015-06-11 07:38:29 +01:00
Stian Thorgersen
0e1a059d8d
KEYCLOAK-1439 Admin Console is not loaded when Keycloak is installed as root context
2015-06-11 08:15:42 +02:00
Tomas Kyjovsky
30359b51fa
Merge upstream-master into tkyjovsk-master
2015-06-10 23:27:36 +02:00
Marek Posolda
d8880e5ff3
Merge pull request #1354 from mposolda/master
...
KEYCLOAK-1260 Fix saml backchannel logout with JPA UserSession provid…
2015-06-10 21:37:05 +02:00
Stian Thorgersen
6819b8e3a5
Merge pull request #1352 from girirajsharma/master
...
[KEYCLOAK-1431] Update page titles
2015-06-10 18:28:25 +01:00
mposolda
03b521926a
KEYCLOAK-1260 Fix saml backchannel logout with JPA UserSession provider on MySQL + PostgreSQL
2015-06-10 18:59:07 +02:00
