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 |
|
jeb228
|
1da043245c
|
Merge 5441 from the branch
|
2010-07-23 14:00:43 +00:00 |
|
jeb228
|
bcf67db895
|
/.settings directory was committed by mistake.
|
2010-07-23 13:27:00 +00:00 |
|
jeb228
|
50bdd940ce
|
/bin directory was committed by mistake.
|
2010-07-23 13:25:45 +00:00 |
|
ass92
|
1f4a99f770
|
Display statement correction.
|
2010-07-22 22:49:02 +00:00 |
|
ass92
|
b9498fc5f7
|
NIHVIVO-934,935 code corrections for Merge Individual tool.
|
2010-07-22 22:48:01 +00:00 |
|
bjl23
|
c2ad9176d0
|
fixing compile errors from merge problem with SelectListGenerator
|
2010-07-22 21:48:32 +00:00 |
|
rjy7
|
7758eca11b
|
Merge r5431 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-22 21:33:32 +00:00 |
|
bjl23
|
4f3664b905
|
some merges back to the trunk that I forgot to commit earlier
|
2010-07-22 21:28:28 +00:00 |
|
nac26
|
4cd59ee32d
|
merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846
|
2010-07-22 21:25:12 +00:00 |
|
bdc34
|
76304b76dc
|
Merging to trunk. Pick list filtering.
|
2010-07-22 21:21:04 +00:00 |
|
bdc34
|
2eca05053e
|
Merging to trunk. Fixing error when deleting properties on front end NIHVIVO-953
|
2010-07-22 21:15:57 +00:00 |
|
bdc34
|
8413938501
|
Merge to trunk. Adding cancel button to default object property form. NIHVIVO-951
|
2010-07-22 20:48:12 +00:00 |
|
ass92
|
fb26b874de
|
Filed download correction for merge individuals tool.
|
2010-07-22 20:30:09 +00:00 |
|
jeb228
|
1236e6cf18
|
NIHVIVO-927 Merge 5418 from the branch.
|
2010-07-22 20:23:20 +00:00 |
|
jrm424
|
9568bd8479
|
|
2010-07-22 20:11:40 +00:00 |
|
jrm424
|
9eb632fcfa
|
added support for con areas and usda areas collection
|
2010-07-22 20:11:04 +00:00 |
|
jrm424
|
feade16791
|
added support for con areas and usda areas rdf gen
|
2010-07-22 20:10:06 +00:00 |
|
jrm424
|
3399be2339
|
added support for con areas and usda areas grouping
|
2010-07-22 20:08:56 +00:00 |
|
jrm424
|
7b75aad66a
|
added support for con areas and usda areas rdf generation
|
2010-07-22 20:07:59 +00:00 |
|
jrm424
|
5605e6b9d7
|
corrected spelling of data properties 'geographicFocusOf' etc
|
2010-07-22 20:07:29 +00:00 |
|
jrm424
|
f242e78b14
|
corrected spelling of data properties 'domesticGeographicFocusOf' etc
|
2010-07-22 20:01:05 +00:00 |
|
jrm424
|
f7e45b4c2f
|
fixed a bug that treated 'other' funding strings like std pick list funding entries
|
2010-07-22 19:59:02 +00:00 |
|
jrm424
|
3e04acd993
|
added support for con areas and usda areas local cluster and collect
|
2010-07-22 19:56:44 +00:00 |
|
jrm424
|
f2ed3bacc7
|
added support for con areas and usda areas global collect, group and rdf generation
|
2010-07-22 19:55:33 +00:00 |
|
bdc34
|
682495f2cd
|
removing .classpath and .project
|
2010-07-22 19:48:00 +00:00 |
|
jeb228
|
d3bba71a13
|
NIHVIVO-927 Merge 5404 from the branch.
|
2010-07-22 19:26:50 +00:00 |
|
rjy7
|
a82411b2f0
|
merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-22 18:47:44 +00:00 |
|
nac26
|
fa77c80a91
|
merge from nihvivo-rel-1.1-maint branch: moving the individual rendering changes back to the vitro
|
2010-07-22 18:38:29 +00:00 |
|
bdc34
|
23007ba45e
|
MERGEING r5396 from nihvivo-rel-1.1-maint BY HAND . Fixing code to build search index at ontology update NIHVIVO-900
|
2010-07-22 18:34:48 +00:00 |
|
bdc34
|
e95fd811f0
|
Merged to trunk. Fixing code to build search index at ontology update NIHVIVO-900
|
2010-07-22 18:29:12 +00:00 |
|
nac26
|
1267a25203
|
merge from nihvivo-rel-1.1-maint branch: fixing some "thumnail" typos
|
2010-07-22 18:11:02 +00:00 |
|
ass92
|
ef712eb11a
|
NIHVIVO-945 code change for generation of local names with positive integers.
|
2010-07-22 17:51:15 +00:00 |
|
ass92
|
035c4c3735
|
NIHVIVO-936 code change to keep local name intact for change namespace utility
|
2010-07-22 16:53:54 +00:00 |
|
rjy7
|
4b990e4649
|
Merge r5382 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-22 15:44:34 +00:00 |
|
jeb228
|
1c62224b6d
|
NIHVIVO-927 Merge 5386 from branch.
|
2010-07-22 15:22:18 +00:00 |
|
bdc34
|
7911fa6490
|
Merged to trunk. Changed the way a new individual is created on the siteAdmin NIHVIVO-881
|
2010-07-22 15:19:15 +00:00 |
|
ass92
|
4a6aa63393
|
NIHVIVO-932 made namespace retrieval change in permanent uri tool
|
2010-07-22 15:17:07 +00:00 |
|
jeb228
|
724aa4d326
|
Merge 5379
|
2010-07-22 14:20:43 +00:00 |
|
jeb228
|
50cc897669
|
NIHVIVO-918 Merge 5377 from branch
|
2010-07-22 14:10:30 +00:00 |
|
bdc34
|
38130db941
|
Merging to Trunk. Changing addPublicationToPerson.jsp to skip form when trying to edit an existing authorship, NIHVIVO-912
|
2010-07-22 00:38:11 +00:00 |
|
rjy7
|
e3d09333c4
|
Merge r5371:5373 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
|
2010-07-21 22:02:11 +00:00 |
|
jrm424
|
017b81633f
|
small fixes to rdf generators, typos etc.
ambiguity in naming of Partner and Researcher Role individuals
fixed by adding CE = Collab entity or CI = collab investigator
to individual names
|
2010-07-21 20:38:23 +00:00 |
|
jrm424
|
fbbb94f2df
|
new acti ontology
|
2010-07-21 20:34:03 +00:00 |
|
jrm424
|
8bd7c55824
|
extended aiIngest to incorporate rdf generation steps
|
2010-07-21 20:33:17 +00:00 |
|
jrm424
|
409ff68ce7
|
add base xmls for classes that we don't want to have repeated equivelant indiviuals
also added Users.xml to prime the pump. this file should be regenerated frequently
|
2010-07-21 20:32:07 +00:00 |
|
jeb228
|
0459959ae7
|
NIHVIVO-701 Merge 5366 from branch
|
2010-07-21 19:40:40 +00:00 |
|
bdc34
|
12b933fa32
|
merging code to deal with duplicate international areas.
|
2010-07-21 18:47:00 +00:00 |
|
bdc34
|
0b97ec523b
|
merging URL validation in defaultLinkForm.jsp
|
2010-07-21 18:44:34 +00:00 |
|