libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions
7792 commits 4 branches 5 tags 483 MiB
Commit graph

7792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marek Posolda
df26caed07 Merge pull request #1933 from vramik/clients 
KEYCLOAK-2203, KEYCLOAK-2205
 2015-12-09 10:28:56 +01:00
Marek Posolda
9f9067663f Merge pull request #1932 from mhajas/fixDataTable 
Fix xpath for rows in DataTable fragment
 2015-12-09 10:28:48 +01:00
Marek Posolda
0f3d8b8513 Merge pull request #1935 from thomasdarimont/patch-1 
Fixed missing ':' in the JSON example.
 2015-12-09 08:52:32 +01:00
mhajas
4ca3bf530f Merge remote-tracking branch 'upstream/master' into fixDataTable 2015-12-09 07:41:45 +01:00
Thomas Darimont
c8c0a45ce4 Fixed missing ':' in the JSON example. 2015-12-08 18:45:25 +01:00
Stian Thorgersen
7313b843b9 Merge pull request #1934 from stianst/KEYCLOAK-1900-PASS-HASH 
KEYCLOAK-1900 Password Hash SPI
 2015-12-08 16:17:32 +01:00
Stian Thorgersen
321cac2ab8 KEYCLOAK-1900 Refactoring 2015-12-08 14:06:40 +01:00
tsudot
162dd4051d KEYCLOAK-1900 Add password hash SPI and provider 
- Default encoder set to Pbkdf2PasswordEncoder
 2015-12-08 13:25:59 +01:00
vramik
cd19c1acdf fix tests witch fails with phantomjs 2015-12-08 08:40:40 +01:00
vramik
44ed912154 Merge branch 'master' of https://github.com/keycloak/keycloak into clients 
Conflicts:
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
	testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
	testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
 2015-12-07 15:45:02 +01:00
vramik
39856c32d1 Merge branch 'master' of https://github.com/keycloak/keycloak into clients 
Conflicts:
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java
	testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
	testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
	testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
 2015-12-07 15:44:34 +01:00
vramik
d3a893b171 KEYCLOAK-2203 - Add new cluster node form doesn't validate host input 2015-12-07 15:28:39 +01:00
vramik
ba861f227e added UI tests for client's tabs: clustering, installation 2015-12-07 15:09:24 +01:00
Tomas Kyjovsky
4a57bcc0b4 Merge pull request #1903 from tkyjovsk/master 
Increased pageload timeout. Increased other timeouts for travis. Better handling of closeable alert messages.
 2015-12-07 11:09:37 +01:00
Tomas Kyjovsky
87a8e017fa Disabled crudRole test, unstable. Role tests need rewrite. 2015-12-07 09:10:32 +01:00
Tomas Kyjovsky
b8fe608aaf Merge upstream-master 2015-12-07 05:59:51 +01:00
mhajas
d3e6b38a8e Fix xpath for DataTable row and tests 2015-12-04 14:26:24 +01:00
Marek Posolda
8589327cdd Merge pull request #1931 from mposolda/master 
KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule
 2015-12-04 12:24:33 +01:00
vramik
1b936a1230 added UI tests for client scope 2015-12-04 12:04:39 +01:00
mposolda
45c490b640 KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule 2015-12-04 11:44:30 +01:00
vramik
1dd3fc537b added UI tests for client mappers saml 2015-12-03 14:47:13 +01:00
Stian Thorgersen
73cf2404ff Merge pull request #1928 from stianst/master 
KEYCLOAK-2176 Add default roles and actions to users created with add…
 2015-12-03 13:30:29 +01:00
vramik
c16b6e6a43 update ClientSettingsTest due to KEYCLOAK-1129 2015-12-03 12:49:29 +01:00
Stian Thorgersen
8d23422605 KEYCLOAK-2176 Add default roles and actions to users created with add-user script 2015-12-03 11:45:56 +01:00
Stian Thorgersen
9cd8d1612e Merge pull request #1926 from ssilvert/mappers-tooltip 
Fix typo for mappers.tooltip
 2015-12-03 11:44:39 +01:00
