opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,775 Commits 62 Branches 243 Tags
3e49e31707fc0539b859fb11bbfd841fb38dda44
Commit Graph
34775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
John Chilton b67ecd4209 Fix merge from 18.01. 2018-05-02 11:39:19 -04:00
John Chilton e62fd46644 Merge pull request #6037 from natefoo/containers-bugfix 
[18.05] Fix a few more bugs with the containers interface
 2018-05-02 10:57:32 -04:00
Nate Coraor 0e13690b72 Don't attempt to iterate None in container's map_ports method. 2018-05-02 10:54:42 -04:00
Nate Coraor 6984d5f4a2 Don't raise an exception if a Docker service doesn't have an environment 
and its env property is accessed
 2018-05-02 10:53:50 -04:00
Nate Coraor 3e4e28543d Call superclass __init__ in DockerService 2018-05-02 10:53:10 -04:00
Dannon Baker 7af3b328f2 Merge branch 'release_18.05' into dev 2018-05-02 09:32:28 -04:00
Dannon Baker 808686cd60 Merge branch 'release_18.01' into release_18.05 2018-05-02 09:32:07 -04:00
Dannon b35340c77f Merge pull request #5997 from jmchilton/1801_tool_state_opt 
[18.01] Fix tool state performance for large collections.
 2018-05-02 08:54:55 -04:00
Dannon 92a4a13862 Merge pull request #6026 from martenson/ts-fixes 
[18.05] fix missing import and removed method in TS
 2018-05-02 08:46:59 -04:00
John Chilton 23762f48a3 Docker fixes - release 18.05 edition. 
- Rev to new container with 18.05 dependencies pre-installed.
- Enable caching of Yarn stuffs to enable
- Redo fix for git not working in node container - was mounting /etc/passwd but that wasn't compat. with Mac OS X, setting these environment variables are.
- Rearrange startup script a bit to make it load faster (wait for Selenium right before the tests not before waiting for DB).
- Fix random error in logs related to Selenium trying to read something in /root by passing -H to set the Selenium user's home directory.
 2018-05-01 23:47:27 -04:00
Dannon 4c22203c80 Merge pull request #6021 from erasche/hostname 
Add hostname metric
 2018-05-01 15:07:42 -04:00
Dannon 8842e8d451 Merge pull request #6025 from jmchilton/release_18.05_broken_tests 
[18.05] Fix run_tests.sh to respect args after --.
 2018-05-01 13:41:35 -04:00
Martin Cech 40d0d997d3 revert the erroneous rewrite to call security 
TS security does not have this method
introduced in https://github.com/galaxyproject/galaxy/pull/5238
 2018-05-01 12:26:13 -04:00
Martin Cech ebc8c7ef50 ads missing method import 2018-05-01 11:48:35 -04:00
John Chilton 20c3d09d85 Fix run_tests.sh to respect args after --. 
Bug fix because we are clearly parsing it above and then ignoring the arguments afterward anyway. This will allow me to divide up the Selenium tests without any changes using Jenkins' configuration matrix plugin I think.
 2018-05-01 11:25:29 -04:00
Dannon 4043e1020c Merge pull request #6024 from jmchilton/release_18.05_broken_tests 
[18.05] Disable broken tests workflow annotation tests.
 2018-05-01 10:42:52 -04:00
John Chilton fad0392166 Disable broken tests. 2018-05-01 10:36:39 -04:00
Nicola Soranzo 370590f9ed Fix import order 2018-05-01 14:38:54 +01:00
E Rasche 543d5b2138 also change import lines here 2018-05-01 15:10:45 +02:00
E Rasche bd7cd04518 address review comments 2018-05-01 13:55:21 +02:00
John Chilton 0fac69bd59 Merge pull request #6014 from nsoranzo/fix_imports 
Fix some imports
 2018-05-01 07:16:44 -04:00
John Chilton 7f0df84ff7 Merge pull request #6019 from martenson/fix-paginationstyle 
[18.05] Fix grid pagination style
 2018-05-01 07:16:08 -04:00
E Rasche d0790234bb Add hostname metric 2018-05-01 11:32:20 +02:00
Nicola Soranzo 740e1fc05c Merge pull request #6018 from dannon/kill_graphite_middleware 
This strips the graphite-specific middleware
 2018-05-01 00:32:09 +01:00
Dannon aebc0da891 Merge pull request #6020 from natefoo/lastz-1.3 
[18.01] lastz_wrapper_2 no longer requires Galaxy's python env as of version 1.3
 2018-04-30 16:12:43 -04:00
Nate Coraor 790ec387d7 lastz_wrapper_2 no longer requires Galaxy's python env as of version 1.3 2018-04-30 14:42:04 -04:00
Dannon Baker a630f13e6d More standard spacing in additional config comments just added. 2018-04-30 14:18:14 -04:00
Dannon Baker b7a89eb106 Config rebuild 2018-04-30 14:16:27 -04:00
Martin Cech b477329842 Merge pull request #6015 from jmchilton/fix_library_paired 
[18.01] Fix library to list of pairs collection builder.
 2018-04-30 14:15:53 -04:00
Dannon Baker 9cee8e2298 Add sample commentary to the stub in config manage, xref a88e19064a 2018-04-30 14:15:53 -04:00