Conversation
Member
Author
|
I need to fix the conflicts, and then test the fixes before we can merge this. |
Member
|
@kcranston The conflicts look pretty straightforward, but let me know if you want a second pair of eyes. |
As usual, this makes sure we don't lose markup if (e.g.) there's nothing in the collection list.
These conflict with our super-imposed drop-down (or -up) menus.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For nexttree, we want to install opentree with a tree viewer only, no curation app. This PR (which is all work done by @mtholder ) removes the hard-coded
/curatorand allows for a config-based URL for the curation app, so that the app and docs on nexttree can point to - for example -tree.opentreeoflife.org/curator.I'd like to get this merged so that we can deploy nexttree from the master branch.