litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4467 commits 8 branches 1 tag 111 MiB
Commit graph

4467 commits

This branch
This branch
All branches
Author SHA1 Message Date
brianjlowe
b1f0b5c922 Merge branch 'maint-rel-1.6' into develop 2013-12-05 16:05:54 -05:00
brianjlowe
691da05ff8 data property adjustments 2013-12-05 16:05:22 -05:00
Jon Corson-Rikert
ef13b2beba Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-05 15:58:30 -05:00
Jon Corson-Rikert
417179fd81 adding Organism to the class group publications (labeled research) to see if the derives from property works 2013-12-05 15:58:19 -05:00
tworrall
935d006963 minor style changes for 2 column foaf person page 2013-12-05 15:15:57 -05:00
tworrall
dfb042a997 minor style changes for 2 column foaf person page 2013-12-05 15:14:45 -05:00
Jon Corson-Rikert
9687b9cb85 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-05 10:41:42 -05:00
Jon Corson-Rikert
86a9c7804c Changes to annotations on eagle-i properties for biological specimen and instrument 2013-12-05 10:41:31 -05:00
brianjlowe
908f480a8c Merge branch 'maint-rel-1.6' into develop 2013-12-05 10:32:43 -05:00
brianjlowe
2251cc09bc adding obo:Organism class 2013-12-05 10:31:49 -05:00
tworrall
140966bc88 Merge branch 'maint-rel-1.6' into develop 2013-12-05 10:17:54 -05:00
tworrall
d1b24fc965 VIVO-621 2013-12-05 10:17:25 -05:00
tworrall
9ad538ac0d Merge branch 'maint-rel-1.6' into develop 2013-12-04 17:11:05 -05:00
tworrall
ec5940c0cc minor js tweak 2013-12-04 17:10:34 -05:00
Jon Corson-Rikert
3daf02651a Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-04 16:47:25 -05:00
Jon Corson-Rikert
aef0e6ce39 Added a statement declaring a research project (obi:ERO_0000014) subclass of vivo:Project 2013-12-04 16:47:09 -05:00
brianjlowe
fd9ebef5b3 Merge branch 'maint-rel-1.6' into develop 2013-12-04 16:35:13 -05:00
brianjlowe
a7670f6c58 disabling sameAs reasoning by default 2013-12-04 16:32:26 -05:00
tworrall
00e8c93ce3 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-04 15:27:19 -05:00
tworrall
12a49ce960 Merge branch 'maint-rel-1.6' into develop 2013-12-04 15:26:45 -05:00
tworrall
3978f30413 minor layout adjustment for when there is no data 2013-12-04 15:26:09 -05:00
hudajkhan
6f5a922034 Merge branch 'maint-rel-1.6' into develop 2013-12-04 13:29:55 -05:00
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