jeb228
|
b88ed19ed0
|
Merge revisions 4706 4715 4724 4726 4731 4733 4734 4735 4739 to the trunk. For bjl23 and bdc34. Also web.xml from 4719, but not EntityController.java, which causes SVN to barf.
|
2010-04-13 19:51:58 +00:00 |
|
nac26
|
10bf357d5e
|
NIHVIVO-355 merging fix into trunk to hide tagline field
|
2010-04-13 16:50:40 +00:00 |
|
nac26
|
59ac3aff2d
|
NIHVIVO-358 merging bug fixes into trunk
|
2010-04-13 16:49:33 +00:00 |
|
hjk54
|
17ef726ad8
|
Changes and updates related to Datastar (and or testing)
|
2010-04-12 16:23:45 +00:00 |
|
jeb228
|
1fb7530c57
|
Merge revision 4716 from the branch - for bdc34.
|
2010-04-12 14:22:35 +00:00 |
|
jeb228
|
b49a6e3b3a
|
NIHVIVO-340 for bdc34 - Merging 4710 and 4711 into the trunk.
|
2010-04-12 13:29:27 +00:00 |
|
bdc34
|
e65e72a065
|
merging r4717 from nihvivo-rel-1.0-maint to trunk
|
2010-04-09 18:17:52 +00:00 |
|
rjy7
|
211fef1551
|
NIHVIVO-343 Merge changes from nihvivo-rel-1.0-maint: Include add moniker links when user has editing privileges on the moniker.
|
2010-04-09 15:47:08 +00:00 |
|
bdc34
|
75d176e263
|
merging r4708 into trunk.
|
2010-04-08 22:07:04 +00:00 |
|
bdc34
|
5a22f2099d
|
merging r4705 into trunk
|
2010-04-08 21:21:21 +00:00 |
|
rjy7
|
a4497d1fa5
|
NIHVIVO-333 Merge revisions from rel-1.0-maint: Removed choice between image sizes on image upload page. Also added a note explaining that images smaller than 150x150px will not display well.
|
2010-04-08 21:12:27 +00:00 |
|
bdc34
|
59f9edc53f
|
merging r4700 to trunk
|
2010-04-08 20:36:19 +00:00 |
|
rjy7
|
6526c3c882
|
NIHVIVO-331 Merge revision from rel-1.0-maint branch: Provide appropriate error message when a new user logs in, is prompted to change password, and re-enters the original password instead of a new one.
|
2010-04-08 20:13:35 +00:00 |
|
jeb228
|
10b7ba78af
|
NIHVIVO-324 merge revision 4690 into trunk
|
2010-04-08 18:50:22 +00:00 |
|
bdc34
|
e872d9da0f
|
merging revision 4688
|
2010-04-08 18:44:40 +00:00 |
|
bdc34
|
e106dff219
|
merging revision 4685
|
2010-04-08 18:44:25 +00:00 |
|
bdc34
|
db2ba89ecb
|
merging revision 4682
|
2010-04-08 18:43:32 +00:00 |
|
bdc34
|
adfa85142f
|
merging revision 4681
|
2010-04-08 18:43:07 +00:00 |
|
bdc34
|
6eac5a30c4
|
Undoing last revision
|
2010-04-08 18:42:20 +00:00 |
|
bdc34
|
c813094697
|
Merging r4678 to trunk
|
2010-04-08 18:36:50 +00:00 |
|
rjy7
|
caedb8861e
|
Add utilities and corresponding unit tests for manipulation of strings and display dates.
|
2010-04-08 16:44:52 +00:00 |
|
bjl23
|
19a9c79d00
|
copying changes to trunk for NIHVIVO-323 'Include vitro namespace In SPARQL form prefixes'
|
2010-04-08 15:46:39 +00:00 |
|
bjl23
|
66e555b0bf
|
copying changes to trunk for NIHVIVO-322 'Statements added by SPARQL CONSTRUCTs in the ontology updater are not recorded in the log or added statements file'
|
2010-04-08 15:26:13 +00:00 |
|
rjy7
|
a2da8aedde
|
NIHVIVO-312 Changed label "links" to "web pages"
|
2010-04-07 20:51:36 +00:00 |
|
jeb228
|
d7478d2f97
|
Added license tag. Removed unused imports.
|
2010-04-07 18:05:29 +00:00 |
|
bdc34
|
96d902219d
|
Fixing bug with dependent resource delete. NIHVIVO-304
|
2010-04-06 22:04:49 +00:00 |
|
jeb228
|
e709dc4cb3
|
Clean up unused imports.
|
2010-04-06 20:09:21 +00:00 |
|
bdc34
|
103cf1ec18
|
Fixing vitro namespace property edit hiding for blurb, description and citation. NIHVIVO-274
|
2010-04-05 17:26:14 +00:00 |
|
bjl23
|
e31c551260
|
some more minor work on NIHVIVO-23 vitro internal Jena models
|
2010-04-05 17:05:03 +00:00 |
|
bjl23
|
3e23a63be1
|
work on NIHVIVO-23 vitro internal Jena models
|
2010-04-05 17:01:03 +00:00 |
|
bjl23
|
35452e8b36
|
resolves NIHVIVO-171 re: syntactically invalid restrictions
|
2010-04-05 15:59:31 +00:00 |
|
ass92
|
9af96fd76d
|
changed line spacing between PREFIX statements.
|
2010-04-05 15:27:49 +00:00 |
|
bdc34
|
6ab4cdb63c
|
Fixing problem with EdBackground form. processRdfForm2 now checks new resource URIs for duplicates.
|
2010-04-05 15:27:21 +00:00 |
|
rjy7
|
87a690a69c
|
NIHVIVO-195 Working on custom activity forms. Markup is screwed up and form doesn't submit yet.
|
2010-04-05 14:30:48 +00:00 |
|
bjl23
|
745da69072
|
changing some el expression syntax to avoid parse errors
|
2010-04-05 13:43:33 +00:00 |
|
nac26
|
b931993a5e
|
NIHVIVO-121 Tweaked text and overall experience of associating user accounts to individuals. Specifically, limited # of individuals that can be associated (max = 1) and also limited class of individuals available in select list (Person)
|
2010-04-05 13:37:10 +00:00 |
|
bjl23
|
16f3dd4324
|
resolves NIHVIVO-287 cardinality form
|
2010-04-05 13:04:27 +00:00 |
|
sjm222
|
93c25072f9
|
NIHVIVO-216 unit test
|
2010-04-05 12:46:15 +00:00 |
|
bjl23
|
c8172a49ea
|
bugfixes for NIHVIVO-177 and NIHVIVO-205
|
2010-04-05 12:37:40 +00:00 |
|
nac26
|
40dbf58377
|
NIHVIVO-174 Removed Cornell specific example addresses (simply commented out for now)
|
2010-04-05 03:04:11 +00:00 |
|
rjy7
|
41c84beade
|
NIHVIVO-193 On step 1 of position history form, don't show Continue button. Instead, bind the event listener that opens the rest of the form to a selection from the org drop-down.
|
2010-04-04 22:56:33 +00:00 |
|
bdc34
|
4ea2ae107b
|
Fixing bug in PropertyEditLinks when requesting an edit link for a property that doesn't exist.
|
2010-04-03 21:44:23 +00:00 |
|
bdc34
|
6b6cef2e71
|
Removing more portal filtering NIHVIVO-194
|
2010-04-03 00:29:42 +00:00 |
|
bdc34
|
5da58324b8
|
Change individual display so labels for moniker, blurb, citation, and description only appear if the user has edit permissions for those properties. NIHVIVO-275
|
2010-04-02 23:13:09 +00:00 |
|
bjl23
|
4a3ef8d03d
|
minor improvement for NIHVIVO-205 ontology upgrade
|
2010-04-02 22:52:34 +00:00 |
|
bjl23
|
f5627b74a6
|
adding a missing lock release
|
2010-04-02 22:32:13 +00:00 |
|
bjl23
|
0703632f9a
|
improvements for NIHVIVO-205 ontology upgrade
|
2010-04-02 20:55:39 +00:00 |
|
sjm222
|
369454233f
|
extra line between change records, NIHVIVO-205
|
2010-04-02 20:32:35 +00:00 |
|
rjy7
|
8f67bb1fb3
|
NIHVIVO-194 First draft of educational background form. Degree select doesn't get populated, so committing now so BrianC can take a look.
|
2010-04-02 20:15:07 +00:00 |
|
sjm222
|
d3621d8b5b
|
updating a comment
|
2010-04-02 20:12:43 +00:00 |
|