opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 23:49:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,807 Commits 63 Branches 243 Tags
3ec6753f0db67de8fefc162ece7502fe47286d35
Commit Graph
34807 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton 3ec6753f0d No need to specify these default entries I don't think. 
Most new datatypes don't get added here, I'm not really sure what purpose these serve.
 2018-05-14 12:43:02 -04:00
John Chilton a4ab17cb0d Add blib test case for supplied test data, fix RetentionTimes not always available. 2018-05-14 12:41:11 -04:00
Jim Johnson 3b027af3df Fix flake8 errors 2018-05-09 11:15:47 -05:00
Jim Johnson c5828aa67c blib datatype 
add test file: test.blib
include blib version in metadata
 2018-05-09 08:51:20 -05:00
Jim Johnson c3982fdf4c Add blib MS spectral library datatype 
blib is a SQlite schema for MassSpec spectral library
 2018-05-08 16:08:56 -05:00
Jim Johnson 6919da46d8 Merge remote-tracking branch 'galaxyproject/dev' into dev 2018-05-08 15:58:26 -05:00
Martin Cech c67c4b4b82 Merge branch 'release_18.05' into dev 2018-05-07 12:34:46 -04:00
Martin Cech 0cfac515b5 Merge branch 'release_18.01' into release_18.05 2018-05-07 12:34:08 -04:00
Martin Cech 8255d1ccc8 Merge pull request #5613 from erasche/fix-fraking-grt 
[18.01] File sizes not being annotated in GRT
 2018-05-07 11:55:55 -04:00
Martin Cech 400bcf1b04 Merge pull request #6064 from jmchilton/rule_fixes_3 
[18.05] Rules - test case & bug fixes for adding cols from regex groups.
 2018-05-06 20:02:20 -04:00
Martin Cech 8aaee18cae Merge pull request #6067 from guerler/bootstrap_shared_grid 
Style fix for published grid pages
 2018-05-05 14:02:39 -04:00
guerler ca48d49ea8 Style fix for published grid pages 2018-05-05 06:38:29 -04:00
Martin Cech 7c44139dc8 Merge pull request #6062 from dannon/fix_quotameter_styling 
Fix quotameter styling
 2018-05-04 19:51:49 -04:00
Martin Cech 2a9e44e7a2 Merge pull request #6065 from jmchilton/rule_fixes_4 
[18.05] Rules - bug fix for apply_rules tool on nested collections.
 2018-05-04 16:44:12 -04:00
Dannon Baker 23b0169a17 Fix non-capped usage display as well. 2018-05-04 16:19:14 -04:00
John Chilton d729c31ffd Rules - bug fix for apply_rules tool on nested collections. 2018-05-04 14:41:26 -04:00
John Chilton 19d06cb971 Rules - test case and bug fixes for adding cols for regex groups. 2018-05-04 13:39:53 -04:00
Dannon Baker b7c8fbe7c2 Tinker with brand-succcess, address the brightness concern (which makes many locations look better, at least to me) 2018-05-04 11:54:34 -04:00
Martin Cech 011e76a726 Merge pull request #6056 from jmchilton/rule_Builder_fixes_2 
[18.05] Yet more rule builder fixes.
 2018-05-04 11:44:12 -04:00
Dannon f7354c0eb3 Merge pull request #6060 from mvdbeek/improve_error_message_unmatched_collections 
[18.01] Improve error message for mismatched data inputs
 2018-05-04 11:39:07 -04:00
Dannon Baker 89c12d6da2 More standard quota-meter-text color 2018-05-04 11:38:23 -04:00
mvdbeek 8bee7b80cb Improve error message for mismatched data inputs 2018-05-04 17:36:51 +02:00
Dannon Baker 6bb5fa02fc Use standard styling for quotameter; this fixes danger/warning/success indicators and visibility. 2018-05-04 11:23:13 -04:00
Dannon Baker 96dcf54c43 Fix quota styling for new anchor/link. 2018-05-04 11:21:47 -04:00
Dannon 1b41cbba59 Merge pull request #6057 from VJalili/alter_extra_data 
[18.05] Alter the type of extra_data column of OIDC table.
 2018-05-04 07:55:19 -04:00
Nicola Soranzo 545b7a4fe2 Merge pull request #6046 from jmchilton/tool_state_part_2 
[18.01] More tool state performance fixes.
 2018-05-04 11:11:47 +01:00
