bjl23
|
e2e145954f
|
take 2 on fixing the EntityController merge
|
2010-10-01 19:24:22 +00:00 |
|
bjl23
|
96f5c225f2
|
fixing erroneous EntityController commit
|
2010-10-01 19:03:22 +00:00 |
|
sjm222
|
997934d6d8
|
merging changes for NIHVIVO-1173 (2nd batch up updates for that issue) into the trunk
|
2010-10-01 18:49:29 +00:00 |
|
bjl23
|
4adba03c2a
|
hand-merging revision 6005 into trunk to get around PROPFIND error
|
2010-10-01 18:45:42 +00:00 |
|
bjl23
|
183ce8eb33
|
merging rdf link tag addition into trunk
|
2010-10-01 18:37:25 +00:00 |
|
rjy7
|
5bc5c0b93c
|
NIHVIVO-1176. Removed themeStylesheetDir from template model, and replaced with themeDir. Also modified stylesheet and script addFromTheme methods so the prepend only the theme directory; the specific stylesheet or css directory must be added to the path argument.
|
2010-10-01 14:55:03 +00:00 |
|
rjy7
|
535691ee11
|
Merge r5997 from nihvivo-rel-1.1-maint
|
2010-10-01 14:11:45 +00:00 |
|
rjy7
|
4db64bb029
|
Change logging level on autocomplete ParseException
|
2010-09-30 20:01:42 +00:00 |
|
rjy7
|
375f99b99a
|
Undid previous changes related to query string cleanup, since eliminating all ParseExceptions is too involved.
|
2010-09-30 19:59:04 +00:00 |
|
rjy7
|
bf834bcac6
|
Merge r5988 from nihvivo-rel-1.1-maint
|
2010-09-30 19:20:56 +00:00 |
|
rjy7
|
f0ef52f6e5
|
Create BaseSearchController which is subclassed by AutocompleteController and FreemarkerPagedSearchController, so they can share methods.
|
2010-09-30 19:16:15 +00:00 |
|
rjy7
|
b510f53e1c
|
Merge r5985 from nihvivo-rel-1.1-maint: query string cleanup to prevent Lucene ParseExceptions
|
2010-09-30 18:41:12 +00:00 |
|
rjy7
|
a83304b5b8
|
Merge r5980 from nihvivo-rel-1.1.-maint: custom sorting and collation.
|
2010-09-29 19:48:21 +00:00 |
|
rjy7
|
3975d9aa01
|
Merge r5968, r5972 from nihvivo-rel-1.1.-maint. Externally-linked namespaces.
|
2010-09-29 18:56:36 +00:00 |
|
ass92
|
27d91f67c4
|
NIHVIVO-438 modification of code to include export feature of ontologies.
|
2010-09-29 14:55:45 +00:00 |
|
bjl23
|
3d897303f1
|
merging fix for imports loading NIHVIVO-1174 into trunk
|
2010-09-28 18:45:45 +00:00 |
|
rjy7
|
0fea772da9
|
Merge r5959 from nihvivo-rel-1.1-maint
|
2010-09-28 15:13:34 +00:00 |
|
rjy7
|
22cec61b5e
|
Merge r5942-5952 from nihvivo-rel-1.1.-maint: custom sorting and collation
|
2010-09-28 15:02:04 +00:00 |
|
rjy7
|
db26e25758
|
Merge r5941 from nihvivo-rel-1.1-maint
|
2010-09-27 14:07:42 +00:00 |
|
sjm222
|
bbde9a3eb5
|
merging in updates for NIHVIVO-1157 from branch 1.1
|
2010-09-24 21:45:55 +00:00 |
|
rjy7
|
503652796c
|
Merge r5933:5935 and r5937 from nihvivo-rel-1.1-maint
|
2010-09-24 21:35:03 +00:00 |
|
rjy7
|
715fad38f4
|
Merge r5930 from nihvivo-rel-1.1-maint
|
2010-09-24 14:01:01 +00:00 |
|
rjy7
|
68e5ebefc2
|
NIHVIVO-650 Some reorganization of template model classes. Fix for link list display on individual profile page.
|
2010-09-22 18:06:57 +00:00 |
|
bjl23
|
7931113259
|
merging IndividualJena overrides into trunk
|
2010-09-21 20:40:53 +00:00 |
|
rjy7
|
7b58a73c67
|
NIHVIVO-650: Links and image display; fixed a bug in admin panel display.
|
2010-09-21 19:49:43 +00:00 |
|
rjy7
|
e2407f7b01
|
NIHVIVO-650 Removed url directive from template data model, and replaced with path to the images directory.
|
2010-09-21 16:13:06 +00:00 |
|
rjy7
|
72d43f05a5
|
NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value.
|
2010-09-21 16:05:36 +00:00 |
|
rjy7
|
676d22b3e5
|
NIHVIVO-1150 Refactor ImageUploadController authorization-related methods to a separate AuthorizationHelper class so they can be used by other pages too.
Move message in classGroups template to separate template.
|
2010-09-20 16:19:04 +00:00 |
|
rjy7
|
c0a8d603ed
|
Move template names to enum in FreeMarkerHttpServlet and constants in subclasses.
|
2010-09-20 15:40:35 +00:00 |
|
rjy7
|
0406db8b59
|
Add statusCode to ResponseValues
|
2010-09-17 15:11:03 +00:00 |
|
bjl23
|
0d93be55d4
|
merging avoidance of entity counts to trunk
|
2010-09-16 21:22:16 +00:00 |
|
bjl23
|
7e46f1ed02
|
merging picklist optimizations back into trunk
|
2010-09-16 19:28:34 +00:00 |
|
rjy7
|
d5664d93ec
|
Some refactoring in FreemarkerHttpServlet
|
2010-09-16 15:50:37 +00:00 |
|
rjy7
|
8547665029
|
NIHVIVO-1149 Reintegrate dev-fmservlet branch after finishing restructuring of FreemarkerHttpServlet and subclasses. Two files had to be copied manually.
|
2010-09-15 21:32:32 +00:00 |
|
rjy7
|
ac284cdae7
|
Reverting modifications to LoginFormBean class in r5832, r5834, because those changes did not take into consideration references from JSPs.
|
2010-09-14 21:17:58 +00:00 |
|
rjy7
|
b605b9ca89
|
Merge r5849 from nihvivo-rel-1.1-maint
|
2010-09-13 16:08:03 +00:00 |
|
jeb228
|
195c1fd931
|
NIHVIVO-736 Removed unused code from the LoginFormBean
|
2010-09-10 19:14:30 +00:00 |
|
rjy7
|
c923bf7ba7
|
Changed output of dump() method defined in BaseTemplateModel class
|
2010-09-10 15:01:57 +00:00 |
|
jeb228
|
57cbc5f1e0
|
NIHVIVO-736 Removed unused code and little-used code from the LoginFormBean
|
2010-09-10 14:48:33 +00:00 |
|
rjy7
|
3300b7cda7
|
NIHVIVO-650 Reworked Freemarker sparkline implementation for better controller/view separation
|
2010-09-10 14:24:00 +00:00 |
|
rjy7
|
61956f4cf5
|
NIHVIVO-650 Display label, moniker, and sparkline visualization on Freemarker version of individual profile page
|
2010-09-09 21:57:13 +00:00 |
|
rjy7
|
ca6d805771
|
NIHVIVO-564 Fixes for hash dump
|
2010-09-09 16:18:13 +00:00 |
|
rjy7
|
3269252aaa
|
Initial work moving individual profile page to Freemarker. Includes temporary servlet mappings for new Freemarker page. Allow adding script tags to the page head element.
|
2010-09-08 20:37:28 +00:00 |
|
jeb228
|
140eaef670
|
NIHVIVO-736 Create a Login.java controller to replace login_process.jsp.
|
2010-09-03 20:58:14 +00:00 |
|
jeb228
|
e9fa47d7ed
|
Cosmetic changes: reformat, organize imports, remove commented code.
|
2010-09-03 18:42:52 +00:00 |
|
jeb228
|
53ecff4f60
|
Cosmetic changes: reformat, organize imports, add generic type arguments.
|
2010-09-03 16:17:01 +00:00 |
|
jeb228
|
7d40f99158
|
VIVO-246 Add a filter to limit the lifetime of trivial sessions.
|
2010-09-02 20:14:37 +00:00 |
|
jeb228
|
ddd6de3c89
|
VIVO-241 In order to modify the image, the user must be logged in as editor OR may be self-editing.
|
2010-08-31 21:36:21 +00:00 |
|
jeb228
|
6765cecc54
|
When you begin fake self-editing, you're Admin account is logged out.
|
2010-08-31 21:25:31 +00:00 |
|
jeb228
|
83c1043c9f
|
Clean up the logic and reformat the FakeSelfEditing code. No functional change.
|
2010-08-31 21:23:15 +00:00 |
|