Skip to content

Merge 4.5 into Master#3330

Merged
djbrooke merged 313 commits intomasterfrom
develop
Sep 2, 2016
Merged

Merge 4.5 into Master#3330
djbrooke merged 313 commits intomasterfrom
develop

Conversation

@djbrooke
Copy link
Copy Markdown
Contributor

@djbrooke djbrooke commented Sep 2, 2016

As a final step related to release, make sure that new code is merged into Master.

sekmiller and others added 30 commits June 22, 2016 15:38
Conflicts:
	pom.xml
	src/main/java/edu/harvard/iq/dataverse/Dataverse.java
	src/main/java/edu/harvard/iq/dataverse/api/HarvestingClients.java
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateHarvestingClientCommand.java
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteHarvestingClientCommand.java
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateHarvestingClientCommand.java
	src/main/java/edu/harvard/iq/dataverse/harvest/client/ClientHarvestRun.java
	src/main/java/edu/harvard/iq/dataverse/harvest/client/FastGetRecord.java
	src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java
	src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java
	src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/dataverse_header.xhtml
Also changed messagePanel to blue info on create.
New page for managing OAI server sets.
This should work, the issue is that it is traversing up a directory to this non-existent file:
http://guides.dataverse.org/en/_static/images/githubicon.png

However, if it doesn't, it will load this extant file: http://guides.dataverse.org/en/latest/_static/images/githubicon.png
landreev and others added 26 commits August 18, 2016 17:32
…tainer for popups and not popup body container. [ref #3306]
…re handled asynchronously, without

blocking the page. (still needs to be reviewed).
…service bean.

should not affect any functionality.
(was a formatting conflict, nothing of significance)
Merge branch 'develop' into 4.5-export-harvest

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/Dataset.java
A quick fix to move the exportAll API calls under /api/admin.
Updating version
@djbrooke djbrooke merged commit 067201c into master Sep 2, 2016
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+2.8%) to 7.931% when pulling dc58ae1 on develop into 93597b4 on master.

@pdurbin pdurbin mentioned this pull request Sep 7, 2016
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants