Tomas Kyjovsky
9dd7a947e9
Merge upstream-master into tkyjovsk-master
2015-06-10 10:40:32 +02:00
Stian Thorgersen
c51e6a916c
Merge pull request #1346 from mstruk/srv-overlay
...
Re-enabled server-overlay, and demo-dist for Wildfly 9
2015-06-10 07:30:49 +01:00
Marek Posolda
e9b9da6d20
Merge pull request #1349 from mposolda/master
...
KEYCLOAK-1416 federation provider/mapper model fixes
2015-06-09 23:39:49 +02:00
mposolda
557edbec6d
KEYCLOAK-1416 federation provider/mapper model fixes
2015-06-09 23:15:43 +02:00
Marek Posolda
93650c442a
Merge pull request #1348 from mposolda/master
...
KEYCLOAK-1088 Audit of user grants during login
2015-06-09 20:55:26 +02:00
mposolda
d3e9b29d78
KEYCLOAK-1088 Audit of user grants during login
2015-06-09 20:37:12 +02:00
Marek Posolda
7cf1b002d2
Merge pull request #1347 from mposolda/master
...
Fix AdminRecoveryTest + minor fixes in messages
2015-06-09 18:06:59 +02:00
mposolda
e96ba202e9
Fix AdminRecoveryTest to not break admin tests
2015-06-09 17:44:07 +02:00
mposolda
9a5ca4d367
Minor improve in error messages and tests
2015-06-09 17:43:20 +02:00
Marko Strukelj
e6928c6456
KEYCLOAK-1417 Re-enable demo-dist
2015-06-09 16:35:46 +02:00
Marko Strukelj
245edcb5b9
KEYCLOAK-1418 Re-enable server-overlay
...
- it's based on server-dist for Wildfly 9 in order to reuse server-feature-pack - no dependency on distribution/modules
2015-06-09 16:35:46 +02:00
Marek Posolda
e4cb97aa49
Merge pull request #1345 from mposolda/master
...
KEYCLOAK-1401 Fix oracle and sybase - step 1
2015-06-09 15:51:51 +02:00
mposolda
bc93066fe3
KEYCLOAK-1401 Fix oracle and sybase - step 1
2015-06-09 15:35:03 +02:00
Lukas Kubik
bf686bd791
Revert "Add new .gitattributes file"
...
This reverts commit 01e232158b
2015-06-09 15:19:36 +02:00
Lukas Kubik
01e232158b
Add new .gitattributes file
2015-06-09 15:16:34 +02:00
Vlastimil Elias
c6e0195a3c
KEYCLOAK-1373 - added attribute importer for other social providers,
...
documented
2015-06-09 13:49:58 +02:00
Stian Thorgersen
966d939c12
Merge pull request #1340 from mstruk/srv-subsystem
...
Cleanup, and simplify keycloak-server-subsystem
2015-06-09 07:05:07 +01:00
Stian Thorgersen
c61c05be51
Merge pull request #1335 from ssilvert/keycloak-config
...
KEYCLOAK-1404: Need recovery mechanism for master admin user
2015-06-09 07:02:47 +01:00
Stian Thorgersen
7b099e3d6b
Merge pull request #1341 from mstruk/KEYCLOAK-1370
...
KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist
2015-06-09 06:45:39 +01:00
Marek Posolda
6d257a0d4c
Merge pull request #1343 from mposolda/master
...
KEYCLOAK-1358 docs for LDAP mappers
2015-06-08 21:11:27 +02:00
mposolda
b80a4a0aa9
KEYCLOAK-1358 docs for LDAP mappers
2015-06-08 21:10:38 +02:00
Marek Posolda
aabb3428a8
Merge pull request #1342 from mposolda/master
...
JSON migration, LDAP logging reduced to trace/debug
2015-06-08 20:24:45 +02:00
mposolda
80ff7b92db
KEYCLOAK-886 Reduce some LDAP info logging to trace and debug
2015-06-08 19:23:32 +02:00
mposolda
7badd3d5e5
JSON migration
2015-06-08 19:23:32 +02:00
Stan Silvert
e977a363ef
Require user to specify a temporary admin password to do admin recovery.
2015-06-08 13:04:52 -04:00
Bill Burke
91283878ac
html encoding fix
2015-06-08 12:38:16 -04:00
Vlastimil Elias
74ace4006c
Added base abstract implementation of Attribute mapper for Social
...
providers, used for GitHub provider
2015-06-08 17:04:53 +02:00
Marko Strukelj
7be957f4f9
KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist
2015-06-08 15:59:51 +02:00
Marko Strukelj
3643e76a06
Cleanup, and simplify keycloak-server-subsystem
...
- KEYCLOAK-1346 Remove support for overlays in server subsystem
- KEYCLOAK-1347 Remove support for multiple auth-servers
- KEYCLOAK-1348 Simplify server subsystem definition
2015-06-08 15:33:34 +02:00
Marek Posolda
07bc756785
Merge pull request #1339 from mposolda/master
...
DB migration
2015-06-08 13:17:15 +02:00
mposolda
0af68d28f1
KEYCLOAK-1357 LDAP migration
2015-06-08 12:29:24 +02:00
mposolda
75e1f50faf
KEYCLOAK-1390 mongo migration for identity providers
2015-06-08 12:29:18 +02:00
Marek Posolda
b578122f19
Merge pull request #1337 from mposolda/ldap
...
KEYCLOAK-1067 Upgrade embedmongo plugin version. Speed-up mongo tests…
2015-06-05 18:53:36 +02:00
mposolda
e014dcce76
KEYCLOAK-1067 Upgrade embedmongo plugin version. Speed-up mongo testsuite
2015-06-05 18:51:27 +02:00
Marek Posolda
a1bdf2837e
Merge pull request #1336 from mposolda/ldap
...
Mongo fixes & few other fixes
2015-06-05 18:29:45 +02:00
mposolda
0092d9f74d
Mongo fixes & few other fixes
2015-06-05 17:52:56 +02:00
Stan Silvert
e48aafd588
Fix spelling error.
2015-06-05 07:46:39 -04:00
Marek Posolda
d958d85290
Merge pull request #1334 from mposolda/ldap
...
KEYCLOAK-1359 more Active Directory fixes
2015-06-05 11:59:08 +02:00
mposolda
5b40031251
KEYCLOAK-1359 more Active Directory fixes
2015-06-05 11:32:29 +02:00
Stian Thorgersen
399a4a0511
Merge pull request #1333 from stianst/master
...
KEYCLOAK-1407 Label for otp on login is 'Log in'
2015-06-05 08:52:48 +01:00
Stian Thorgersen
bebe51c885
KEYCLOAK-1407 Label for otp on login is 'Log in'
2015-06-05 09:37:34 +02:00
Stan Silvert
6812514683
KEYCLOAK-1404: Need recovery mechanism for master admin user
2015-06-04 15:29:44 -04:00
Marek Posolda
62de481329
Merge pull request #1332 from mposolda/ldap
...
KEYCLOAK-1359 LDAP & Active directory fixes and improvements
2015-06-04 20:47:10 +02:00
mposolda
c3eb6df220
KEYCLOAK-1359 LDAP & Active directory fixes and improvements
2015-06-04 20:15:44 +02:00
Stian Thorgersen
d875b9885d
Merge pull request #1331 from stianst/master
...
KEYCLOAK-1325 Public/private SPI
2015-06-04 15:26:46 +01:00
Stian Thorgersen
3510e17dd3
Merge pull request #1330 from vramik/master
...
KEYCLOAK-1398 - Change type of 'REPRESENTATION' from BLOB to TEXT in …
2015-06-04 15:02:12 +01:00
Stian Thorgersen
f50570e350
KEYCLOAK-1325
...
Public/private SPI
2015-06-04 15:59:47 +02:00
vramik
a52cdae1f7
KEYCLOAK-1398 - Change type of 'REPRESENTATION' from BLOB to TEXT in jpa-changelog-1.3.0.Beta1.xml
2015-06-04 15:43:55 +02:00
Marek Posolda
826c60ae36
Merge pull request #1324 from velias/KEYCLOAK-1371
...
KEYCLOAK-1371 - Perform "Update Profile on First Login" only if some of mandatory user profile fields is missing from identity provider
2015-06-04 15:19:59 +02:00
Stian Thorgersen
d2c9d1569c
Merge pull request #1329 from mstruk/modules-cleanup
...
Clean up distribution/modules and adapter-feature-packs
2015-06-04 13:56:35 +01:00
