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
22,036 Commits 69 Branches 243 Tags
f8a2dbd05a87782f5f0c30540ef463330d040589
Commit Graph
22036 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
shiltemann f8a2dbd05a add mothur prefix 2016-03-26 13:13:33 +01:00
Iyad Kandalaft 3e5505fa4d initial files by IyadKandalaft 2016-03-26 13:13:07 +01:00
Dannon Baker d9177a81e5 Merge pull request #2015 from guerler/fix_collection_001 
Fix collection handling
 2016-03-25 17:26:39 -04:00
Martin Cech 494b2f3e27 Merge pull request #2020 from dannon/analyse 
Swap analyse to analyze to be consistent across the app.
 2016-03-25 17:21:39 -04:00
Dannon Baker 3240c20a4b Swap analyse to analyze to be consistent. 2016-03-25 17:12:24 -04:00
Dannon Baker b9ccf17376 Merge pull request #2017 from martenson/import-to-new-history 
libraries: add 'create history &import to it' feature
 2016-03-25 16:52:00 -04:00
Martin Cech ce1b9aeb38 minor adjustments to markup; improve logging; repack 2016-03-25 15:54:26 -04:00
Martin Cech 87ea37ca28 add 'create history &import to it' feature 
various refactorings and fixes to UX glitches
 2016-03-25 15:24:23 -04:00
guerler 1423836f1e Fix collection handling 2016-03-25 13:39:51 -04:00
Dannon Baker 0d5001eea7 Merge branch 'release_16.01' into dev 2016-03-25 11:11:26 -04:00
John Chilton ec3fe67ddd Merge pull request #1918 from davebx/move_tsg 
Rename tool_shed_get to url_get.
 2016-03-25 10:57:03 -04:00
John Chilton 6e34858e0d Merge pull request #2010 from guerler/fix_collection_select 
Fix parameter expansion for empty collections
 2016-03-25 10:54:33 -04:00
John Chilton 84044f9a5f Merge pull request #2002 from dannon/statswork 
Much more friendly route mapping.
 2016-03-25 10:53:48 -04:00
John Chilton 6aaec509ed Merge pull request #2000 from martenson/fix-lib-icons 
libraries: change default size of fa in iconspans
 2016-03-25 10:52:50 -04:00
Martin Cech 8accc56132 Merge pull request #2009 from jmchilton/execute_params_fix 
[16.01] Fix unbound error that is possible if using tool bursting.
 2016-03-25 10:00:49 -04:00
Dannon Baker 0f099b75b6 Merge branch 'release_16.01' into dev 2016-03-24 17:30:00 -04:00
John Chilton 86d2b29026 Merge pull request #1993 from guerler/revise_parameters_000 
Fix inconsistency in update state handling for tool modules
 2016-03-24 16:39:26 -04:00
guerler 72b1ba3714 Fix parameter expansion for empty collections 2016-03-24 16:29:13 -04:00
Daniel Blankenberg 0a77851b9b Merge pull request #2008 from martenson/libtext-from-span 
libraries: move text out of icon spans for library dataset view
 2016-03-24 14:01:21 -04:00
Martin Cech ab31bd9f48 move text out of icon spans for library dataset view 
also re-touch the html to be better readable
 2016-03-24 13:12:02 -04:00
John Chilton dc49a9cbc1 Fix unbound error that is possible if using tool bursting. 2016-03-24 14:35:51 +00:00
Dannon Baker 909a5491e5 Merge pull request #2004 from guerler/repack_000 
Repack js-scripts
 2016-03-23 21:01:04 -04:00
guerler cfd937a46e Repack scripts 2016-03-23 20:47:34 -04:00
Aysam Guerler 3b0743fab2 Merge pull request #1996 from martenson/remove-liblink 
alter 'shared data' menu
 2016-03-23 20:44:52 -04:00
Martin Cech dede9459b0 Merge pull request #2003 from dannon/trackster_debugging 
[16.01] Fix shared viz (and other base_panels.mako displays) early URL generation.
 2016-03-23 19:48:32 -04:00
