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
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
5a9badf683
relay state
2015-07-15 20:22:30 -04:00
Bill Burke
57cfbb3770
SAML IDP Initiated login
2015-07-15 20:08:55 -04: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
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
giriraj sharma
b876a5f7bd
[KEYCLOAK-1430] Buttons in form headers should not be primary buttons
2015-07-13 22:41:54 +05:30
Bill Burke
b3211fa8c2
tooltip
2015-07-12 10:24:15 -04:00
mposolda
d67bd0eff2
Use kc-provider-config in LDAP mappers
2015-07-11 23:11:01 +02: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
Bill Burke
919a3f1b91
fixes
2015-07-11 10:30:23 -04:00
Bill Burke
1ec8e63e9e
impersonation redo in admin console
2015-07-11 10:12:55 -04:00
Bill Burke
608701aea7
impersonation redo in admin console
2015-07-11 10:10:05 -04:00
mposolda
142d44a01f
KEYCLOAK-1233 Admin console support for add/remove federated identity
2015-07-11 14:08:49 +02:00
Bill Burke
474ebed0ee
Merge remote-tracking branch 'upstream/master'
2015-07-10 20:39:15 -04:00
Bill Burke
6e55604dc3
impersonation
2015-07-10 20:38:43 -04:00
mposolda
bd22d30674
KEYCLOAK-1505 Fix JS error in admin console on old browsers
2015-07-09 10:20:55 +02:00
Bill Burke
4a962aa75a
Merge remote-tracking branch 'upstream/master'
2015-07-08 19:18:23 -04:00
Bill Burke
e786158071
role selector
2015-07-08 19:18:11 -04:00
mposolda
94c0a436b5
KEYCLOAK-1534 handle account management update email or username to the already existing value
2015-07-08 15:27:05 +02:00
mposolda
bddf1adeba
Improve description for object classes
2015-07-08 12:27:15 +02:00
Bill Burke
f1ddaa8051
config directive
2015-07-07 11:31:28 -04:00
Bill Burke
df6d75e2c5
Merge pull request #1427 from grange74/KEYCLOAK-1486
...
KEYCLOAK-1486 fixed User link in Clients' Active Sessions page
2015-07-06 17:57:53 -04:00
Bill Burke
3c88d9666d
Merge pull request #1430 from patriot1burke/master
...
auth config ui
2015-07-06 17:56:16 -04:00
Bill Burke
8f18e9bbbc
auth config ui
2015-07-06 17:44:39 -04:00
mikeazo
be96a3785b
fixed typo in closing th tag
2015-07-06 13:41:10 -04:00
nick.grange
ae242f8480
KEYCLOAK-1486 fixed User link in Clients' Active Sessions page
...
Changed User link in Clients' Active Sessions page to use userId
instead of username to show User details instead of Resource not found.
Renamed UserSessionRepresentation’s user attribute to username as it
was ambiguous and only used in 1 place (i.e. client-sessions.html).
2015-07-04 22:38:34 +10:00
Andres Galante
2713af189f
fixes realm selector when there are too many realms on the list
2015-07-02 16:55:42 -03:00
Andres Galante
be62d1a915
styles new menu
2015-07-02 16:45:48 -03:00
Bill Burke
46c88ad1bf
Merge remote-tracking branch 'upstream/master'
2015-07-02 11:26:28 -04:00
Bill Burke
917151123f
display flows
2015-07-02 11:25:51 -04:00
Stian Thorgersen
db20077c37
Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421
...
Conflicts:
testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
2015-07-02 14:15:54 +02:00
giriraj sharma
fc7ae1ee96
[KEYCLOAK-1435] Base URL on client table should open in new tab
2015-07-02 06:40:22 +05:30
Bill Burke
2699bb9a44
Merge pull request #1368 from girirajsharma/master
...
[KEYCLOAK-1427] Move delete buttons
2015-07-01 15:32:11 -04:00
Bill Burke
39f2a4ab71
repatcha
2015-07-01 15:10:04 -04:00
Bill Burke
39aa09ca36
form action refactor
2015-07-01 14:07:02 -04:00
mposolda
09994d1730
KEYCLOAK-1487 Support for multiple values of one UserModel attribute. LDAP multivalued attribute support
2015-06-29 14:56:40 +02:00
girirajSharma
bb9c99ebf6
[KEYCLOAK-1427] Move delete buttons
2015-06-28 14:31:40 +05:30
Vlastimil Elias
82282c1c75
KEYCLOAK-1421 - user created date added to the admin console
2015-06-22 10:32:39 +02:00
Bill Burke
a26ade3988
refactor registration and console pages
2015-06-19 17:51:59 -04:00
Bill Burke
1aa338fe3e
Merge remote-tracking branch 'upstream/master'
2015-06-17 09:43:14 -04:00
Bill Burke
5615d8d870
required actions edit
2015-06-17 09:42:58 -04:00
Stian Thorgersen
39ecca0989
KEYCLOAK-1479
2015-06-17 13:53:11 +02:00
