opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
40,920 Commits 69 Branches 243 Tags
8564eabb43caed01b886e17f487da7ff825d9fd9
Commit Graph
40920 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton 8564eabb43 Merge branch 'release_19.05' into dev 2019-06-10 15:01:42 -04:00
John Chilton e00e41557a Merge pull request #8118 from jmchilton/dependency_resolver_config 
Allow declaring depedency resolvers right in Galaxy config, serialization.
 2019-06-10 14:53:25 -04:00
Dannon 097612f210 Merge pull request #8106 from Nerdinacan/analytics_load_issue 
[19.05] Restored google analytics inits in mako templates
 2019-06-10 10:44:59 -04:00
Enis Afgan 9043dd18c6 [19.05] Add recent merges to release notes 2019-06-10 10:31:59 -04:00
John Chilton 696f9f9f00 Merge pull request #8103 from nuwang/fix_k8s_runasuser 
[19.05] Fix k8s runasuser
 2019-06-10 10:02:56 -04:00
John Chilton f821d3f834 Merge pull request #8092 from nuwang/fix_k8s_namespace_19_05 
[19.05] Filter all pykube queries by namespace
 2019-06-10 10:01:30 -04:00
John ChiltonandMarius van den Beek 5651edcf24 Update lib/galaxy/webapps/galaxy/config_schema.yml 
Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
 2019-06-10 09:19:40 -04:00
John ChiltonandMarius van den Beek d787a2827a Update lib/galaxy/util/plugin_config.py 
Co-Authored-By: Marius van den Beek <m.vandenbeek@gmail.com>
 2019-06-10 09:19:20 -04:00
Nicola Soranzo dafe9dd30b Merge branch 'release_19.05' into dev 2019-06-10 14:15:02 +01:00
Nicola Soranzo 6b899ce732 Merge branch 'release_19.01' into release_19.05 2019-06-10 14:09:26 +01:00
Dannon 0bbcb4fe40 Merge pull request #8047 from jmchilton/pages_api_and_component 
Toward a more modern frontend and backend for Pages.
 2019-06-10 09:08:48 -04:00
Marius van den Beek 3e01f1a244 Merge pull request #8108 from nsoranzo/release_19.01_fix_iter_methods_py3 
[19.01] Do not use dict iter methods for Python3 compatibility
 2019-06-10 13:33:03 +02:00
John Chilton d9ee5d67c4 Merge pull request #8120 from VJalili/update_cloudauthz_version 
Update cloudauthz to its latest version
 2019-06-09 20:59:04 -04:00
Nicola Soranzo fed80f19f6 Pin SQLAlchemy and update social_auth_core pin 
- SQLAlchemy 1.3 introduced changes that break some queries.

- Commit 5723e15cce did not update the pin
  on `social_auth_core` in the Pipfile.

- Remove spurious `; python_version == '2.7'` produced by pipenv for
  `paste`.

- Run `make update-dependencies`.
 2019-06-09 19:06:53 +01:00
vahid 35629c33db Revert social-auth-core version change. 2019-06-09 09:46:10 -07:00
vahid 96e15d25c5 Result of running make update-dependencies. 2019-06-08 13:57:46 -07:00
vahid b5b1d82c99 Change cloudauthz version to 0.3.0. 2019-06-08 11:37:31 -07:00
John Chilton 70730f673d Allow declaring depedency resolvers right in Galaxy config, serialization. 2019-06-07 15:17:21 -04:00
Martin Cech 8f5a35e584 I love RST 2019-06-07 15:13:14 -04:00
Nicola Soranzo 68ba4e4f32 Merge branch 'release_19.05' into dev 2019-06-07 16:01:46 +01:00
Martin Cech 23a6b925b9 Merge pull request #8112 from nsoranzo/release_19.05_galaxy-lib_sync 
[19.05] Report a lint error if a citation is empty
 2019-06-07 10:55:24 -04:00
John Chilton 2dad5011e1 Merge pull request #8116 from nuwang/fix_default_container_image 
[19.05] Fix error in recognizing destination default container image
 2019-06-07 08:30:06 -04:00
