Commit graph

4467 commits

Author SHA1 Message Date
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
Jon Corson-Rikert
5254043771 Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-11-25 16:52:01 -05:00
Jon Corson-Rikert
8bae848816 Additional changes related to VIVO-557 — duplication of property labels and/or statements where restrictions are in the file graph TBox 2013-11-25 16:51:49 -05:00
tworrall
a98cfddefc Merge branch 'maint-rel-1.6' into develop 2013-11-25 12:50:28 -05:00
tworrall
4a7b2ee3db fixed timing issue in map js 2013-11-25 12:50:13 -05:00
tworrall
ed00b1b728 Merge branch 'maint-rel-1.6' into develop 2013-11-25 10:47:04 -05:00
tworrall
5f848c825e VIVO-573 2013-11-25 10:46:30 -05:00
Jon Corson-Rikert
d779300c9d Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6 2013-11-25 10:10:54 -05:00
Jon Corson-Rikert
2627d1e983 Changes to rearrange properties in the VIVO interface — both ordering and property group membership
VIVO-555
2013-11-25 10:09:11 -05:00
tworrall
ac4c7e6775 Merge branch 'maint-rel-1.6' into develop 2013-11-22 16:21:54 -05:00
tworrall
9045c28afa adjusted some latitudes and logitudes 2013-11-22 16:21:23 -05:00
tworrall
cf1f4854c6 Merge branch 'maint-rel-1.6' into develop 2013-11-22 14:48:02 -05:00
tworrall
6829fc83d1 tweaked a prop-statement list view template 2013-11-22 14:47:42 -05:00
tworrall
126a9c6295 Merge branch 'maint-rel-1.6' into develop 2013-11-22 12:50:45 -05:00
tworrall
79699bd53b for foaf:Persons display geo focus above the tabs 2013-11-22 12:48:43 -05:00
tworrall
3ca485e9e3 Merge branch 'maint-rel-1.6' into develop 2013-11-22 12:17:17 -05:00
tworrall
c66cdbf4aa more property cleanup 2013-11-22 11:59:36 -05:00
brianjlowe
5623eb82d4 VIVO-566 reverting back to vivo:Dataset 2013-11-22 11:34:54 -05:00
tworrall
92315f345c Merge branch 'maint-rel-1.6' into develop 2013-11-22 09:57:06 -05:00
tworrall
27d3b0206c VIVO-567 2013-11-22 09:56:46 -05:00
tworrall
96b88bfe2e Merge branch 'maint-rel-1.6' into develop 2013-11-22 09:21:09 -05:00
tworrall
4f48f9b1e2 need to display contributingRole 2013-11-22 09:20:55 -05:00
brianjlowe
7ce13b3895 set TODO_Dataset as a subclass of Document to get the appropriate cites/citedBy properties 2013-11-21 20:34:42 -05:00
brianjlowe
f65abc9471 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-21 20:22:27 -05:00
brianjlowe
8d2e56177b VIVO-566 ontology prefixes VIVO-565 add new class vivo:Abstract and most of VIVO-566 replace vivo:Dataset with obo:Dataset and add cito properties 2013-11-21 20:22:21 -05:00
tworrall
4b7ba331cc Merge branch 'maint-rel-1.6' into develop 2013-11-21 15:07:03 -05:00
tworrall
6f41e5c8b1 add group, team, et all to drop down lists for service roles 2013-11-21 15:06:47 -05:00
tworrall
0d61bd6268 Merge branch 'maint-rel-1.6' into develop 2013-11-21 13:43:54 -05:00
tworrall
c90fa71bb1 VIVO-563 2013-11-21 13:43:41 -05:00