Skip to content

Commit 7a56c58

Browse files
kcondonkcondon
authored
Merge pull request #3955 from IQSS/develop
v4.7
2 parents b0fd002 + 7f4309b commit 7a56c58

164 files changed

Lines changed: 3295 additions & 624 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Contributing to Dataverse
22

3-
Thank you for your interest in contributing to Dataverse! We welcome contributions of ideas, bug reports, usability testing, documentation, code, and more!
3+
Thank you for your interest in contributing to Dataverse! We are open to contributions from everyone. You don't need permission to participate, just jump in using the resources below. If you have questions, reach out to us on the [#dataverse IRC channel][], and hang around a while, as it may take time for community members to de-idle.
4+
5+
We aren't just looking for developers, there are many ways to contribute to Dataverse. We welcome contributions of ideas, bug reports, usability research/feedback, documentation, code, and more!
46

57
## Ideas/Feature Requests
68

@@ -26,7 +28,7 @@ An issue is a bug (a feature is no longer behaving the way it should) or a featu
2628

2729
Before submitting an issue, please search the existing issues by using the search bar at the top of the page. If there is an existing issue that matches the issue you want to report, please add a comment to it.
2830

29-
If there is no pre-existing issue, please click on the "New Issue" button, log in, and write in what the issue is (unless it is a security issue which should be reported privately to [email protected]). Someone on the Dataverse development team will appropriately tag and assign it to a member of the Dataverse development team.
31+
If there is no pre-existing issue, please click on the "New Issue" button, log in, and write in what the issue is (unless it is a security issue which should be reported privately to [email protected]).
3032

3133
If you do not receive a reply to your new issue or comment in a timely manner, please email [email protected] with a link to the issue.
3234

@@ -51,12 +53,11 @@ The source for the documentation at http://guides.dataverse.org is in the GitHub
5153

