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
23,317 Commits 69 Branches 243 Tags
08b8cd6f00aed9554256ecf2c7eafd2e4f99ce99
Commit Graph
23317 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
guerler 08b8cd6f00 Remove unused rendering options for settings view 2016-06-22 11:32:42 -04:00
guerler ef029042fd Combine ui-table-form and settings view 2016-06-22 11:32:42 -04:00
guerler 0486ea4cc6 Fadein additional options 2016-06-22 11:32:42 -04:00
guerler a8da228c8f Use common parameter factory for charts 2016-06-22 11:32:41 -04:00
guerler ad9f8b139d Decouple change handler for input parameters 2016-06-22 11:32:41 -04:00
guerler c6e9a56a46 Adjust viewport styles 2016-06-22 11:32:41 -04:00
guerler d38a4a4f6b Align remaining view code styles 2016-06-22 11:32:41 -04:00
guerler 58a237eb45 Adjust group view coding styles 2016-06-22 11:32:41 -04:00
guerler b6914479fb Align group view coding style 2016-06-22 11:32:41 -04:00
guerler 0861bb5b94 Fix spacing 2016-06-22 11:32:40 -04:00
guerler 4dd33fecb7 Align editor view style 2016-06-22 11:32:40 -04:00
guerler 930c37ffb1 Style fixes 2016-06-22 11:32:40 -04:00
Martin Cech f36ad6a53b Merge pull request #2524 from nsoranzo/template_fixes 
Fix HTML errors on 2 templates
 2016-06-22 11:04:18 -04:00
Nicola Soranzo 03bf4262f4 Fix HTML errors on 2 templates 2016-06-22 12:09:38 +01:00
Dannon Baker d722dd34af Merge branch 'release_16.04' into dev 2016-06-21 14:57:09 -04:00
Dannon Baker 15a4734aed Merge branch 'release_16.01' into release_16.04 2016-06-21 14:56:33 -04:00
Dannon Baker 67c4df712a Merge pull request #2522 from nsoranzo/release_16.01_fix_for_2479 
[16.01] Fix move_directory_files tool dependency action when destination is not empty
 2016-06-21 14:56:07 -04:00
Nicola Soranzo 89890d4f60 Fix move_directory_files tool dependency action when destination is not empty 
Historically this action moves the contents of the source directory to the
destination directory. Commit d38936bd8d
broke the install when e.g. the destination is $INSTALL_DIR, which is
created by Galaxy and is not empty (contains INSTALLATION.log after first
action).
 2016-06-21 17:59:17 +01:00
Nicola Soranzo 4bfa2f62fb Fix for py34-lint 2016-06-21 17:56:42 +01:00
Martin Cech dad193e3c0 Merge pull request #2521 from guerler/fix_viz_000 
[16.04] Fix saving visualizations
 2016-06-21 12:06:37 -04:00
Dannon Baker ac902304ae Fix two errors in sff_extract.py detected by flake8 -- either of these code paths would have thrown an exception and failed prior to this. 2016-06-21 11:05:09 -04:00
guerler 41baf5d107 Fix library common json loads call 2016-06-21 10:26:02 -04:00
guerler 3a9e157145 Fix saving visualizations 2016-06-21 09:44:54 -04:00
Dannon Baker a5cc0081f7 Merge branch 'release_16.04' into dev 
Rebuild client.
 2016-06-20 13:39:20 -04:00
Dannon Baker 67eca6d490 Merge branch 'release_16.01' into release_16.04 2016-06-20 13:37:07 -04:00
Nicola Soranzo 5aaa1ecdf0 Merge pull request #2518 from dannon/backport_to_1601_pjafix 
[16.01] Copy PJAs when importing a workflow.
 2016-06-20 18:36:29 +01:00
Dannon Baker 8b2ae46467 Copy PJAs when importing a workflow. 2016-06-20 11:33:34 -04:00
Martin Cech a902420b92 Merge pull request #2508 from dannon/workflow_import_pja_fix 
Copy PJAs when importing a workflow.
 2016-06-20 11:00:14 -04:00
