rjy7
|
d255909f3b
|
Added "cancel" link to add new organization box on edit version of position history custom form. Previously had only been present on educational background form. Removed the link in non-Javascript version.
|
2010-04-15 19:34:26 +00:00 |
|
rjy7
|
a5f9d133c0
|
NIHVIVO-377 When a custom form fails validation due to a missing organization, the server generates an error appropriate to the non-Javascript version of the form, and the Javascript then modifies it for the Javascript version of the form.
|
2010-04-14 21:28:11 +00:00 |
|
rjy7
|
1f2b200320
|
Improved custom form behavior so after returning from a failed submission due to validation errors, we can return to the view we were on, without attempting to detect that from the organization input field data (since if all three fields are empty we cannot determine the previous view).
|
2010-04-14 20:33:42 +00:00 |
|
rjy7
|
34e80cff4e
|
Merging r447 through r448 (Brian Caruso's custom form validation code) from rel-1.0-maint
|
2010-04-14 18:48:12 +00:00 |
|
hlm7
|
6633aa3a70
|
|
2010-04-14 18:40:37 +00:00 |
|
hlm7
|
8adff65f4c
|
|
2010-04-14 18:40:12 +00:00 |
|
hlm7
|
1a3405fe05
|
|
2010-04-14 18:39:26 +00:00 |
|
jeb228
|
443d200ef3
|
Add output line so we know what suite we are running.
|
2010-04-14 15:47:10 +00:00 |
|
rjy7
|
36e79de5ff
|
NIHVIVO-379 Merge vitro nihvivo-rel-1.0 r4753, vitro rel-1.0-maint r477: Remove front end editing capabilities from moniker, blurb, and citation.
|
2010-04-14 15:09:12 +00:00 |
|
rjy7
|
010a143880
|
Merging revision 474 from rel-1.0-maint.
|
2010-04-13 23:24:35 +00:00 |
|
rjy7
|
83d1b564ef
|
NIHVIVO-377 Initial work on getting custom form to retrieve its past state after a failed form submission. Not all cases working yet.
|
2010-04-13 23:05:28 +00:00 |
|
bjl23
|
b5db8baf0e
|
merging label change back to the trunk
|
2010-04-13 21:01:36 +00:00 |
|
hlm7
|
3f51b8a32d
|
|
2010-04-13 19:37:29 +00:00 |
|
ejc12
|
d827b20459
|
Added a section to have them remove the Location "edit/forms" deny from all. Manual merge from branch.
|
2010-04-13 19:04:35 +00:00 |
|
rjy7
|
b8ccb8d9ef
|
Improvements to handling of required hints in customForm.js
|
2010-04-13 18:50:38 +00:00 |
|
ejc12
|
a81c768bb6
|
Merge rev 460 to trunk. Includes context changes.
|
2010-04-13 18:31:40 +00:00 |
|
hlm7
|
1b060d931d
|
|
2010-04-13 18:27:24 +00:00 |
|
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 |
|