Commit Graph
31045 Commits
Author SHA1 Message Date
guerler 3e4058f098 Fix styling, fix data submission for history endpoint 2017-11-12 10:50:44 -05:00
guerler f776229db4 Add history import 2017-11-11 12:28:21 -05:00
guerler 6879507fef Add js history form view 2017-11-11 12:02:56 -05:00
John Chilton 84c40e94d0 Merge pull request #4939 from mvdbeek/cram_to_bam
Add CRAM to BAM converter
2017-11-10 10:25:22 -05:00
Nicola Soranzo 0982dc0f04 Merge pull request #4968 from martenson/readme
readme - bring on par with manage dependencies feature
2017-11-09 17:13:11 +00:00
Martin Cech c1421fda32 add dot 2017-11-09 12:02:06 -05:00
Martin Cech 0a3b525543 Merge pull request #4967 from dannon/fix-admin-panel
Fix up reports javascript
2017-11-09 11:42:06 -05:00
Martin Cech b0c7d8da23 bring readme on par with features 2017-11-09 11:38:45 -05:00
Martin Cech 5df61d91f3 fi xlink to deps 2017-11-09 11:16:40 -05:00
Martin Cech 76d4afe3a6 Merge pull request #4965 from jmchilton/hdca_creation_api_clarification
Test both endpoints for collection creation in history contents API.
2017-11-09 11:01:47 -05:00
Martin Cech 8ce7d29490 Merge pull request #4964 from dannon/prettier_upgrade_18
Prettier upgrade
2017-11-09 10:51:16 -05:00
Dannon Baker eac8573a3c Swap from event.path to event.target.parentElement for compatibility 2017-11-09 10:37:13 -05:00
Dannon Baker 03a033e3c7 More cleanup for reports/run_stats 2017-11-09 08:53:56 -05:00
Dannon Baker dd1f69ad5c D3 imports (note the currentEvent hack needed; babel known issue with binding) 2017-11-09 08:42:29 -05:00
Dannon Baker 92519e5a56 Fix up admin panel's run_stats. 2017-11-09 08:37:31 -05:00
John Chilton 4d2a3c6074 Test both endpoints for collection creation in history contents API. 2017-11-09 05:20:03 -05:00
Dannon Baker 372d65d239 Upgrade prettier, fixes comment formatting and handles string literals a little better. 2017-11-08 17:37:46 -05:00
Martin Cech 963cfd1a3f Merge pull request #4957 from dannon/inisamplecleanup
Remove invalid user preferences beta (no longer a beta, always enabled)
2017-11-08 12:20:27 -05:00
Dannon Baker 92c6f36e55 Merge pull request #4952 from guerler/fix_visualization_link
Fix visualization link in import success message
2017-11-08 12:07:06 -05:00
guerler e5463eee8a Rewrite route without controller 2017-11-08 11:50:47 -05:00
Dannon Baker f50db592cc Blank line 2017-11-08 11:19:59 -05:00
Dannon Baker 98d349332f Remove from unit test samples, as well. 2017-11-08 11:17:40 -05:00
Dannon Baker a50d56e952 Various spelling issues in galaxy.ini.sample. 2017-11-08 11:06:28 -05:00
Dannon Baker abd9dff404 Remove no-longer-valid feature toggle for enable_sequencer_communication 2017-11-08 10:55:36 -05:00
Dannon Baker 03dccbae93 Remove no-longer-beta feature toggle for run_workflow_toolform_upgrade 2017-11-08 10:53:51 -05:00
Dannon Baker 4c6fdf660c Remove invalid user preferences beta (no longer a beta, always enabled) 2017-11-08 10:51:15 -05:00
John Chilton 3b4b97a2ed Merge pull request #4849 from mtekman/iqtree
Add IQtree datatypes
2017-11-08 10:38:41 -05:00
Mehmet Tekman e347aed810 fix to datatype and sniffer 2017-11-07 21:50:21 +01:00
guerler bdc3a0be5d Fix visualization import link in success message 2017-11-07 14:22:52 -05:00
Marius van den Beek 855ea1a6a2 Merge pull request #4951 from guerler/fix_center_multi_operation
Fix multiple selections for grid operations redirecting to center panel
2017-11-07 19:43:08 +01:00
guerler 2e9bf40095 Fix multi operations if grid operations redirects into center panel 2017-11-07 12:18:43 -05:00
Aysam Guerler 74b37a9de9 Merge pull request #4948 from dannon/fix_trackster_styles
Fix trackster styles bleeding into the app (the slightly offcenter upload .icon buttons)
2017-11-06 17:03:22 -05:00
John Chilton 83eefb6b04 Merge pull request #4945 from nsoranzo/refactor_shell_commands
Activate mulled dependencies once per job
2017-11-06 15:42:40 -05:00
Dannon Baker 9c47e957c3 Bump cssloadfiles to when the views are actually created 2017-11-06 15:25:27 -05:00
Dannon Baker e8c5ea7ad6 Leave trackster .icon styles in (but commented) since there exists some commented code that may need it as a reference. 2017-11-06 15:24:20 -05:00
Dannon Baker 89c83845a1 Remove unused trackster styles. 2017-11-06 15:24:20 -05:00
Mehmet Tekman 4bca1a77cc Merge branch 'dev' of github.com:galaxyproject/galaxy into iqtree 2017-11-06 20:20:47 +01:00
Mehmet Tekman 5b594ae255 moved from data to text 2017-11-06 20:16:30 +01:00
Mehmet Tekman 77c4ccc655 Merge branch 'iqtree' of github.com:mtekman/galaxy into iqtree 2017-11-06 20:07:25 +01:00
Dannon Baker 363a2e0636 Merge branch 'fix_download_button' into dev 2017-11-06 13:43:40 -05:00
Dannon Baker c10da91220 Merge branch 'ajax-es6' into dev 2017-11-06 13:39:17 -05:00
mvdbeek 11a9abbb2d Return an OrderedSet of dependencies instead of a list
This avoids activating mulled dependencies multiple times and fixes
https://github.com/galaxyproject/galaxy/issues/4821. We use OrderedSet because
the order of activation may matter for toolshed dependencies.
2017-11-06 16:36:48 +00:00
Nicola Soranzo 8ef1e51a4a Remove requirement from shell_commands() parameters 2017-11-06 16:28:59 +00:00
Dannon Baker ff5c551042 Merge pull request #4935 from jmchilton/selenium_client_logging
Enable Galaxy client logging during Selenium tests.
2017-11-06 10:07:55 -05:00
mvdbeek 63a3fa483f Point download button for collections to api/dataset_collections 2017-11-06 12:35:51 +01:00
mvdbeek 2faf8577ab Use a collection's history if trans has no history 2017-11-06 12:35:51 +01:00
mvdbeek f927ded864 Add dataset collectino route without history id 2017-11-06 11:42:49 +01:00
mvdbeek 50de5081d6 Add CRAM to BAM converter 2017-11-06 10:24:16 +01:00
John Chilton 128b0a239b Merge pull request #4934 from mvdbeek/download_list_list
Fix downloading of arbitrarily-nested collections
2017-11-05 14:52:30 -05:00
John Chilton e30df782e4 Rebuild client. 2017-11-05 14:38:29 -05:00