Martin Cech 1f82d00925 Merge pull request #2516 from bgruening/display_tiff_in_upload 
display TIFF in upload
 2016-06-20 10:59:20 -04:00
Björn Grüning 11cdc4703a display TIFF in upload 2016-06-20 11:24:24 +02:00
Nicola Soranzo ac5907fa9f Merge pull request #2509 from dannon/sff_extract_fixes 
Fix two errors in sff_extract.py detected by flake8
 2016-06-16 22:22:33 +01:00
Dannon Baker 618c644d2b Fix two errors in sff_extract.py detected by flake8 -- either of these code paths would have thrown an exception and failed prior to this. 2016-06-16 16:10:36 -04:00
Dannon Baker c7ffffbda7 Copy PJAs when importing a workflow. 2016-06-16 15:32:20 -04:00
Martin Cech 70b4097996 Merge pull request #2506 from carlfeberhard/twice-a-day 
[16.04] UI, history: backport of 3672eda
 2016-06-16 12:56:18 -04:00
carlfeberhard c8af30009b UI, history: backport of 3672eda 
(update using xhr date header)
 2016-06-16 11:57:02 -04:00
Martin Cech 9d84c0b883 Merge pull request #2505 from dannon/bigger_hammer_remi_pja 
This is an extra hammer swing at #1531 / #1542
 2016-06-15 14:42:26 -04:00
Dannon Baker 5707954491 Try to refresh input_datasets.dataset before accessing creating_job -- this is yet another attempt to resolve this being unavailable at job finish time. 2016-06-15 13:27:57 -04:00
Dannon Baker f7a6a2323d This is an extra hammer swing at #1531 / #1542, which @rmarenco encountered. He said this resolves it. 2016-06-15 11:57:33 -04:00
Dannon Baker 4ef24d6ab8 Merge branch 'release_16.04' into dev 2016-06-15 10:56:58 -04:00
Dannon Baker f3f0c30106 Merge pull request #2504 from natefoo/pulsar-client-timeout 
[16.04] Bump Pulsar client lib version number and add timeout options to Pulsar runner
 2016-06-15 10:56:37 -04:00
Nate Coraor 3680a016fd Bump Pulsar client lib version number and add timeout options to Pulsar 
runner to fix a timeout bug that kills the handlers on usegalaxy.org
 2016-06-15 10:35:38 -04:00
Dannon Baker 0fd152c0cc Merge branch 'release_16.04' into dev 2016-06-15 10:15:36 -04:00
Dannon Baker 37242c8a7c Merge branch 'release_16.01' into release_16.04 2016-06-15 10:15:07 -04:00
Dannon Baker 75cdec9b4b Merge pull request #2479 from nsoranzo/release_16.01_fix_for_1947 
[16.01] Fix move_directory_files tool dependency action when new_file_path is on a different filesystem
 2016-06-15 10:14:32 -04:00
John Chilton dca91dae16 Merge pull request #2498 from phnmnl/feature/fixFilesFromWorkDirIssue 
Kubernetes runner: fixes result files from work directory not being recovered issue
 2016-06-15 09:53:15 -04:00
Dannon Baker 1b110299af Merge branch 'release_16.04' into dev 2016-06-15 09:32:31 -04:00
Dannon Baker 7d962ee0cb Merge pull request #2492 from jmchilton/windows_no_shell 
[16.04] Allow disabling separating tools commands into their own script.
 2016-06-15 09:31:15 -04:00
Martin Cech f078365acc Merge pull request #2499 from dannon/user_tool_filter_fixes 
Toolbox filter fixes
 2016-06-14 15:42:03 -04:00
Dannon Baker 0c4fd995c5 Fix module resolution for migrated toolbox filters path -- reuses (in a hacky way) the filtering function that was duplicated to galaxy.tools.toolbox.filters. Pushing more of this functionality (the docs, etc) into the FilterFactory might be nice down the road. 2016-06-14 14:30:31 -04:00
Dannon Baker 419594845d Fixes the ability for users to toggle their filters. There's no reason to require a user_id here since it's locked to trans and require_login is set. 2016-06-14 14:01:32 -04:00