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.

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

Retry updates #144

Conversation

qqmyers
Copy link

@qqmyers qqmyers commented Jan 27, 2022

There are still differences between the DANS branch and mine. It looks like 4665ac7 didn't make it and the rest of the changes are just from my branch being merged with develop more recently. I'm not sure what happened (apologies if my merging messed things up) but I think this PR should work. Alternately, I'd suggest updating the DANS multi-license branch from IQSS dev and then checking this PR - that should reduce it to the one commit above to fix the api docs.

sekmiller and others added 30 commits January 5, 2022 14:04
# Conflicts:
#
src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java
which is not updated when the update current version/curate command is
used
…-show_release_date_in_version_table

IQSS/8352-show release date in version table
…IQSS/8356-display_of_metadata_langauge

IQSS/8356 - Fix metadatalanguage choice display in sub dataverses
…-dont_remove_expired_token

IQSS/8348-dont remove expired token IQSS#8348
reloading is the same as reloading --> reloading is the same as loading
@janvanmansum janvanmansum merged commit 20b3142 into DANS-KNAW:multi-license Jan 28, 2022
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.

5 participants