Vlastimil Elias
b51661b790
KEYCLOAK-1542 - added system and memory info into "System Info" page
2015-07-20 17:11:04 +02:00
Stian Thorgersen
d5d806760f
Merge branch 'ssilvert-KEYCLOAK-1414-cli-script-adapters'
2015-07-20 13:11:10 +02:00
Stian Thorgersen
efe2a8f789
Merge branch 'KEYCLOAK-1414-cli-script-adapters' of https://github.com/ssilvert/keycloak into ssilvert-KEYCLOAK-1414-cli-script-adapters
...
Conflicts:
docbook/reference/en/en-US/modules/jboss-adapter.xml
2015-07-20 13:10:51 +02:00
Stian Thorgersen
69bbed999f
Merge pull request #1466 from ssilvert/KEYCLOAK-1415-server-cli-script
...
KEYCLOAK-1415 server cli script
2015-07-20 13:08:13 +02:00
Stian Thorgersen
5b7d4184f0
Merge pull request #1470 from stianst/master
...
Enabled testsuite/integration-arquillian on Travis
2015-07-20 11:52:13 +02:00
Stian Thorgersen
422b7ed5ef
Enabled testsuite/integration-arquillian on Travis
2015-07-20 10:39:08 +02:00
Stian Thorgersen
66a2b916f2
Fix CRLF with LF
2015-07-20 07:48:02 +02:00
Stian Thorgersen
27ac253098
Merge pull request #1469 from Smartling/KEYCLOAK-1494-Fix
...
Support loading keycloak.json from the classpath
2015-07-20 06:48:14 +02:00
Scott Rossillo
1839b24b90
Support for loading keycloak.json from the classpath
...
Spring Boot and non-web based applications don't have a WEB-INF
directory. Support loading Spring Security adapter's keycloak.json
from the class path.
2015-07-19 12:10:33 -04:00
Bill Burke
a60ebb6210
Merge pull request #1468 from patriot1burke/master
...
required action import/export
2015-07-18 09:06:39 -04:00
Bill Burke
4dba4f3c02
fix
2015-07-17 23:07:36 -04:00
Bill Burke
6727af2f35
required action import/export
2015-07-17 22:48:07 -04:00
Stan Silvert
5bcf334bc5
Don't add security-domain to server.
2015-07-17 12:48:32 -04:00
Stan Silvert
ef49bd685e
KEYCLOAK-1415 Add CLI scripts to WildFly and EAP overlay bundles.
2015-07-17 12:34:20 -04:00
Stan Silvert
092562fb94
KEYCLOAK-1414 Add CLI script for installing JBoss/WildFly/EAP adapters.
2015-07-17 12:23:10 -04:00
Bill Burke
44e2983803
Merge pull request #1462 from patriot1burke/master
...
migrate RequiredCredentials
2015-07-17 10:28:21 -04:00
Bill Burke
2e848da1a8
resolve conflicts
2015-07-17 09:45:53 -04:00
Stian Thorgersen
22ae4ecb23
Merge pull request #1464 from stianst/master
...
KEYCLOAK-1385 Introduce end-of-line normalization
2015-07-17 14:04:59 +02:00
Stian Thorgersen
1642ac2394
KEYCLOAK-1385 Introduce end-of-line normalization
2015-07-17 13:46:51 +02:00
Stian Thorgersen
be8aa93cca
Merge pull request #1463 from mstruk/remove-war
...
KEYCLOAK-1345 Remove distribution/subsystem-war
2015-07-17 13:26:34 +02:00
Marko Strukelj
fc7ba85639
KEYCLOAK-1345 Remove distribution/subsystem-war
2015-07-17 12:41:00 +02:00
Stian Thorgersen
11d1dd6419
KEYCLOAK-1470
2015-07-17 11:46:02 +02:00
Stian Thorgersen
e8bd7270e9
KEYCLOAK-1483
2015-07-17 11:22:04 +02:00
Stian Thorgersen
99e2afa81b
KEYCLOAK-1498
2015-07-17 10:54:43 +02:00
Stian Thorgersen
676792d07d
KEYCLOAK-1475
2015-07-17 10:33:18 +02:00
Stian Thorgersen
0bec2bcd1e
KEYCLOAK-1504
2015-07-17 10:21:15 +02:00
Stian Thorgersen
25328048aa
KEYCLOAK-1566
2015-07-17 10:09:28 +02:00
Bill Burke
e51d2137cf
migrate RequiredCredentials
2015-07-16 22:03:12 -04:00
Bill Burke
5695677873
Merge pull request #1458 from patriot1burke/master
...
idp initiated relaystate query param
2015-07-16 10:34:12 -04:00
Stian Thorgersen
9d86f582ac
Merge branch 'girirajsharma-master'
2015-07-16 16:32:25 +02:00
Stian Thorgersen
97b0558f71
Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master
...
Conflicts:
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html
2015-07-16 16:31:16 +02:00
Bill Burke
e825be1c79
nonce in tokens
2015-07-16 10:17:44 -04:00
Stian Thorgersen
88252c3dfc
Merge pull request #1457 from mstruk/keycloak-prod
...
KEYCLOAK-1331 Add product.conf and product module
2015-07-16 16:11:44 +02:00
Stian Thorgersen
02997b593f
Merge pull request #1459 from stianst/master
...
Some fixes to integration-arquillian
2015-07-16 16:10:37 +02:00
giriraj sharma
9de81a0b14
Updated patternfly delete glyphicon css.
2015-07-16 18:28:56 +05:30
giriraj sharma
ab13182091
[Keycloak-1427] Updated Delete icons with 'pointer' as hovering cursor.
2015-07-16 18:26:58 +05:30
Stian Thorgersen
e75e4580ae
Some fixes to integration-arquillian
...
Conflicts:
testsuite/integration-arquillian/pom.xml
2015-07-16 14:49:38 +02:00
Bill Burke
b7f031d199
Merge remote-tracking branch 'upstream/master'
2015-07-16 08:49:23 -04:00
Bill Burke
808d27be2d
idp initiated relaystate query param
2015-07-16 08:48:07 -04:00
Marko Strukelj
dcf8751ff7
KEYCLOAK-1331 Add product.conf and product module
2015-07-16 14:16:10 +02:00
Bill Burke
ec6e3d80ee
Merge pull request #1456 from patriot1burke/master
...
SAML IDP Initiated Login
2015-07-15 20:35:01 -04:00
Bill Burke
5a9badf683
relay state
2015-07-15 20:22:30 -04:00
Bill Burke
dd11dcef93
docs
2015-07-15 20:18:14 -04:00
Bill Burke
e9851957f0
Merge remote-tracking branch 'upstream/master'
2015-07-15 20:09:13 -04:00
Bill Burke
57cfbb3770
SAML IDP Initiated login
2015-07-15 20:08:55 -04:00
Bill Burke
da2590819d
Merge pull request #1455 from patriot1burke/master
...
export/import flows
2015-07-15 15:08:09 -04:00
Bill Burke
d74d93a522
fix problems
2015-07-15 14:54:14 -04:00
Bill Burke
b3eadcc990
Merge remote-tracking branch 'upstream/master'
2015-07-15 14:17:54 -04:00
Bill Burke
f4d4405c20
export/import flows
2015-07-15 14:17:23 -04:00
Stian Thorgersen
1ebec0e2e5
Merge pull request #1454 from brmeyer/KEYCLOAK-1563
...
KEYCLOAK-1563 update docs for server/adapter subsystem split & WF 9.0…
2015-07-15 09:37:00 +02:00