5254
Before you start coding, please reach out to us either on the [dataverse-community Google Group][], the [dataverse-dev Google Group][], [IRC][] (#dataverse on freenode), or via [email protected] to make sure the effort is well coordinated and we avoid merge conflicts.
5355

54-
We will encourage you to create a GitHub issue (if it doesn't exist already) to associate with your pull request.
55-
56-
We hope you find the Developer Guide at http://guides.dataverse.org/en/latest/developers helpful.
56+
Please read http://guides.dataverse.org/en/latest/developers/version-control.html to understand how we use the "git flow" model of development and how we will encourage you to create a GitHub issue (if it doesn't exist already) to associate with your pull request.
5757

58-
After making your pull request, your goal should be to help it advance through our kanban board at https://waffle.io/IQSS/dataverse . If no one has moved your pull request to the code review column in a timely manner, please reach out. Thanks!
58+
After making your pull request, your goal should be to help it advance through our kanban board at https://waffle.io/IQSS/dataverse . If no one has moved your pull request to the code review column in a timely manner, please reach out. We maintain a list of [community contributors][] so please let us know if you'd like to be added or removed from the list. Thanks!
5959

6060
[dataverse-community Google Group]: https://groups.google.com/group/dataverse-community
6161
[dataverse-dev Google Group]: https://groups.google.com/group/dataverse-dev
6262
[IRC]: http://chat.dataverse.org
63+
[community contributors]: https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Welcome! New contributors should at least glance at [CONTRIBUTING.md](/CONTRIBUT
44

55
## Related Issues
66

7-
- connects to [#issue number]: [issue title]
7+
- connects to #ISSUE_NUMBER: ISSUE_TITLE
88

99
## Pull Request Checklist
1010

‎README.md‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
11
Dataverse®
22
===============
33

4-
Dataverse is an open source web application for sharing, citing, analyzing, and preserving research data (developed by the [Data Science and Products team](http://www.iq.harvard.edu/people/people/data-science-products) at the [Institute for Quantitative Social Science](http://iq.harvard.edu/)).
4+
Dataverse is an [open source][] web application for sharing, citing, analyzing, and preserving research data (developed by the [Data Science and Products team](http://www.iq.harvard.edu/people/people/data-science-products) at the [Institute for Quantitative Social Science](http://iq.harvard.edu/) and the [Dataverse community][]).
55

6-
Institutions and organizations can choose to install the Dataverse software for their own use.
7-
In this case, the institution will be responsible for maintaining the application; installing upgrades,
8-
setting up backups and data replication as needed. Dataverse 4.0 is now released and used by the Harvard Dataverse: [dataverse.harvard.edu](http://dataverse.harvard.edu/). If you'd like to first test it, you can use our demo site: [demo.dataverse.org](http://demo.dataverse.org).
6+
[dataverse.org][] is our home on the web and shows a map of Dataverse installations around the world, a list of [features][], [integrations][] that have been made possible through [REST APIs][], our development [roadmap][], and more.
97

10-
For more general information about Dataverse please visit [dataverse.org](http://dataverse.org).
8+
We maintain a demo site at [demo.dataverse.org][] which you are welcome to use for testing and evaluating Dataverse.
119

12-
The Dataverse code is *open-source* and *free*.
10+
To install Dataverse, please see our [Installation Guide][] which will prompt you to download our [latest release][].
1311

14-
Dataverse releases are available for download from https://github.com/IQSS/dataverse/releases and installation instructions can be found in the [Installation Guide](http://guides.dataverse.org/en/latest/installation/).
12+
To discuss Dataverse with the community, please join our [mailing list][], participate in a [community call][], chat with us at [chat.dataverse.org][], or attend our annual [Dataverse Community Meeting][].
13+
14+
We love contributors! Please see our [Contributing Guide][] for ways you can help.
1515

1616
Dataverse is a trademark of President and Fellows of Harvard College and is registered in the United States.
1717

1818
[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg?raw=true "Dataverse Project")](http://dataverse.org)
1919

20-
[![Build Status](https://travis-ci.org/IQSS/dataverse.svg?branch=master)](https://travis-ci.org/IQSS/dataverse) [![Coverage Status](https://coveralls.io/repos/IQSS/dataverse/badge.svg?branch=master&service=github)](https://coveralls.io/github/IQSS/dataverse?branch=master)
20+
[![Build Status](https://travis-ci.org/IQSS/dataverse.svg?branch=develop)](https://travis-ci.org/IQSS/dataverse) [![Coverage Status](https://coveralls.io/repos/IQSS/dataverse/badge.svg?branch=develop&service=github)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
21+
22+
[dataverse.org]: https://dataverse.org
23+
[demo.dataverse.org]: https://demo.dataverse.org
24+
[Dataverse community]: https://dataverse.org/developers
25+
[Installation Guide]: http://guides.dataverse.org/en/latest/installation/index.html
26+
[latest release]: https://github.com/IQSS/dataverse/releases
27+
[features]: https://dataverse.org/software-features
28+
[roadmap]: https://dataverse.org/goals-roadmap-and-releases
29+
[integrations]: https://dataverse.org/integrations
30+
[REST APIs]: http://guides.dataverse.org/en/latest/api/index.html
31+
[Contributing Guide]: CONTRIBUTING.md
32+
[mailing list]: https://groups.google.com/group/dataverse-community
33+
[community call]: https://dataverse.org/community-calls
34+
[chat.dataverse.org]: http://chat.dataverse.org
35+
[Dataverse Community Meeting]: https://dataverse.org/events
36+
[open source]: LICENSE.md

‎doc/sphinx-guides/source/_static/api/user-add.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"firstName": "Lisa",
3+
"lastName": "Simpson",
4+
"userName": "lsimpson",
5+
"affiliation": "Springfield",
6+
"position": "Student",
7+
"email": "[email protected]"
8+
}

‎doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-footer.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<style>
2+
/* NOTE: You can use the custom CSS configuration to move this CSS your own stylesheet. */
3+
4+
/* Overwrite default footer styles to make room at the bottom of the browser page for our custom footer... */
5+
html, body {
6+
height: 100%;
7+
}
8+
#content.container {
9+
min-height: calc(100% - 210px);
10+
margin-bottom: -142px;
11+
}
12+
#content.container:after {
13+
content: "";
14+
display: block;
15+
}
16+
#footer {
17+
color: #a9a9a9; margin-top:0px; padding-bottom:0px; bottom:-150px; position: relative;
18+
}
19+
20+
/* Place custom footer just above default footer at the bottom of the page... */
21+
#custom-footer, #content.container:after {
22+
height: 142px;
23+
}
24+
#custom-footer {
25+
background: #414141; color: #a9a9a9; min-height: 100px; padding: 1.25em 0 100px 0;
26+
}
27+
#custom-footer a {
28+
color: #fff;
29+
}
30+
</style>
31+
<div id="custom-footer">
32+
<div class="container">
33+
<p>SAMPLE FOOTER TEXT</p>
34+
<p class="small">
35+
<a href="https://dataverse.org" title="SAMPLE LINK" target="_blank">SAMPLE LINK</a>
36+
</p>
37+
</div>
38+
</div>

‎doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-header.html‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<style>
2+
/* NOTE: You can use the custom CSS configuration to move this CSS your own stylesheet... */
3+
4+
/* Overwrite default navbar styles to make room at the top of the browser page for our custom header... */
5+
.navbar-fixed-top {
6+
top:50px !important;
7+
}
8+
#dataverse-header-block {
9+
padding-top: 150px;
10+
}
11+
12+
/* Place narrow custom header at the top of the page... */
13+
#custom-header {
14+
background: #414141;
15+
min-height: 44px;
16+
position: fixed;
17+
right: 0;
18+
left: 0;
19+
z-index: 930;
20+
padding-top: 8px;
21+
}
22+
#custom-header a.cst-hdr-link {
23+
line-height: 32px;
24+
color: #BAC5C6;
25+
font-weight: bold;
26+
}
27+
</style>
28+
<div id="custom-header">
29+
<div class="container">
30+
<p class="text-right">
31+
<a class="pull-left" href="https://dataverse.org" title="SAMPLE IMAGE LINK" target="_blank"><img src="/var/www/dataverse/branding/sample.png" alt="SAMPLE IMAGE"/></a>
32+
<a class="cst-hdr-link" href="https://dataverse.org" title="SAMPLE HEADER LINK" target="_blank">SAMPLE HEADER LINK</a>
33+
</p>
34+
</div>
35+
</div>

‎doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-homepage.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
<style>
3+
/* NOTE: You can use the custom CSS configuration to move this CSS your own stylesheet... */
4+
5+
/* Custom CSS for the custom homepage... */
6+
div.jumbotron h1 {color:#C55B28;}
7+
</style>
8+
9+
<div class="jumbotron">
10+
<h1>Hello, world!</h1>
11+
<p>Welcome to our Dataverse.</p>
12+
<p><a class="btn btn-primary btn-lg" href="/dataverse/root" role="button">Browse Data</a></p>
13+
</div>

‎doc/sphinx-guides/source/_static/installation/files/var/www/dataverse/branding/custom-stylesheet.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Add any CSS necessary for your custom content */
2+
3+
.navbar-default {
4+
background-color: gold;
5+
background-image: none;
6+
}

‎doc/sphinx-guides/source/admin/geoconnect-worldmap.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Geoconnect and WorldMap
22
=======================
33

4-
.. contents:: :local:
5-
64
One of the optional components listed under "Architecture and Components" in the :doc:`/installation/prep` section of the Installation Guide is `Geoconnect <https://github.com/IQSS/geoconnect>`_, a piece of middleware that allows Dataverse users to create maps in `WorldMap <http://worldmap.harvard.edu>`_ based on geospatial data stored in Dataverse. For more details on the feature from the user perspective, see the :doc:`/user/data-exploration/worldmap` section of the User Guide.
75

6+
.. contents:: |toctitle|
7+
:local:
8+
89
Update "mapitlink"
910
------------------
1011

‎doc/sphinx-guides/source/admin/harvestclients.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
Managing Harvesting Clients
22
===========================
33

4-
.. contents:: :local:
5-
4+
.. contents:: |toctitle|
5+
:local:
6+
67
Your Dataverse as a Metadata Harvester
78
--------------------------------------
89

0 commit comments

Comments
 (0)