John Chilton 5166a0e2d0 Merge pull request #8113 from nsoranzo/add_missing_files 
Add missing files from galaxy-lib
 2019-06-07 08:14:56 -04:00
Nuwan Goonasekera 39d265b907 Fix error in recognizing destination default container image 2019-06-07 07:19:25 +05:30
Nicola Soranzo a69e03c9c7 Add missing files from galaxy-lib 2019-06-07 01:31:56 +01:00
Nicola Soranzo aa25ff5355 Report a lint error if a citation is empty 
xref. https://github.com/galaxyproject/planemo/issues/929
Sync with https://github.com/galaxyproject/galaxy-lib/pull/151
 2019-06-07 00:04:55 +01:00
Dannon 169e78df7c Merge pull request #8018 from WilliamHolden/fix_tool_run_ellipses 
Fix tool run uses ellipses slightly too soon
 2019-06-06 16:34:18 -04:00
Nate Coraor f1775a3582 Merge remote-tracking branch 'upstream/release_19.05' into dev 2019-06-06 16:24:26 -04:00
Nate Coraor 3837440aac Merge pull request #8065 from jmchilton/metadata_output_pulsar 
[19.05] Fix metadata output collection on Pulsar with new metadata strategy.
 2019-06-06 16:21:36 -04:00
Martin Cech 320655337b improve styling of inpouts and outputs lists 
on after-execution page
 2019-06-06 13:40:25 -04:00
Mason 1245153529 Restored google analytics initialize inside mako templates 2019-06-06 10:17:36 -07:00
will f2a7f8c6bb make tool form print all inputs/outputs and scroll to top 2019-06-06 12:57:25 -04:00
John Chilton dc4785a59b Fixes(?) to galaxy.metadata. 2019-06-06 11:05:28 -04:00
Nicola Soranzo 9ec952c0a7 Do not use dict iter methods for Python3 compatibility 2019-06-06 15:58:15 +01:00
Nuwan Goonasekera aa463ce070 Default to none if run_as_user or group are not specified 2019-06-06 17:11:04 +05:30
Martin Cech 0a32933e72 fix link to user release notes 2019-06-05 16:59:46 -04:00
Martin Cech 47fd60fcce fix link to user release notes 2019-06-05 16:58:53 -04:00
Martin Cech 20bdd5867a Merge branch 'release_19.05' into dev 2019-06-05 16:35:35 -04:00
Martin Cech 5db219b1d2 add 19.05 RN to index 2019-06-05 15:53:05 -04:00
Martin Cech 95586c1dbb Merge pull request #8037 from jmchilton/release_19.05_notes 
[19.05] 19.05 Release Notes
 2019-06-05 15:49:39 -04:00
Martin Cech e8311393e7 minor changes to RN 2019-06-05 15:48:33 -04:00
Dannon b74c288f41 Merge pull request #8101 from WilliamHolden/remove_unresolved_function 
Remove unresolved function causing console error
 2019-06-05 15:30:20 -04:00
Martin Cech 31b7fb0356 Merge pull request #8051 from jmchilton/galaxy_util_libs 
Prepare all packages/ for actual releases.
 2019-06-05 15:29:08 -04:00
Martin Cech 9c2f142fb8 Merge pull request #8044 from jmchilton/job_metrics_component_3 
Update JobMetrics component to use a Vuex Store + vuex-cache...
 2019-06-05 15:18:25 -04:00
Martin Cech cb35ec38b4 Merge branch 'release_19.05' into dev 2019-06-05 15:07:12 -04:00
Martin Cech b0dc3feded Merge branch 'release_19.01' into release_19.05 2019-06-05 15:06:43 -04:00
Martin Cech cb53c7390e Merge pull request #8085 from dannon/fix-multipanel-history-search 
[19.01] Fix multipanel history search.
 2019-06-05 15:04:58 -04:00
Nuwan Goonasekera 91b6774f18 Added support for runAsUser and runAsGroup to k8srunner 2019-06-05 23:38:09 +05:30
will 8488a9340b prefer let and const over var 2019-06-05 11:49:27 -04:00
will 7e8ed9d0b7 remove hover function that calls unresolved function hoverImage on mouse in 2019-06-05 11:46:05 -04:00