Stian Thorgersen
277faea1d0 Merge pull request #1924 from ppalaga/151202-rename-w9-subsystem-dir 
Rename keycloak-wf9-subsystem directory to keycloak-wildfly-subsystem to match t
 2015-12-03 10:53:36 +01:00
Stian Thorgersen
58c7b6090b Merge pull request #1919 from stianst/master 
Cache fixes
 2015-12-03 10:53:18 +01:00
Stian Thorgersen
f45bb62fcc KEYCLOAK-2192 
Class serialization issues when Realm and User caches are in ASYNC mode
 2015-12-03 08:24:30 +01:00
Stian Thorgersen
34c3ffaae1 Ported AdminApiTest to use admin client 2015-12-03 08:24:23 +01:00
Stian Thorgersen
a218cc3034 KEYCLOAK-2179 Cache fixes 2015-12-03 08:24:16 +01:00
Stan Silvert
c62b3822f4 Fix typo for mappers.tooltip 2015-12-02 11:54:02 -05:00
Tomas Kyjovsky
b0e9720f88 Increased arquillian timeouts. 2015-12-02 16:46:15 +01:00
Tomas Kyjovsky
6507f58b49 Merge upstream-master 2015-12-02 16:11:45 +01:00
Tomas Kyjovsky
46e2440d30 Refactoring of arquillian waiting methods. 2015-12-02 15:58:23 +01:00
vramik
9b51b6e43b Merge upstream/master into clients 2015-12-02 15:18:15 +01:00
Peter Palaga
4772b8401a KEYCLOAK-2099 fixup: Rename keycloak-wf9-subsystem directory to 
keycloak-wildfly-subsystem to match the WF module it contains
 2015-12-02 14:51:48 +01:00
vramik
2b25c120d4 added UI tests for client mappers oidc 2015-12-02 13:12:05 +01:00
Marek Posolda
c19e65f93c Merge pull request #1922 from mposolda/master 
Minor fixes in kerberos example
 2015-12-02 12:15:18 +01:00
mposolda
87994e032d Minor fixes in kerberos example 2015-12-02 11:31:12 +01:00
Stian Thorgersen
ee6753d31b KEYCLOAK-1813 KEYCLOAK-2182 Fixes enable/disable cache 2015-12-02 11:24:04 +01:00
Stian Thorgersen
09c18306c2 KEYCLOAK-2179 
Realm and user cache is invalidated when added to other nodes
 2015-12-02 11:23:54 +01:00
Marek Posolda
6124fd64f3 Merge pull request #1918 from mposolda/master 
Fix typos
 2015-12-02 10:25:15 +01:00
mposolda
2a03d23098 Fix typos 2015-12-02 08:51:20 +01:00
Stian Thorgersen
ff806eae08 Version bump 2015-12-01 19:54:28 +01:00
Tomas Kyjovsky
e44d6f9888 Merge upstream-master 2015-12-01 17:30:02 +01:00
Tomas Kyjovsky
4e79dde17f Removed travis profile from arq. testsuite. 2015-12-01 17:29:28 +01:00
Tomas Kyjovsky
29e05ecf0d Fixed arquillian wait intervals config. 2015-12-01 17:28:28 +01:00
Marek Posolda
a388782f9b Merge pull request #1916 from mposolda/master 
KEYCLOAK-2172 Added migration docs
 2015-12-01 17:03:15 +01:00
mposolda
352ea30d20 KEYCLOAK-2172 Added migration docs 2015-12-01 17:02:31 +01:00
Marek Posolda
6e0444e17b Merge pull request #1915 from mposolda/master 
KEYCLOAK-2172 Make Identity broker User Attribute mappers compatible …
 2015-12-01 16:45:47 +01:00