-
Notifications
You must be signed in to change notification settings - Fork 26
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
Custom curator url for webapp-only installation #1265
Open
kcranston
wants to merge
1,375
commits into
master
Choose a base branch
from
nexttree
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
I need to fix the conflicts, and then test the fixes before we can merge this. |
@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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
/curator
and 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.