Commit graph

4225 commits

Author SHA1 Message Date
tworrall
ff78326b45 Merge branch 'maint-rel-1.6' into develop 2013-12-11 11:48:47 -05:00
tworrall
c28a73b324 list view config change for VIVO-641 2013-12-11 11:48:27 -05:00
Holly Mistlebauer
d9f7fae757 Holly made final RC 4 changes to test cases 2013-12-10 18:20:03 -05:00
tworrall
6e7e882b98 Merge branch 'maint-rel-1.6' into develop 2013-12-10 17:07:29 -05:00
tworrall
c9d45ae965 VIVO-639 2013-12-10 17:06:51 -05:00
tworrall
8342c950d6 Merge branch 'maint-rel-1.6' into develop 2013-12-10 16:52:08 -05:00
tworrall
42c50be5d6 list view tweak for VIVO-632 2013-12-10 16:51:45 -05:00
tworrall
64bc8ff7c0 Merge branch 'maint-rel-1.6' into develop 2013-12-10 15:48:02 -05:00
tworrall
ba63872b8f VIVO-637 2013-12-10 15:47:21 -05:00
hudajkhan
f90d798937 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 15:40:45 -05:00
tworrall
87a688c1da Merge branch 'maint-rel-1.6' into develop 2013-12-10 14:16:38 -05:00
tworrall
dce8cc39af VIVO-592 2013-12-10 14:16:17 -05:00
hudajkhan
e583e1a98d Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 14:11:38 -05:00
tworrall
2e0c8a07b7 Merge branch 'maint-rel-1.6' into develop 2013-12-10 12:43:11 -05:00
tworrall
220194dc73 VIVO-637 date time generator changes for various date time properties 2013-12-10 12:42:45 -05:00
j2blake
64f9ba8cf9 Merge branch 'maint-rel-1.6' into develop 2013-12-10 11:38:18 -05:00
j2blake
3564cb78aa VIVO-581 Add a diagnostic page 2013-12-10 11:37:57 -05:00
hudajkhan
9a8b3b8262 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 10:29:27 -05:00
Jon Corson-Rikert
62ac5106da changed label from broader term to broader concept 2013-12-10 09:55:28 -05:00
Jon Corson-Rikert
c8d6132eb4 minor tweaks plus adding date/time value custom form annotations to date filed, date issued, globalcountdate, date expires that don’t q quite work yet 2013-12-10 08:08:38 -05:00
Jon Corson-Rikert
d85fff74d9 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-09 18:46:30 -05:00
Jon Corson-Rikert
1b934b6176 Further tweaks to display, domain and range settings for properties that had been missing inverse property statements. Setting skos:related to be an owl:SymmetricProperty 2013-12-09 18:46:18 -05:00
Holly Mistlebauer
2b132e46c9 Holly renamed 4 test cases due to change from testing visiting hours to testing year founded. 2013-12-09 17:37:32 -05:00
Holly Mistlebauer
29cbc7850b Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-09 17:29:27 -05:00
Holly Mistlebauer
4d69707397 Holly made some more test case changes related to RC 4 2013-12-09 17:29:03 -05:00
j2blake
a3dea08034 Merge branch 'maint-rel-1.6' into develop 2013-12-09 17:02:12 -05:00
j2blake
5b28d06582 VIVO-636 update the language files 2013-12-09 16:52:10 -05:00
tworrall
4fa82ac7ee Merge branch 'maint-rel-1.6' into develop 2013-12-09 13:53:35 -05:00
tworrall
0f4a763c1a VIVO-630 and VIVO-634: orcidId fixes 2013-12-09 13:53:11 -05:00
tworrall
4ca662d831 Merge branch 'maint-rel-1.6' into develop 2013-12-09 13:13:56 -05:00
tworrall
f8fe9f870a VIVO-629 added GlobalCitationCount to publications class group 2013-12-09 13:13:31 -05:00
Jon Corson-Rikert
b2756b85d5 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-12-09 12:49:15 -05:00
Jon Corson-Rikert
6e3648f8c8 Added owl:inverse for geopolitical:hasMember, geopolitical:isPredecessorOf, bibo:CitedBy, bibo:reviewOf, bibo:translator, bibo:hasTranslation, vivo:hasAssociatedConcept, vivo:subcontractsGrant, vivo:hasPrerequisite, vivo:hasPublicationVenue, vivo:offeredBy, vivo:publisher, skos:broader as detailed on https://docs.google.com/spreadsheet/ccc?key=0AqosQY8NM9BGdGVub2lKcVdtOE85LW5oRWZOVjlfSFE&usp=sharing 2013-12-09 12:49:06 -05:00
hudajkhan
cbbb5bc612 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-09 12:01:57 -05:00
tworrall
be5409b3be Merge branch 'maint-rel-1.6' into develop 2013-12-09 11:57:24 -05:00
tworrall
496cedaabb range change for VIVO-592 2013-12-09 11:56:58 -05:00
hudajkhan
bf04a4ab6f Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-09 11:25:26 -05:00
Holly Mistlebauer
5bd4d5f893 Holly made another round of test case changes, mostly to help test cases run more smoothly. 2013-12-08 17:03:22 -05:00
Holly Mistlebauer
3bd44b3bd5 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-08 00:02:10 -05:00
Holly Mistlebauer
efeee37b4f Holly committed first batch of test case updates from testing RC 4. 2013-12-08 00:01:43 -05:00
Jon Corson-Rikert
1a69b23b60 Added inverse property relationship between vivo:offers and vivo:offeredBy 2013-12-06 18:41:09 -05:00
Jon Corson-Rikert
bd929d7158 added inverse property relationship between bibo:translator and vivo:translatorOf 2013-12-06 18:16:25 -05:00
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