Commit graph

4595 commits

Author SHA1 Message Date
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
tworrall
7b6075d359 Merge branch 'maint-rel-1.6' into develop 2013-11-21 12:39:48 -05:00
tworrall
ef4a628b1a VIVO-560: hide skos:Concept specific properties from the subclass pages 2013-11-21 12:39:15 -05:00
tworrall
8082e4dbbe Merge branch 'maint-rel-1.6' into develop 2013-11-21 10:07:26 -05:00
tworrall
5a115960b6 VIVO-554: hiding add, update, delete links on the activity side of roles 2013-11-21 10:06:46 -05:00
j2blake
f3999dd48f Merge branch 'maint-rel-1.6' into develop 2013-11-20 17:07:04 -05:00
j2blake
38cb86715c VIVO-541 Rearrange the links on the site admin page. 2013-11-20 17:05:38 -05:00
Jon Corson
6459a1837a Changed to modify user-facing labels 2013-11-20 15:59:15 -05:00
tworrall
08969ad593 Merge branch 'maint-rel-1.6' into develop 2013-11-20 15:14:05 -05:00
tworrall
23314367c5 VIVO-558 2013-11-20 15:13:48 -05:00
tworrall
a1c8200a54 Merge branch 'maint-rel-1.6' into develop 2013-11-20 14:52:08 -05:00
tworrall
d99490a95d VIVO-556: properties appearing twice 2013-11-20 14:51:14 -05:00
tworrall
b3a252274d Merge branch 'maint-rel-1.6' into develop 2013-11-20 12:38:36 -05:00
tworrall
bf5511157f fixed template issue 2013-11-20 12:37:45 -05:00
tworrall
e100d805bc VIVO-552 updates for vivo:Contract 2013-11-19 16:59:47 -05:00
tworrall
04e66272e9 VIVO-552 updates for vivo:Contract 2013-11-19 16:58:41 -05:00
tworrall
6aa8ed4ddd Merge branch 'maint-rel-1.6' into develop 2013-11-19 16:23:18 -05:00
tworrall
6927e7b86d update geo focus map to use localName first, then label 2013-11-19 16:22:29 -05:00
brianjlowe
2474be9072 VIVO-550 and VIVO-551 migration improvements 2013-11-19 16:08:46 -05:00
tworrall
d584cd2756 Merge branch 'maint-rel-1.6' into develop 2013-11-19 11:58:15 -05:00
tworrall
7eacddcea6 VIVO-422 2013-11-19 11:57:46 -05:00
brianjlowe
3387eeda69 VIVO-545 geographic domains/ranges/restrictions 2013-11-19 09:53:59 -05:00
brianjlowe
2ae32542a2 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-18 14:29:33 -05:00