ejc12
b0b6a02b94
Merge: r2222 | ejc12 | 2011-01-16 20:50:47 EST
...
The upgrade-1.2.html is up2date with the content in upgrade-1.2.txt, so I will ask developers to edit upgrade-1.2.html
----------------------------------------------------------------------------
2011-01-17 02:01:44 +00:00
ejc12
ec767f9e22
Removing html dir to avoid confusion. It was my working directory.
2011-01-17 01:51:42 +00:00
ejc12
959940dbc8
The upgrade-1.2.html is up2date with the content in upgrade-1.2.txt, so I will ask developers to edit upgrade-1.2.html
2011-01-17 01:50:47 +00:00
ejc12
c9c7e2bbae
Couple minor corrections.
2011-01-17 01:50:25 +00:00
ejc12
2d03542648
Minor changes...
2011-01-17 01:49:48 +00:00
ejc12
931c2c08c3
The upgrade-1.2.html is up2date with the content in upgrade-1.2.txt, so I will ask developers to edit upgrade-1.2.html
2011-01-17 01:49:25 +00:00
hlm7
f23c15bdfe
Holly made modifications to the AddNonPersonThings test suite due to individual page, date/time, and ontology changes.
2011-01-17 01:21:26 +00:00
nac26
f1a8335106
Merged r 2216 from rel-1.2-maint branch
2011-01-16 22:48:00 +00:00
nac26
f53298509c
NIHVIVO-1073 Added check for no data. Primarily used for initial state after new installation.
2011-01-16 22:43:43 +00:00
nac26
3af090996f
Merged r2214 from the trunk
2011-01-16 19:11:20 +00:00
nac26
de1c8f1aa3
NIHVIVO-1072 Tweaked markup and styles for intro text/welcome text
2011-01-16 19:04:11 +00:00
hlm7
86af2bcca6
Holly update the AddPublications test suite due to changes to the individual page and dates.
2011-01-16 18:16:14 +00:00
jeb228
342ed92d6e
NIHVIVO-1129 allow each test site to have its own SelfEditor name.
2011-01-16 17:58:32 +00:00
jeb228
695718f8e7
NIHVIVO-1129 allow each test site to have its own SelfEditor name.
2011-01-16 15:23:21 +00:00
hlm7
ff258ae405
Holly made changes to test cases due to new individual page and date processing.
2011-01-16 15:00:43 +00:00
hlm7
9da805a53f
Holly changed test cases due to the modifications in the individual page and new dates.
2011-01-16 01:59:47 +00:00
ejc12
b1ef3ae3a9
Moving changes I made in the trunk since the branch was created. I'll work out of here forward.
2011-01-16 01:05:11 +00:00
ejc12
6fb92ed29c
Formatting and cleanup in process.
2011-01-16 00:49:36 +00:00
ejc12
6188966eda
Minor changes...
2011-01-16 00:48:33 +00:00
ejc12
32af04556f
Added <code> tags to file names, directory locations, and variables consistently (hopefully).
2011-01-16 00:00:10 +00:00
rjy7
05fbed9b6e
Record-only merge of r2203 from rel-1.2-maint
2011-01-15 22:28:05 +00:00
rjy7
524d75af97
Merge r2191-2192 from trunk
2011-01-15 22:24:16 +00:00
ejc12
16b781fb5f
Relative fonts and decreasing padding on headings.
2011-01-15 20:58:22 +00:00
ejc12
628108a3b8
Couple minor corrections.
2011-01-15 20:56:53 +00:00
rjy7
e670c805af
Record-only merge of r2197-r2198 from rel-1.2-maint branch
2011-01-15 05:25:55 +00:00
rjy7
469c46e548
Merge r2198 from rel-1.2-maint branch
2011-01-15 05:15:59 +00:00
rjy7
fbd9dd4c09
Minor wording fixes
2011-01-15 05:08:34 +00:00
rjy7
dd0cb09dd3
Merge r2193 from trunk
2011-01-15 05:02:07 +00:00
jeb228
7bc67dd008
Merge revisions 2194 and 2195 from the trunk.
2011-01-14 23:11:29 +00:00
jeb228
d2765c5c29
NIHVIVO-1129 allow specifying the results directory.
2011-01-14 22:58:01 +00:00
jeb228
908089f70a
NIHVIVO-1129 make the release 1.1.1 tests multi-threaded also.
2011-01-14 22:57:04 +00:00
rjy7
59aa4e1f11
Remove sparkline include from individual.ftl
2011-01-14 22:43:26 +00:00
mb863
f417fc609d
NIHVIVO-641: Removed arrow from headers and fixed individual list display.
2011-01-14 22:37:42 +00:00
cdtank
72a5e9414e
1. Making temporal graph vis template for grants to be similar to the publications version.
2011-01-14 22:34:03 +00:00
ejc12
60dfa67110
The install.html is up2date with the content in index.txt, so I will ask developers to edit install.html instead of install.txt if no outstanding changes.
2011-01-14 22:27:13 +00:00
jeb228
c5fa8d4bce
Release 1.2 maintenance branch
2011-01-14 22:18:32 +00:00
cdtank
a952289ed7
1. Changed styling a bit for error messages on temporal graph vis.
2011-01-14 21:56:15 +00:00
cdtank
609e5fd763
1. Removed generic styles so that vivo-sitewide styles are not overridden
...
2. Changed manual script includes to let template it do for us.
3. Changed default 10 colors for temporal graph line bars.
2011-01-14 21:39:11 +00:00
rjy7
2672057996
NIHVIVO-1713 Suppress display of vitro:Keyword property on individual page. Wasn't working on old individual page; back end editing for this property is buggy; and the property itself will be removed in 1.3.
2011-01-14 21:33:40 +00:00
hlm7
e04572a75a
Holly made more changes due to individual page modifications.
2011-01-14 21:28:13 +00:00
mb863
afda97d9ed
NIHVIVO-1072: Removed highlights section from home page. Moved to 1.3
2011-01-14 21:08:43 +00:00
jeb228
a5a1f6f18a
Add license info for JSONtoFmModel.java
2011-01-14 21:06:42 +00:00
hlm7
ef20c1aa8e
Holly made changes to test suites due to individual page change.
2011-01-14 20:41:16 +00:00
mb863
699495a099
NIHVIVO-1716: Made index page theme agnostic
2011-01-14 20:27:30 +00:00
rjy7
219232ba3c
Fix typos
2011-01-14 19:38:25 +00:00
ejc12
94457dab15
Now has the SDB config changes: The install.html is up2date with the content in index.txt, so I will ask developers to edit install.html instead of install.txt.
2011-01-14 19:37:57 +00:00
rjy7
aa88e1f249
NIHVIVO-1332 Moved getImageUploadUrl from UrlBuilder to ObjectPropertyTemplateModel. Temporarily removed hard-coded co-author display from foaf:Person page.
2011-01-14 19:34:19 +00:00
mb863
330b5bd347
NIHVIVO-559: I HAVE REMOVED THE OLD VIVO-BASIC STYLES FROM WILMA. The holdover vivo-basic theme file used for transitioning to wilma theme created temporarily has been removed.
2011-01-14 19:33:45 +00:00
bjl23
d2ba625c57
NIHVIVO-1572 servlet mapping for inference recomputing controller
2011-01-14 19:31:39 +00:00
ejc12
ba978623e8
The install.html is up2date with the content in index.txt, so I will ask developers to edit install.html instead of install.txt.
2011-01-14 19:11:35 +00:00
