litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1044 commits 9 branches 0 tags 258 MiB
Commit graph

817 commits

Author SHA1 Message Date
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
jeb228
77bba699bf Note more licensing issues. 2010-07-29 13:22:20 +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
mb863
e7328ae668 merge r5446:5449 r5486 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-27 18:40:37 +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
ef3988022f NIHVIVO-825 Allow adding a list of scripts or stylesheets with a single call to add() or addFromTheme() 2010-07-27 15:16:07 +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
bdc34
2968a09613 merge to trunk. Fixing exceptions on submission of null value in dataproperty form. NIHVIVO-1021 2010-07-27 14:44:16 +00:00
nac26
cc0aab3814 merging from nihvivo-rel-1.1-maint branch: removing "new" from form headings in attempt to minimize user confusion NIHVIVO-1012 2010-07-26 21:12:40 +00:00
ass92
bde19b82ac code modification for permanent uri tool to retrieve default namespace. 2010-07-26 19:55:40 +00:00
mb863
6978b85600 NIHVIVO-1015: Fixed: Cropping photo creating extra gap when reducing browser size 2010-07-26 19:33:23 +00:00
rjy7
6862104e24 Merge r5487 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 19:13:56 +00:00
rjy7
37c2990bba Merge r5484 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 18:40:28 +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
nac26
89f3bbfbd8 merge from nihvivo-rel-1.1-maint branch: removed unnecessary <br> 2010-07-24 21:52:47 +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
bdc34
ef3222d0d1 Merge to trunk. Removing debug statement. 2010-07-23 20:47:15 +00:00
bdc34
59801b8dcb Merge to trunk. Fixing error when deleting properties on front end NIHVIVO-953 2010-07-23 20:45:37 +00:00
bjl23
44976b4b72 merging changes for NIHVIVO-959 fillExistingObjectPropertyStatements error 2010-07-23 18:06:22 +00:00
cdtank
32fa4851a6 1. Commented out servlet mapping for dummy vis servlet which contained links to various test individuals. 2010-07-23 16:05:03 +00:00
mb863
0f7d3cbaca Merged manually some changes 2010-07-23 15:52:13 +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