Ease dev campaign merge with Erik's orphaned changes and add first data api widget #171
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
Thus can be in the same directory as server.yml
moved in to separate plugin repos
…ommon into ease-dev-campaign
TODO: some formatting issues on the landing page, unrelated.
removed unused sample panel, fixed typo in a widget.
|
It looks like a bunch of files were removed - including a number of vis widgets. Are those preserved somewhere? Were they being used? |
|
Yeah, let me add those back in first. They were moved to an external repo and that should be brought in in the config, but was was lost in a merge conflict rest. Afaik they are not currently used except for demoing in ease-dev, is that right? In any case, I'll restore them 2nite. Also, need to fix narrativeManager (which I did in another copy of ui-common and does not take long, but that was separate from this merge.) |
after the ease dev migration.
fix routing of login/logout; add auth check for routes; remove gravatar from user search
briehl
added a commit
that referenced
this pull request
Oct 16, 2015
Ease dev campaign merge with Erik's orphaned changes and add first data api widget
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.
Merged upstream kbase with my changes from the end of the ease-dev sprint
Fixed problems (mostly just missing dev plugins)
Added data api
Converted genome lineage widget to data api
Minor other fixes to patch it up for better demoing (and more of this to go).
Minor fixes to enable grunt test to pass.
TODO: follow up on the mass edits for q->bluebird (esp usage of done.)