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 |
|
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 |
|
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 |
|
Brett Meyer
|
4433347ff3
|
KEYCLOAK-1563 update docs for server/adapter subsystem split & WF 9.0.0.Final
|
2015-07-14 15:55:14 -04:00 |
|
Stian Thorgersen
|
08c539ba51
|
Merge pull request #1452 from stianst/master
KEYCLOAK-1530 Ability to specify default database schema
|
2015-07-14 15:21:08 +02:00 |
|
Stian Thorgersen
|
4e538dd138
|
KEYCLOAK-1530 Ability to specify default database schema
|
2015-07-14 14:34:04 +02:00 |
|
Stian Thorgersen
|
66373ccab2
|
Merge pull request #1451 from stianst/master
KEYCLOAK-1426 and KEYCLOAK-1565
|
2015-07-14 12:12:06 +02:00 |
|
Stian Thorgersen
|
9c82c0700d
|
Merge pull request #1425 from girirajsharma/master
[KEYCLOAK-1430] Buttons in form headers should not be primary buttons
|
2015-07-14 12:04:45 +02:00 |
|
Stian Thorgersen
|
a480e50c16
|
KEYCLOAK-1426 Updated icons in menu
|
2015-07-14 11:53:02 +02:00 |
|
Stian Thorgersen
|
4391bf4f70
|
KEYCLOAK-1565 Updated to PatternFly 1.3.0
|
2015-07-14 11:52:58 +02:00 |
|
Stian Thorgersen
|
18f46cb527
|
Merge pull request #1450 from stianst/master
KEYCLOAK-1426
|
2015-07-14 11:32:19 +02:00 |
|
Stian Thorgersen
|
32b89adc04
|
Wire up new menu
|
2015-07-14 11:19:44 +02:00 |
|
Stian Thorgersen
|
5a213fcad9
|
Merge branch 'KEYCLOAK-1426' of https://github.com/andresgalante/keycloak
|
2015-07-14 10:09:34 +02:00 |
|
Stian Thorgersen
|
d6f1d1bb3c
|
Merge pull request #1449 from gtudan/KEYCLOAK-1564
KEYCLOAK-1564: Add CORS-Headers to token requests by password credentials
|
2015-07-14 09:10:22 +02:00 |
|
Gregor Tudan
|
c8c0d0e804
|
KEYCLOAK-1564: Add CORS-Headers to token requests by password credentials
|
2015-07-14 08:22:08 +02:00 |
|
Stian Thorgersen
|
aeddf2a860
|
Merge pull request #1448 from ssilvert/KEYCLOAK-1547-infinispan-session-timeout
Keycloak 1547 infinispan session timeout
|
2015-07-13 19:13:59 +02:00 |
|
giriraj sharma
|
b876a5f7bd
|
[KEYCLOAK-1430] Buttons in form headers should not be primary buttons
|
2015-07-13 22:41:54 +05:30 |
|
Stan Silvert
|
af8949c291
|
Change to make removeUserSession() a protected method.
|
2015-07-13 11:21:35 -04:00 |
|
Stian Thorgersen
|
e3da38df7c
|
KEYCLOAK-1538 Deploy server feature pack to maven repo
|
2015-07-13 16:47:58 +02:00 |
|
Stian Thorgersen
|
a16079e38d
|
Remove unused feature-packs-builds
|
2015-07-13 14:08:25 +02:00 |
|
Stian Thorgersen
|
e13b0fac63
|
Merge pull request #1447 from mstruk/KEYCLOAK-1370
KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist
|
2015-07-13 13:05:12 +02:00 |
|
Marko Strukelj
|
26190350c4
|
KEYCLOAK-1370 Empty module de.idyl.winzipaes in keycloak-server-dist
|
2015-07-13 12:42:06 +02:00 |
|
Bill Burke
|
7598cc62d3
|
Merge pull request #1446 from patriot1burke/master
test impersonation
|
2015-07-12 10:40:43 -04:00 |
|
Bill Burke
|
b3211fa8c2
|
tooltip
|
2015-07-12 10:24:15 -04:00 |
|
Bill Burke
|
8dcc909b6e
|
Merge remote-tracking branch 'upstream/master'
|
2015-07-12 10:12:31 -04:00 |
|
Bill Burke
|
fafaf2c490
|
test impersonate
|
2015-07-12 10:12:19 -04:00 |
|
Marek Posolda
|
11e2f19503
|
Merge pull request #1444 from mposolda/master
Use kc-provider-config in LDAP mappers
|
2015-07-11 23:29:00 +02:00 |
|
mposolda
|
d67bd0eff2
|
Use kc-provider-config in LDAP mappers
|
2015-07-11 23:11:01 +02:00 |
|
Marek Posolda
|
43bbea9a7c
|
Merge pull request #1443 from mposolda/master
JSON import issue from older versions. Fix import at startup if master realm not present
|
2015-07-11 19:21:28 +02:00 |
|
mposolda
|
dc366c53a7
|
KEYCLOAK-1175 Import at startup can fail if master realm not present
|
2015-07-11 18:56:52 +02:00 |
|
mposolda
|
fe1ede26be
|
KEYCLOAK-1558 Can't import the file exported in 1.2.0.Beta1 through admin console
|
2015-07-11 18:56:52 +02:00 |
|
Bill Burke
|
aca799b28c
|
Merge pull request #1442 from patriot1burke/master
impersonation in admin console
|
2015-07-11 11:36:01 -04:00 |
|
Bill Burke
|
1017a0af1d
|
Merge remote-tracking branch 'upstream/master'
|
2015-07-11 11:09:48 -04:00 |
|
Bill Burke
|
ff25484a34
|
viewUser fixes
|
2015-07-11 11:01:26 -04:00 |
|
Marek Posolda
|
af922920ab
|
Merge pull request #1441 from mposolda/master
KEYCLOAK-1233 Admin console support for add/remove federated identity
|
2015-07-11 16:48:29 +02:00 |
|
Bill Burke
|
919a3f1b91
|
fixes
|
2015-07-11 10:30:23 -04:00 |
|