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
Marek Posolda
ea5a767948
Merge pull request #1434 from mposolda/master
...
KEYCLOAK-1533 KEYCLOAK-1534
2015-07-08 21:19:54 +02:00
mposolda
bde65a6c57
KEYCLOAK-1533 Handle importing LDAP user with duplicate email during authentication
2015-07-08 20:41:32 +02: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
9406a577c2
Merge pull request #1431 from mstruk/wf9-version
...
KEYCLOAK-1512 Upgrade to WildFly 9.0.0.Final
2015-07-07 11:34:34 -04:00
Bill Burke
40344726e1
Merge pull request #1432 from mstruk/ispn-activator
...
KEYCLOAK-1529 Drop InfinispanCacheActivator and make subsystem do it
2015-07-07 11:34:15 -04:00
Bill Burke
08ffea23b7
Merge pull request #1433 from patriot1burke/master
...
config directive
2015-07-07 11:32:45 -04:00
Bill Burke
f1ddaa8051
config directive
2015-07-07 11:31:28 -04:00
Marko Strukelj
7ae62c1060
KEYCLOAK-1529 Drop InfinispanCacheActivator and make subsystem do it
2015-07-07 16:40:03 +02:00
Marko Strukelj
7c51046d8a
KEYCLOAK-1512 Upgrade to WildFly 9.0.0.Final
2015-07-07 14:13:13 +02: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
ee74025f38
Merge pull request #1429 from mikeazo/patch-1
...
fixed typo in closing th tag
2015-07-06 17:55:51 -04:00
Bill Burke
d49c7d47a2
Merge remote-tracking branch 'upstream/master'
2015-07-06 17:44:52 -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
Marek Posolda
f3aeb5ec9f
Merge pull request #1428 from mposolda/master
...
Embedded LDAP for examples. LDAP sync bugfixing
2015-07-04 22:46:54 +02:00
mposolda
71ea61e7a6
KEYCLOAK-1532 LDAP sync fixes and other bugfixing
2015-07-04 22:25:47 +02:00
mposolda
c6c73e5e59
KEYCLOAK-1531 Added embedded LDAP for examples. Added module keycloak-util-embedded-ldap with common code for testsuite and examples
2015-07-04 21:06:24 +02: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
Stian Thorgersen
351a17f68d
Merge pull request #1426 from stianst/master
...
KEYCLOAK-1530
2015-07-03 15:18:52 +02:00
Stian Thorgersen
1c4f7cb339
KEYCLOAK-1530
...
Ability to specify default database schema
2015-07-03 14:56:33 +02:00
Bill Burke
68d71a6767
Merge pull request #1423 from patriot1burke/master
...
display flows
2015-07-02 11:44:51 -04: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
b9e9d6a787
Merge branch 'velias-KEYCLOAK-1421'
2015-07-02 14:16:42 +02: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
Stian Thorgersen
ec3d027f90
Merge pull request #1421 from stianst/master
...
KEYCLOAK-1507
2015-07-02 14:10:57 +02:00
Stian Thorgersen
50678085c9
Merge pull request #1403 from mstruk/KEYCLOAK-1484
...
KEYCLOAK-1484 Keycloak from server-dist and demo-dist doesn't start
2015-07-02 14:10:19 +02:00
Stian Thorgersen
5af4785ba1
KEYCLOAK-1507
...
Tomcat Adapter throws NPE under certain conditions
2015-07-02 09:08:40 +02:00
Stian Thorgersen
f59d42d5d3
Merge pull request #1420 from girirajsharma/master
...
[KEYCLOAK-1435] Base URL on client table should open in new tab
2015-07-02 09:00:24 +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
212f5b4082
Merge pull request #1410 from dbarentine/master
...
Spec compliance, bug fixes
2015-07-01 15:27:47 -04:00
Bill Burke
9591f48077
Merge pull request #1419 from patriot1burke/master
...
recapthca
2015-07-01 15:26:20 -04:00
Bill Burke
0a8494a0f2
Merge remote-tracking branch 'upstream/master'
2015-07-01 15:10:14 -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
Bill Burke
45c5a2ae78
Merge pull request #1418 from patriot1burke/master
...
registration flow
2015-06-30 13:19:18 -04:00
Bill Burke
a1c612f833
remove old code
2015-06-30 12:47:34 -04:00
Bill Burke
bc39bb32d4
Merge remote-tracking branch 'upstream/master'
2015-06-30 12:46:29 -04:00
Bill Burke
884308ecb5
reg flow
2015-06-30 12:46:10 -04:00
Marek Posolda
2d7f232c3d
Merge pull request #1417 from mposolda/master
...
KEYCLOAK-1487 multivalued attributes support
2015-06-30 14:56:45 +02:00
Bill Burke
afa65d9ead
registration flow
2015-06-29 22:12:06 -04:00
mposolda
605c88a029
KEYCLOAK-1487 Multivalued support for UserAttribute protocol mapper. End-to-end LDAP example test including application
2015-06-29 21:45:47 +02: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
Marek Posolda
d4819886a6
Merge pull request #1416 from mposolda/master
...
LDAP mappers fixes
2015-06-26 14:43:10 +02:00