vjalili 5bd2cbd80b Alter extra_data column on an oidc-related table from TXT to JSON. 2018-05-03 13:49:43 -07:00
John Chilton 3b5d8ae99c RuleBuilder - Fix x in column definition screen to eliminate correct def. 2018-05-03 16:03:30 -04:00
John Chilton f371d3f709 RuleBuilder - Fix paired identifier casting issue. 2018-05-03 16:03:30 -04:00
Martin Cech 3e49e31707 Merge branch 'release_18.05' into dev 2018-05-03 13:08:41 -04:00
Martin Cech 3292445872 Merge pull request #6045 from jmchilton/remove_focus_tooltip 
[18.05] Fix for building doubly nested collections.
 2018-05-03 13:02:55 -04:00
Martin Cech 8b733df895 Merge pull request #6051 from dannon/fix_tool_error_report 
[18.05] Fix tool error report history view link
 2018-05-03 12:56:04 -04:00
Dannon Baker 3829b0727d Fix one more use of histories/view 2018-05-03 12:22:35 -04:00
Martin Cech 666fec9f7b Merge pull request #6052 from dannon/bs4_411 
[18.05] Bump bootstrap from 4.1.0 to 4.1.1
 2018-05-03 12:17:12 -04:00
Martin Cech ba6c3e6c62 Merge pull request #6047 from guerler/fix_charts 
[18.05] Fix and repack chart tool-based visualizations
 2018-05-03 10:57:13 -04:00
Dannon 459384b060 Merge pull request #5993 from natefoo/cgroup-metric-enhancements 
Minor enhancements for cgroup metrics
 2018-05-03 10:46:46 -04:00
Nate Coraor a543b62fd3 Add a note that metrics column sizes can't be changed simply by changing 
their constants in model
 2018-05-03 10:39:20 -04:00
Nate Coraor ab8542a24c Allow selection of specific cgroup params for cgroup metrics plugin 2018-05-03 10:39:20 -04:00
Nate Coraor f8606a81db Increase precision of metric_value on job_metric_numeric to 26. 2018-05-03 10:39:20 -04:00
Dannon Baker 6a2c678dce Bump bootstrap from 4.1.0 to 4.1.1 -- has a few bugfixes and hides the chatty and irrelevant (for us) deprecation warning on client build. 2018-05-03 10:05:52 -04:00
Dannon Baker a8fe9a7394 The link for specific individual history view has changed, but wasn't updated here in the error report. 2018-05-03 09:13:23 -04:00
guerler e11da5fba9 Fix jqplot: boxplot, histogram 
Fix heatmap clustering

Fix nvd3 tool based types

Remove global d3 object from heatmap and jqplot
 2018-05-02 18:42:11 -04:00
John Chilton 624e9028cc [18.01] More tool state performance fixes. 
Fix performance problems that can be encountered when matching collection inputs. It would use the old style matching to find an initial value to plug into the tool state - if there were no collections that matched or there were some big collections toward the top of the history that did not match this could completely undo performance fixes in 5997.

More Pythonic input type conditional logic.
 2018-05-02 15:14:42 -04:00
Martin Cech 618de018b9 Merge pull request #6029 from jmchilton/release_18.05_broken_tests 
[18.05] Docker fixes - release 18.05 edition.
 2018-05-02 15:04:12 -04:00
John Chilton b8e5893b0d Fix for building doubly nested collections. 
The late addition of validation code added for identifier uniqueness checking broke this I think.
 2018-05-02 13:49:24 -04:00
Martin Cech cb38b2495d Merge pull request #6040 from jmchilton/remove_focus_tooltip 
[18.05] Two more rule builder fixes.
 2018-05-02 12:48:48 -04:00
Nate Coraor 6006d9bfca Merge remote-tracking branch 'origin/release_18.05' into dev 2018-05-02 12:02:37 -04:00
John Chilton db8d7e65fe Fix #6038. 2018-05-02 12:01:02 -04:00
Dannon cacbcdf675 Merge pull request #6039 from jmchilton/fix_1801_merge 
[18.05] Fix merge from 18.01.
 2018-05-02 11:53:33 -04:00
John Chilton b84de1e82b Remove on-focus tooltips from rule builder. 2018-05-02 11:42:59 -04:00