forked from elixir-oslo/proto
-
Notifications
You must be signed in to change notification settings - Fork 2
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
ft_master/proto_v10_import #72
Open
sveinugu
wants to merge
128
commits into
hb_master
Choose a base branch
from
ft_master/proto_v10_import
base: hb_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.
Open
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
…rollers. SG: Removed some more HB code from ProTo, including common.js and CommonFunctions, and cleaned up. (cherry picked from commit 6f219a5)
(cherry picked from commit a706f9b)
(cherry picked from commit 7e1553f)
(cherry picked from commit 3b3bf0a)
(cherry picked from commit 305801d)
…tion into separate TableCoreMixin, so that it works for both HtmlCore and TextCore. Small fix in HtmlCore.html Removed HtmlCore.html duplicate in strange directory location. (cherry picked from commit 8247763)
(cherry picked from commit 0105df4)
(cherry picked from commit 8cc8215)
…recision config in galaxy.ini.sample. (cherry picked from commit 4bb0b07)
(cherry picked from commit ab08a11)
(cherry picked from commit c7ebc4d)
(cherry picked from commit 55a156a)
…reading of galaxy.ini is supported (cherry picked from commit 82aabe5)
(cherry picked from commit dc5a57a)
(cherry picked from commit ccab8f3)
(cherry picked from commit 313a140)
(cherry picked from commit 3017c96)
(cherry picked from commit ce1642a)
(cherry picked from commit 1b2749a)
…anup (cherry picked from commit b22bb0d)
…orking. Attempt to fully load history/dataset objects to avoid "lazy" loading from database in forked process (cherry picked from commit e150239)
…wards 'str'. (cherry picked from commit c7e2f16)
(cherry picked from commit f74fd3e)
(cherry picked from commit 5adef24)
(cherry picked from commit 3cd0778)
(cherry picked from commit 2829900)
…he main output element (cherry picked from commit 01485db)
…lose a security hole related to Pickle. Forgot fix for getOutputName() to work (cherry picked from commit 4e7dfe0)
… files to the Galaxy history
Backport of HyperBrowser fixes. New GUI testing tools. Misc fixes
(cherry picked from commit 22460ef)
… test tools. Made client
…o_v10_import # Conflicts: # README.md # static/scripts/bundled/0.0.bundled.js.map
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.
Merge of Galaxy ProTo v1.0.1 into hb_master