Commit graph

1353 commits

Author SHA1 Message Date
Bill Burke
d957cc4883 Merge remote-tracking branch 'upstream/master' 2014-05-08 20:03:20 -04:00
Bill Burke
2d949b63b5 keycloak.js login for admin 2014-05-08 19:55:57 -04:00
Stian Thorgersen
abdbef6a51 Merge pull request #370 from mposolda/master
Social fixes and improvements
2014-05-07 16:50:19 +01:00
mposolda
c51011acef KEYCLOAK-354 Possibility for admin to see social links of some user in admin console 2014-05-07 17:28:13 +02:00
mposolda
6b1e0401ba KEYCLOAK-361 it shouldn't be possible to remove last social link if user don't have password 2014-05-07 17:28:13 +02:00
Stian Thorgersen
d523242dbb Merge pull request #368 from mposolda/master
A bit more cleanup of dependencies
2014-05-07 12:52:22 +01:00
Stian Thorgersen
92058b16c9 Merge pull request #369 from abstractj/cleanup
Little code clean up
2014-05-07 12:52:09 +01:00
Bruno Oliveira
4424c425a6 Redundant initialization 2014-05-07 08:15:31 -03:00
Bruno Oliveira
5f7b0aae06 Variables will be never used 2014-05-07 08:15:02 -03:00
Bruno Oliveira
f77e3b5532 Unused imports 2014-05-07 08:14:32 -03:00
Bruno Oliveira
334b981741 notBefore wasn't being assigned 2014-05-07 08:10:03 -03:00
Bruno Oliveira
957ff7d206 Make it final 2014-05-07 08:05:57 -03:00
Bruno Oliveira
5973ccd522 Scope can be private 2014-05-07 08:03:21 -03:00
Bruno Oliveira
1ea1f0af96 Removing redundant local variable 2014-05-07 07:49:45 -03:00
Bruno Oliveira
f5ac81db41 Return not necessary here 2014-05-07 07:48:42 -03:00
Bruno Oliveira
9e7f52ccda extends Object isn't necessary 2014-05-07 07:47:39 -03:00
mposolda
f8173e6a5a A bit more cleanup of dependencies 2014-05-07 11:08:47 +02:00
Bill Burke
5edf05d569 Merge pull request #366 from mposolda/export-import-rebased
Full export-import implemented. Remove dependency of mongo on picketlink...
2014-05-06 21:17:51 -04:00
Bill Burke
4666bcbfb2 Merge pull request #367 from patriot1burke/master
remove /rest from RealmsResource - pom fixes
2014-05-06 21:09:11 -04:00
Bill Burke
a374e52ea5 /rest removal web.xml fixes 2014-05-06 21:08:27 -04:00
Bill Burke
f987d331b7 /rest removal and pom fixes 2014-05-06 20:43:01 -04:00
Bill Burke
314f177fe7 Merge remote-tracking branch 'upstream/master' 2014-05-06 20:21:59 -04:00
Bill Burke
64f591769a remove /rest from RealmsResource 2014-05-06 20:21:49 -04:00
mposolda
0801c9c120 Full export-import implemented. Remove dependency of mongo on picketlink-common 2014-05-06 22:15:57 +02:00
Bill Burke
e4e02a2615 Merge pull request #365 from patriot1burke/master
aerogear fix
2014-05-06 10:41:42 -04:00
Bill Burke
ff69607f52 aerogear fix 2014-05-06 10:41:17 -04:00
Bill Burke
a23b213736 Merge pull request #362 from matzew/JSP-Error
Removing JSP code, adding simple text for a simple demo...
2014-05-06 10:33:27 -04:00
Bill Burke
36ce4e04d9 Merge pull request #364 from patriot1burke/master
add aerogear stuff
2014-05-06 10:10:45 -04:00
Bill Burke
3b6593b476 add aerogear stuff 2014-05-06 10:10:17 -04:00
Bill Burke
6ef3102cd1 Merge pull request #361 from patriot1burke/master
remove ups social dependencies
2014-05-06 10:08:08 -04:00
Bill Burke
39381c104c merge fixes 2014-05-06 10:07:48 -04:00
Bill Burke
c04b490f29 port fix 2014-05-06 09:59:52 -04:00
Stian Thorgersen
e1f2d296bf Merge pull request #363 from stianst/master
Removed org.json
2014-05-06 13:05:30 +01:00
Stian Thorgersen
1d760388de KEYCLOAK-441 Remove org.json 2014-05-06 12:32:29 +01:00
Stian Thorgersen
8286d1ce34 Fix breadcrumb for audit pages£ 2014-05-06 12:26:17 +01:00
Matthias Wessendorf
7b14d29dee Removing JSP code, adding simple text for a simple demo... 2014-05-06 11:29:08 +02:00
Bill Burke
75224d25b0 remove picketlink dependencies 2014-05-05 18:50:41 -04:00
Bill Burke
3a3ae742a4 Merge pull request #360 from patriot1burke/master
adatper deployment context fixes, picketlink abstraction
2014-05-05 18:21:45 -04:00
Bill Burke
e7c64b7812 adatper deployment context fixes, picketlink abstraction 2014-05-05 18:20:52 -04:00
Bill Burke
e55eb73fb9 Merge pull request #359 from patriot1burke/master
fix tomcat7 build
2014-05-02 13:00:32 -04:00
Bill Burke
201b35be54 fix tomcat7 build 2014-05-02 13:00:12 -04:00
Bill Burke
e25b2b05ae Merge pull request #352 from ungarida/master
Tomcat7 adapter
2014-05-02 12:36:06 -04:00
Bill Burke
6b470f826e Merge pull request #358 from patriot1burke/master
dynamic key lookup, relative uris
2014-05-02 12:34:18 -04:00
Bill Burke
4517d9d707 Merge remote-tracking branch 'upstream/master' 2014-05-02 12:30:31 -04:00
Bill Burke
7ff2c77a82 relative uri tests and fixes 2014-05-02 12:30:08 -04:00
Bill Burke
e5e43173bc relative redirect uris 2014-05-02 10:58:29 -04:00
Bill Burke
6f3822e6ea relative adapter urls 2014-05-02 10:17:40 -04:00
Bill Burke
95bafc416d Merge pull request #357 from patriot1burke/master
fix mime type
2014-04-30 14:26:12 -04:00
Bill Burke
2576975988 fix mimetype 2014-04-30 14:25:23 -04:00
Bill Burke
8c5ae9d052 fix mimetype 2014-04-30 14:24:37 -04:00