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

4935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jon Corson-Rikert
9bbe7ec11d Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-06 16:57:45 -05:00
Jon Corson-Rikert
46db6f6933 Added Software to the class group publications (“research”); corrected class group name on Protocol; relabeled “documentation for service” to “documentation for project or resource” 2013-12-06 16:56:40 -05:00
tworrall
fb7015827d Merge branch 'maint-rel-1.6' into develop 2013-12-06 16:51:33 -05:00
tworrall
e16acae541 some template clean up that wasn't of blocker significance 2013-12-06 16:51:07 -05:00
hudajkhan
57aa67ab03 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-06 16:09:17 -05:00
Jon Corson-Rikert
ea93eea861 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 
Conflicts:
	rdf/tbox/firsttime/initialTBoxAnnotations.n3
 2013-12-06 13:47:09 -05:00
Jon Corson-Rikert
f7863669e8 Minor changes to hide additional eagle-i properties that are deprecated or involve classes not currently in VIVO 2013-12-06 13:23:57 -05:00
brianjlowe
b145aa6b0d Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-06 12:52:12 -05:00
brianjlowe
806e498f0c Merge branch 'maint-rel-1.6' into develop 2013-12-06 12:51:56 -05:00
brianjlowe
dba0fafea1 VIVO-624 removed 8 object properties whose domain or range classes aren't being included 2013-12-06 12:51:03 -05:00
tworrall
38d79f2320 Merge branch 'maint-rel-1.6' into develop 2013-12-06 12:25:57 -05:00
tworrall
ad93f4bde8 minor css tweaks 2013-12-06 12:25:36 -05:00
hudajkhan
f30e6d5dc2 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-06 10:12:08 -05:00
hudajkhan
a891f14d10 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-06 10:11:55 -05:00
hudajkhan
3fbefbbe35 Merge branch 'maint-rel-1.6' into develop 2013-12-05 16:22:07 -05:00
brianjlowe
5040b6cde5 Merge branch 'maint-rel-1.6' into develop 2013-12-05 16:21:10 -05:00
brianjlowe
1ed07aa8c8 remove hasAccessionNumber, which only applies to reagents and the like 2013-12-05 16:20:22 -05:00
hudajkhan
19880d2dc7 deleting this file as doesn't appear to be used anywhere 2013-12-05 16:19:52 -05:00
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