Martin Cech e1fcbc7a20 change default size of fa in iconspans 
leave as is for the globe icon
 2016-03-23 16:58:22 -04:00
Dannon Baker b51bdd06b1 Basepanels don't have Galaxy object, causing failures in views like published tracks, etc., when resource urls are generated incorrectly 2016-03-23 16:55:38 -04:00
guerler eaf8f4ed50 Extend doc tests for parameter handling 2016-03-23 16:20:51 -04:00
Martin Cech 93b7473be8 remove deprecated user-facing lib link; 
remove 'published' from the menu items for shared elements
 2016-03-23 15:20:06 -04:00
guerler c1fe8aac0a Fix inconsistency in update state handling for tool modules 2016-03-23 14:28:07 -04:00
Martin Cech fb549c80d4 Merge pull request #1991 from guerler/fix_panel_003 
Add page layout test cases
 2016-03-23 13:19:46 -04:00
Dannon Baker 033241c99f Merge 16.01, rebuild. 2016-03-23 12:39:06 -04:00
guerler 7186fbba92 Add page layout test cases 2016-03-23 12:24:45 -04:00
Martin Cech 21e71a9b46 Merge pull request #1905 from dannon/library_errors 
[16.01] Encoding in libraries
 2016-03-23 12:04:27 -04:00
Björn Grüning c171fd168d Merge pull request #1990 from guerler/fix_boolean_000 
Fix booleans in workflow editor
 2016-03-23 17:04:17 +01:00
Dave Bouvier 7e14f5db62 Address travis' complaints. 2016-03-23 11:40:20 -04:00
guerler 946458b892 Fix booleans 2016-03-23 11:09:43 -04:00
Martin Cech 8e41fda58a Merge pull request #1984 from guerler/fix_scratchbook_000 
[16.01] Fix scratchbook
 2016-03-23 10:37:26 -04:00
Dave Bouvier 06b9737e09 Cleanup and fix tests. 2016-03-23 10:04:26 -04:00
Dave Bouvier 9e8890b25b Merge branch 'dev' of git://github.com/galaxyproject/galaxy into move_tsg 2016-03-23 09:54:08 -04:00
Dannon Baker 975c6f5eae Much more friendly route mapping. 2016-03-22 17:35:14 -04:00
Nicola Soranzo d10ee6f6c4 Merge branch 'release_16.01' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-03-22 20:54:32 +00:00
Daniel Blankenberg cf16b1d692 Merge pull request #1985 from nsoranzo/release_16.01_lda_fixes 
[16.01] Do not convert spaces to tabs when importing datasets into a library.
 2016-03-22 16:44:51 -04:00
Daniel Blankenberg 2bbae2bb1d Merge pull request #1983 from jmchilton/history_append_opt 
Optimize adding datasets to large histories.
 2016-03-22 16:04:50 -04:00
Nicola Soranzo 9eb1db82ca Do not convert spaces to tabs when importing datasets into a library. 
Reported (with fix provided) by Fabien Mareuil in
http://dev.list.galaxyproject.org/automatic-adding-of-a-tab-in-a-fastq-header-td4669160.html
 2016-03-22 20:03:32 +00:00
guerler 79d16f71f9 Fix scratchbook 2016-03-22 14:19:58 -04:00
Martin Cech be78aac509 Merge pull request #1980 from erasche/fix-1979 
Remove duplicate help target
 2016-03-22 12:51:25 -04:00
Martin Cech dd476fc42c Merge pull request #1978 from carlfeberhard/release_16.01 
[16.01] Fixes to page.js
 2016-03-22 12:50:08 -04:00
Dannon Baker 0dc57b08e8 Merge pull request #1974 from jmchilton/docker_fix 
Fix docker tool execution for #1688.
 2016-03-22 12:42:16 -04:00
Eric Rasche 9d8957d121 Document a couple other targets 2016-03-22 16:31:15 +00:00