nac26
|
d3b8b89de4
|
removed forcing of portal on login/logout
|
2010-08-05 17:59:43 +00:00 |
|
jeb228
|
3b392c7eba
|
NIHVIVO-1045 If a request to delete an image comes from a fly-out link on the display page, then that's the page we should return to.
|
2010-08-05 16:04:24 +00:00 |
|
jeb228
|
28cdade5dd
|
Remove a bug that was introduced by revision 5584 - use ACTION_DELETE_EDIT when drawing the replace-image page.
|
2010-08-05 15:58:29 +00:00 |
|
jeb228
|
7263b11672
|
NIHVIVO-813 the file storage system will delete any parent directories that become empty as a result of deleting a file.
|
2010-08-05 15:35:50 +00:00 |
|
rjy7
|
107162012a
|
NIHVIVO-564 Refactoring in FreemarkerHelper to take Configuration object in constructor and store as instance variable; individual methods don't need the param.
|
2010-08-05 15:32:48 +00:00 |
|
rjy7
|
528414e4c7
|
Some renaming in dump directives
|
2010-08-05 15:25:03 +00:00 |
|
jeb228
|
9311e83827
|
NIHVIVO-737 Clean up file logic. Create a FileInfo class that holds all relevant info about an uploaded File (mimeType, filename, URI, bytestream). Create an ImageInfo class that holds to FileInfo objects. Create factory methods for each of these classes. Client code becomes much simpler.
|
2010-08-05 14:55:40 +00:00 |
|
sjm222
|
802e5bc1ab
|
merging in 1.1 branch changes
|
2010-08-03 14:25:31 +00:00 |
|
jeb228
|
7fd7fbcc27
|
NIHVIVO-705 NIHVIVO-789 Use a Flattening Template Loader for templates from Vitro core, instead of flattening the template directory during the build process.
|
2010-07-30 14:23:18 +00:00 |
|
rjy7
|
b90efc74fb
|
NIHVIVO-564 Added infrastructure for dumping template model objects.
|
2010-07-29 17:39:56 +00:00 |
|
rjy7
|
5e8eb80732
|
NIHVIVO-564 Modifications to directive help output. Included changing template directive iface to an abstract class that provides a default help() method and some utilities.
|
2010-07-29 17:08:27 +00:00 |
|
jeb228
|
34799b02ed
|
Remove the requirement for a namespace ending in "/individual/" - print a warning, but go on.
|
2010-07-29 16:02:10 +00:00 |
|
rjy7
|
1403274f72
|
NIHVIVO-564 Add license text
|
2010-07-29 15:33:36 +00:00 |
|
rjy7
|
8ccac59d4a
|
NIHVIVO-564 data model dump: add help for directives in the data model
|
2010-07-29 15:26:37 +00:00 |
|
rjy7
|
2a50ff7f85
|
NIHVIVO-564 Add name of containing template to dataModelDump output
|
2010-07-29 14:03:27 +00:00 |
|
rjy7
|
1ccde72b40
|
NIHVIVO-564 Going back to using toString() methods for template model dump since it already handles nested collections. Improvements to DumpDataModelDirective so it dumps out values as well as variable names.
|
2010-07-29 13:44:53 +00:00 |
|
jeb228
|
98e5283ab1
|
NIHVIVO-962 Merge 5539 from branch
|
2010-07-29 13:30:55 +00:00 |
|
jeb228
|
c0ee32b498
|
NIHVIVO-962 Merge 5538 from branch
|
2010-07-29 13:30:00 +00:00 |
|
jeb228
|
be57b724ec
|
NIHVIVO-962 Merge 5537 from branch
|
2010-07-29 13:28:52 +00:00 |
|
jeb228
|
6bb9980fc3
|
NIHVIVO-962 Merge 5536 from branch
|
2010-07-29 13:27:35 +00:00 |
|
rjy7
|
e6a65f5ad0
|
NIHVIVO-564 Dump directive
|
2010-07-28 17:48:03 +00:00 |
|
rjy7
|
5359909ae7
|
Added linebreak at end of script and stylesheet tags, for readability in html source.
|
2010-07-28 16:20:10 +00:00 |
|
rjy7
|
f4b6f3e941
|
NIHVIVO-564 Change datatype of Script and Stylesheet collections from List to LinkedHashSet, to prevent duplication while retaining ordering.
|
2010-07-28 15:16:14 +00:00 |
|
rjy7
|
3317419fcf
|
NIHVIVO-564 Enable adding stylesheets in dump ftls
|
2010-07-28 15:07:55 +00:00 |
|
rjy7
|
067f896a1f
|
Add license text
|
2010-07-28 13:08:45 +00:00 |
|
sjm222
|
dcd7f10b58
|
merging in revision 5523, changing object property sort method to account for nulls
|
2010-07-27 22:18:36 +00:00 |
|
rjy7
|
b9ac586c20
|
NIHVIVO-564 Work on dump directive
|
2010-07-27 22:00:13 +00:00 |
|
rjy7
|
83938a2c19
|
NIHVIVO-564 Work on dump directive
|
2010-07-27 21:49:40 +00:00 |
|
rjy7
|
7f8b9159db
|
Simple refactoring: changed name of freemarker base classes
|
2010-07-27 18:58:27 +00:00 |
|
jeb228
|
ff1e81fe65
|
NIHVIVO-1026 merge 5508 from the branch.
|
2010-07-27 17:25:08 +00:00 |
|
bdc34
|
2de4504d1b
|
Fixing compile error. NIHVIVO-1000
|
2010-07-27 15:55:10 +00:00 |
|
bdc34
|
f4409580b4
|
Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000
|
2010-07-27 15:31:19 +00:00 |
|
rjy7
|
ee782cdfd7
|
NIHVIVO-825 Allow adding a list of scripts or stylesheets with a single call to add() or addFromTheme()
|
2010-07-27 15:15:45 +00:00 |
|
ass92
|
bde19b82ac
|
code modification for permanent uri tool to retrieve default namespace.
|
2010-07-26 19:55:40 +00:00 |
|
jeb228
|
d277692365
|
NIHVIVO-1013 Merge 5482 from the branch.
|
2010-07-26 17:51:35 +00:00 |
|
rjy7
|
b92982dcc0
|
Small modification to code to generate HARDCODED_LITERALS select list.
|
2010-07-26 15:59:02 +00:00 |
|
bdc34
|
367b0c4bfc
|
Merge to trunk. Fixing logging for PropertyGroupDaoJena and downgrading log message NIHVIVO-1006
|
2010-07-26 15:29:49 +00:00 |
|
rjy7
|
3dadfff50b
|
Modified disabled attribute of input tag to support values "disabled" and "true"
|
2010-07-26 15:15:06 +00:00 |
|
ass92
|
019545ccd9
|
removed unnecessary comments.
|
2010-07-25 08:59:08 +00:00 |
|
ass92
|
61d1c9e2df
|
NIHVIVO 1001,1002 - code correction for permanent uri tool.
|
2010-07-25 08:54:24 +00:00 |
|
bdc34
|
60c71ee2ae
|
Merge to trunk. Removing more portal filtering when there is only one portal. NIHVIVO-998
|
2010-07-24 21:57:54 +00:00 |
|
bdc34
|
0b186aaf20
|
Merge to trunk. Adding filtering to EntityMergedPropertyListcontroller NIHVIVO-984
|
2010-07-24 21:36:12 +00:00 |
|
rjy7
|
2be346ee67
|
Merge r5466 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-24 20:25:37 +00:00 |
|
rjy7
|
826679b073
|
Merge r5464 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-24 18:59:50 +00:00 |
|
rjy7
|
92d83f4ac2
|
Merge r5462 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-24 18:08:45 +00:00 |
|
bdc34
|
5671656d5d
|
Merge to trunk. Fixing tab flag 1 filtering when there is only one portal. NIHVIVO-987
|
2010-07-23 21:04:08 +00:00 |
|
bjl23
|
44976b4b72
|
merging changes for NIHVIVO-959 fillExistingObjectPropertyStatements error
|
2010-07-23 18:06:22 +00:00 |
|
bjl23
|
89d9eaa431
|
merging debugging statement removal to trunk
|
2010-07-23 15:31:48 +00:00 |
|
jeb228
|
873a40678a
|
NIHVIVO-961 Merge 5443 from the branch
|
2010-07-23 15:25:33 +00:00 |
|
jeb228
|
1da043245c
|
Merge 5441 from the branch
|
2010-07-23 14:00:43 +00:00 |
|