hlm7
|
e258c5292a
|
|
2010-04-13 18:27:13 +00:00 |
|
hlm7
|
3953c41555
|
|
2010-04-13 18:27:04 +00:00 |
|
hlm7
|
37a88715e1
|
|
2010-04-13 18:26:37 +00:00 |
|
hlm7
|
50e75b491b
|
|
2010-04-13 18:26:24 +00:00 |
|
nac26
|
011be7ffe1
|
NIHVIVO-343 merging bug fix into trunk. CSS tweak to correct layout for site admin in ie7
|
2010-04-13 16:51:53 +00:00 |
|
rjy7
|
c95976fbc6
|
Merging changes from rel-1.0-maint branch.
|
2010-04-13 14:44:31 +00:00 |
|
jeb228
|
fd98969be3
|
Merge revisions 415 to the trunk. For bdc34
|
2010-04-13 12:57:52 +00:00 |
|
jeb228
|
b6cf423af4
|
Merge revisions 410 and 443 to the trunk. For sjm222 and bjl23
|
2010-04-13 12:52:14 +00:00 |
|
jeb228
|
107b12c9a3
|
Merge revisions 411 419 422 426 427 428 and 439 to the trunk. For ejc12
|
2010-04-13 12:33:30 +00:00 |
|
rjy7
|
888607cf39
|
NIHVIVO-360 Merge changes from rel-1.0-maint branch: Fixed custom form javascript so required hint spans get removed on cancel in IE. IE transforms the text inserted in the html() call, so a string replace was not removing them.
|
2010-04-12 23:49:23 +00:00 |
|
rjy7
|
a8b39bf005
|
NIHVIVO-356, NIHVIVO-362 Merging custom form fixes from rel-1.0-maint branch.
|
2010-04-12 21:26:09 +00:00 |
|
rjy7
|
60f93a2875
|
Merging Brian L's changes from rel-1.0-maint branch
|
2010-04-12 21:03:24 +00:00 |
|
rjy7
|
f3f1f1bc22
|
NIHVIVO-362 Merge from rel-1.0-maint branch: Fixed comma issues in position history custom short view that were observed while investigating this bug.
|
2010-04-12 19:18:25 +00:00 |
|
hlm7
|
5c416fccb9
|
|
2010-04-12 18:30:51 +00:00 |
|
rjy7
|
f65c491deb
|
NIHVIVO-356 Merge from rel-1.0-maint branch: Change activity form to use vitro ns description property instead of vivo core description property
|
2010-04-12 18:15:39 +00:00 |
|
hlm7
|
9984b87011
|
|
2010-04-12 16:26:00 +00:00 |
|
hlm7
|
d14c463ba4
|
|
2010-04-12 16:25:34 +00:00 |
|
hlm7
|
00771407eb
|
|
2010-04-12 16:25:15 +00:00 |
|
nac26
|
b2047b89f6
|
NIHVIVO-343 merging css fix to Site Admin layout in ie6 from maintenance branch
|
2010-04-12 15:37:30 +00:00 |
|
hlm7
|
2c525dac12
|
Holly made some changes due to end date display change.
|
2010-04-09 20:40:06 +00:00 |
|
rjy7
|
be6c40510b
|
Merge small change to customForm.js into trunk
|
2010-04-09 16:42:14 +00:00 |
|
hlm7
|
29d30111a3
|
|
2010-04-09 15:08:15 +00:00 |
|
hlm7
|
cc1ce38282
|
The RDF importing is timing out. Holly will talk to Jim about fixing this. There is also an external test file.
|
2010-04-09 15:07:54 +00:00 |
|
jeb228
|
aa042e13cf
|
Merged rev 405 into the trunk for ejc.
|
2010-04-09 13:30:53 +00:00 |
|
rjy7
|
1dc1a35569
|
Merged Elly's changes to install.txt on the rel-1.0-maint branch to the trunk
|
2010-04-09 03:35:57 +00:00 |
|
jeb228
|
d894c04387
|
NIHVIVO-306 Copy revision 399 to the trunk.
|
2010-04-08 21:19:01 +00:00 |
|
jeb228
|
4f6090003f
|
NIHVIVO-324 merge revision 397 into trunk
|
2010-04-08 18:51:09 +00:00 |
|
rjy7
|
2f3545796c
|
NIHVIVO-300 Merge changes from rel-1.0-maint to fix ed background short view
|
2010-04-08 15:19:14 +00:00 |
|
jeb228
|
ab2869f469
|
Fix the details of "Version X Release X.X" phrasing.
|
2010-04-08 13:13:31 +00:00 |
|
rjy7
|
5a929d91bc
|
Removed reference to DisplayUtils in activity short view
|
2010-04-07 21:58:00 +00:00 |
|
hlm7
|
ef615759cb
|
|
2010-04-07 21:49:08 +00:00 |
|
hlm7
|
210008a227
|
The CustomActivityForms test suite will not work properly until JIRA issue NIHVIVO-294 is resolved.
|
2010-04-07 21:46:14 +00:00 |
|
rjy7
|
967c53284d
|
NIHVIVO-294 Corrections to custom short view for missing role, missing start date. Merge from /branches/rel-1.0-maint
|
2010-04-07 20:57:35 +00:00 |
|
jeb228
|
9b1429db43
|
Add "upgrade.txt" to the docs directory -- a version-controlled form of the Upgrade document.
|
2010-04-07 17:05:38 +00:00 |
|
rjy7
|
e3efdfcaf6
|
Changed field label from "Name" to "Activity Name" on custom activity form. Remove unused Javascript files.
|
2010-04-06 15:03:51 +00:00 |
|
jeb228
|
077d3ee047
|
Minor changes to markup text, plus adding a pause for association.
|
2010-04-05 18:50:25 +00:00 |
|
rjy7
|
67c28b9e92
|
NIHVIVO-292 Fixed error when creating new professional service activity
|
2010-04-05 18:39:05 +00:00 |
|
jeb228
|
39258af790
|
AddFacultyPosition works again.
|
2010-04-05 18:36:22 +00:00 |
|
jeb228
|
42b89b9400
|
There are no organizations in the test model, so we must create one.
|
2010-04-05 18:35:01 +00:00 |
|
rjy7
|
2fd8efcbca
|
NIHVIVO-291 Added validator to position type to fix position-type related bugs
|
2010-04-05 17:51:17 +00:00 |
|
rjy7
|
d264552364
|
NIHVIVO-195 Fixed custom short view for activities to show date range rather than just start date.
|
2010-04-05 17:20:05 +00:00 |
|
rjy7
|
89380115b5
|
NIHVIVO-195 First draft of custom short view for activities (service, teaching, research, and outreach)
|
2010-04-05 17:16:31 +00:00 |
|
rjy7
|
0822ebbb2d
|
NIHVIVO-195 Add annotations for custom activity forms
|
2010-04-05 15:43:25 +00:00 |
|
bjl23
|
81b0045ede
|
adding a namespace prefix for geopolitical ontology
|
2010-04-05 15:27:36 +00:00 |
|
rjy7
|
1663e9ff2d
|
NIHVIVO-195 Custom activity forms basically working now.
|
2010-04-05 15:27:20 +00:00 |
|
jeb228
|
4d87cf4acb
|
Selenium won't record data entered into TinyMCE - you need to add it to the test yourself.
|
2010-04-05 15:22:38 +00:00 |
|
jeb228
|
eb9c333ad3
|
Page title has changed.
|
2010-04-05 15:22:10 +00:00 |
|
nac26
|
cb2760c1bd
|
NIHVIVO-195 Removed rogue <h1> on line 251
|
2010-04-05 15:01:37 +00:00 |
|
hlm7
|
b49356396b
|
Holly corrected some spelling errors in the comments.
|
2010-04-05 14:55:02 +00:00 |
|
hlm7
|
1ee892b780
|
Holly needs to add the importing and exporting of RDF--just waiting for a sample file from Brian C.
|
2010-04-05 14:54:36 +00:00 |
|