Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge IQSS/develop #3

Merged
merged 85 commits into from
Mar 15, 2016
Merged

Merge IQSS/develop #3

merged 85 commits into from
Mar 15, 2016

Conversation

bionary
Copy link
Owner

@bionary bionary commented Mar 15, 2016

No description provided.

michbarsinai and others added 30 commits December 18, 2015 17:58
@michbarsinai
Datasets can now be accesses via the api using their persistent ids. …
6553d33 
…Also updated the native API guide (#1837)
@sekmiller
Merge branch 'develop' into 24-add-DataCite-DOI-Support
bebf135
@sekmiller
Implement DataCite API support
22a5e93
@sekmiller
Remove debug code
470abdf
@raprasad
Show the MapData button for tabular files #2957
d9c0d30
@raprasad
Part of #2957
5b1664a
@sekmiller
Add more DataCite metadata and update error handling #24 and #2917
372af97
@sekmiller
Merge branch 'develop' into 24-add-DataCite-DOI-Support
63e68fa 
# Conflicts:
#	src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
#
src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.j
ava
#	src/main/webapp/dataset.xhtml
@raprasad
working on #2135
800df8e
@sekmiller
#2833 Add custom text to Publish Popup
db8ca37
@raprasad
Part of #2957, includes test queries for adding metadata
3b8d148
@raprasad
Remove duplicate query checks for WorldMap and TwoRavens buttons
a88164e
@raprasad
update properties for explore map button
ccad6ee
@raprasad
For #2957, updates to the MapLayerMetadata object, including SQL upda…
7a7ea6f 
…te commands to add columns
@raprasad
Update setting table for #2135
6169a64
@mheppler
Styled custom text for Publish Dataset popup on the Dataset pg. [ref #…
5b6625c 
…2833]
@mheppler
Styled "Explore" button dropdown for TwoRavens and WorldMap on the Da…
b87766c 
…taset pg. Also styled some other related components, like the "Preview" link and the "Preview Map" popup. [ref #2961]
@raprasad
Part of #2957, show publish reminder button for map data
ffe8236
@sekmiller
#24 fix merge conflicts
94183cf
@sekmiller
#24 Add Installation notes for support of DataCite
feaf0bb
@sekmiller
#2833 Remove debug code
75c8565
@sekmiller
Update config.rst
449c4d0
@sekmiller
#2833 Add settings information for Custom Publishing Text
01adfd1
@raprasad
Add GeoconnectDebug setting for showing/hiding sample queries
64191aa
@raprasad
Merge remote-tracking branch 'origin/develop' into 2957-tab-mapping
0ad74c1
@raprasad
Update to add two ravens viewing
48798ff
@raprasad
Docs for TwoRavens/GeoconnectDebug settings
63947e5
@sekmiller
#24 Add null test for get IdType default
20d7ca2
@raprasad
Merge branch '2957-tab-mapping' of github.com:IQSS/dataverse into 295…
8244271 
…7-tab-mapping
@sekmiller
#2833 Add terms block formatting to subsequent publish events if appl…
1789c2d 
…icable
raprasad and others added 28 commits March 7, 2016 09:29
@raprasad
Merge branch '2957-tab-mapping' of github.com:IQSS/dataverse into 295…
713dc0c 
…7-tab-mapping
@majorseitan
Merge branch 'develop' into 2888-create-case-insensitive-emails
8127a93
@majorseitan
added index
9316c96
@michbarsinai
API for setting dataset citation type uses PUT body. WrappedResponse#…
63b1adc 
…refine looks into JSON body of the wrapped response, if indeed the wrapped response is of type application/json
@sekmiller
Add internal links to JVM Options/Settings for DOI Support
a343547
@scolapasta
Merge branch 'develop' into 2606-citation-date
a7d1c12 
Conflicts:
	scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql
@michbarsinai
src/main/java/edu/harvard/iq/dataverse/engine/command/impl/SetDataset…
3db6eb3 
…CitationDateCommand is now testable.
@michbarsinai
Added a DELETE API call to restore default behavior for date used for…
9261239 
… citation
@michbarsinai
Merge branch '2606-citation-date' of github.com:IQSS/dataverse into 2…
44dd4f6 
…606-citation-date
@scolapasta
Merge pull request #2969 from IQSS/2957-tab-mapping
10a905f 
2957 Dataverse UI updates for BARI tabular mapping and TwoRavens on/off
@scolapasta
Merge pull request #3000 from IQSS/2606-citation-date
0e6f43b 
added backend support for alternate citation dates  #2606
@scolapasta
Merge branch 'majorseitan-2888-create-case-insensitive-emails' into d…
0fc7987 
…evelop

Conflicts:
	scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql
@scolapasta
Merge branch 'majorseitan-2888-create-case-insensitive-emails' into d…
8b319e7 
…evelop

Conflicts:
	scripts/database/upgrades/upgrade_v4.2.4_to_4.3.sql
@scolapasta
added "if exists" to drop column calls
5535970
@sekmiller
#2989 - Retry with new Identifier if publish encounters duplicate
03c5d43
@sekmiller
Back out conflict changes
a57a50d
@sekmiller
Merge branch 'develop' into 24-add-DataCite-DOI-Support
2ce272f 
# Conflicts:
#	src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@sekmiller
Remove unregistered warning from Publish Popup
5df2ce5
@sekmiller
Code Cleanup
5f777e8 
Add list typing and narrow the errors thrown by DataCite api calls
@sekmiller
Command Exception cleanup
42f1436
@sekmiller
Fix error in referenceData.sql that got into Develop
1ca25c5
@raprasad
Fix for 3013
442f3d4
@scolapasta
Merge branch 'develop' into 1837-persistent-id-in-dataset-api
7d1edb5
@scolapasta
changed new APIs (for citationdate) to support persistentIds
8446014
@scolapasta
Merge pull request #2893 from IQSS/1837-persistent-id-in-dataset-api
e3f635e 
Issue #1837 implemented and ready to be merged.
@sekmiller
#24 Fix Issue with httpClient not closed properly
f2de248
@scolapasta
Merge pull request #2964 from IQSS/24-add-DataCite-DOI-Support
a69052b 
#24 add data cite doi support
@scolapasta
Update upgrade_v4.2.4_to_4.3.sql
4cc92a5 
removed optional setting for mandatory upgrade script
bionary added a commit that referenced this pull request Mar 15, 2016
@bionary
Merge pull request #3 from IQSS/develop
4d90a1c 
Merge IQSS/develop
@bionary bionary merged commit 4d90a1c into bionary:2322-solrCloud Mar 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@bionary @raprasad @bencomp @scolapasta @michbarsinai @sekmiller @mheppler @majorseitan