Commit graph

4595 commits

Author SHA1 Message Date
hudajkhan
f56d87d7f6 vivo 613 jar files in vitro 2013-12-04 13:29:38 -05:00
hudajkhan
8377b4502e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-04 12:57:31 -05:00
hudajkhan
9b7e70ec69 Merge branch 'maint-rel-1.6' into develop 2013-12-04 12:57:07 -05:00
hudajkhan
5795a0c65b vivo613 removing files with copyright and utilizing a different set of libraries for semantic search 2013-12-04 12:56:45 -05:00
brianjlowe
649d988703 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-04 10:38:35 -05:00
brianjlowe
d861f17d0c Merge branch 'maint-rel-1.6' into develop 2013-12-04 10:37:59 -05:00
brianjlowe
47d9ff55c8 VIVO-612 remove vivo:TransnationalRegion 2013-12-04 10:37:14 -05:00
Jon Corson-Rikert
2f9d2133a9 minor changes for wording (facility for vs. site for) and adding Protocol to the class group research; made ‘has specified input’ and ‘achieves planned objective’ nobody/nobody 2013-12-04 07:13:18 -05:00
tworrall
72b60c9af1 Merge branch 'maint-rel-1.6' into develop 2013-12-03 15:57:09 -05:00
tworrall
6a1fa38ea0 set the stubObjectProperty annotation to false for owl:sameAs 2013-12-03 15:56:26 -05:00
Jon Corson-Rikert
2932f48aec Tweaks to hide sameAs (nobody/nobody) and adjust facility-org location of/location property labels based on testing 2013-12-03 15:14:24 -05:00
Jon Corson-Rikert
05502153b6 Changes to property configuration for “location of” and “has location” to handle facilities being linked to organizations and other agents, and to move properties on locations into the overview property group 2013-12-03 14:22:08 -05:00
tworrall
70767dc02f Merge branch 'maint-rel-1.6' into develop 2013-12-03 13:45:09 -05:00
tworrall
13c10e3adb correcting class group settings 2013-12-03 13:44:48 -05:00
j2blake
0acebdb665 Merge branch 'maint-rel-1.6' into develop 2013-12-03 12:49:27 -05:00
j2blake
3c8fbbed9f VIVO-574 create acceptance tests for LOD 2013-12-03 12:48:29 -05:00
tworrall
bdc1de733c Merge branch 'maint-rel-1.6' into develop 2013-12-03 10:07:52 -05:00
tworrall
fd1f5b269f VIVO-605: updated generator to make the middle name a separate assertion 2013-12-03 10:06:59 -05:00
Jon Corson-Rikert
f47733b3ff Working to clarify relations between Facility and Event, Facility and Geographic Location, and Geographic Locations and other individuals 2013-12-02 19:13:35 -05:00
Jon Corson-Rikert
bfabd2beea Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-02 18:05:00 -05:00
Jon Corson-Rikert
13f6557866 Additional changes to property groups focusing on Project and Research Project 2013-12-02 18:04:48 -05:00
Holly Mistlebauer
2d66912819 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-02 17:43:02 -05:00
Holly Mistlebauer
4ea1f57f74 Holly automated as many of the formerly manual tests as possible plus updated other tests to make sure all fields are tested. 2013-12-02 17:42:41 -05:00
tworrall
2672324530 Merge branch 'maint-rel-1.6' into develop 2013-12-02 17:07:16 -05:00
tworrall
19c95c1670 fixes for VIVO-591, VIVO-592, VIVO-594, VIVO-597, VIVO-598 and VIVO-601 2013-12-02 17:06:51 -05:00
tworrall
b6545d65dc Merge branch 'maint-rel-1.6' into develop 2013-12-02 16:49:09 -05:00
tworrall
a3b9674c30 VIVO-586: added css selector 2013-12-02 16:48:44 -05:00
brianjlowe
dd24baad8b VIVO-596 adding Grant properties to Contract 2013-12-02 15:43:39 -05:00
Jon Corson-Rikert
994684a29e Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-02 13:24:18 -05:00
Jon Corson-Rikert
188087c993 Further changes to property group and class group membership, primarily for Service and its subclasses but also to enable a create option for a hasPart relationship with geographic locations 2013-12-02 13:24:01 -05:00
hudajkhan
ce4b008c96 Merge branch 'maint-rel-1.6' into develop 2013-12-02 13:10:05 -05:00
hudajkhan
fe6f099a2a VIVO 590 updating manageWebpagesGenerator to include range uri for cancel link 2013-12-02 13:09:52 -05:00
tworrall
99fac43ab9 Merge branch 'maint-rel-1.6' into develop 2013-12-02 11:18:22 -05:00
tworrall
803859cec7 VIVO-593: fixed java script issue 2013-12-02 11:18:03 -05:00
tworrall
f73af72ce8 Merge branch 'maint-rel-1.6' into develop 2013-12-02 10:58:03 -05:00
tworrall
cabd58dd0a updates for issues VIVO-507 and VIVO-589 2013-12-02 10:57:42 -05:00
Holly Mistlebauer
b672cf7e0b Holly changed more test cases as a result of RC 3. 2013-11-30 23:07:39 -05:00
Holly Mistlebauer
801c8a8716 Holly made more RC3 test case changes. 2013-11-27 22:47:14 -05:00
Holly Mistlebauer
1696edb642 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-27 17:08:06 -05:00
Holly Mistlebauer
a6368b437e Holly's test case changes for RC 3. 2013-11-27 17:07:41 -05:00
Jon Corson-Rikert
8ec28b71de Continued minor changes in property placement and ordering 2013-11-26 17:18:39 -05:00
j2blake
e82c731e79 Merge branch 'maint-rel-1.6' into develop 2013-11-26 16:04:31 -05:00
j2blake
81ca857fc3 VIVO-530 Adjust SPARQL Update API 2013-11-26 16:03:47 -05:00
tworrall
4f8b78450a Merge branch 'maint-rel-1.6' into develop 2013-11-26 13:40:08 -05:00
tworrall
5f04cf091a convert check for class group label to class group uri 2013-11-26 13:39:54 -05:00
tworrall
c10733c911 Merge branch 'maint-rel-1.6' into develop 2013-11-26 12:18:31 -05:00
tworrall
664833353c VIVO-575 and VIVO-576 2013-11-26 12:18:12 -05:00
Stephen V. Williams
733891f735 Update continents.n3
removed Oceania as a Continent and replaced it with Antarctica
2013-11-26 10:05:16 -07:00
brianjlowe
788d762f06 Merge branch 'maint-rel-1.6' into develop 2013-11-26 10:50:53 -05:00
brianjlowe
dcba78b0ff PropertyConfig.n3 typo fixes and offerCreateNewOption additions 2013-11-26 10:47:11 -05:00