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
20,621 Commits 62 Branches 243 Tags
d72dd3735c0dfd652fb45a117fe1942f10ff726d
Commit Graph
20621 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John Chilton a664deeee7 Merge pull request #1130 from dannon/repack_dev 
Enforce client build deps are up-to-date.  Rebuild style with lessc > 2.5
 2015-11-20 16:15:35 -05:00
carlfeberhard baeaae9905 Webpack: rebuild bundles using webpack 1.12.8 as defined in the package.json 2015-11-20 16:01:59 -05:00
carlfeberhard 51e0986490 Webpack: add in the libs bundles, Carl. They're kinda important. 2015-11-20 15:43:06 -05:00
carlfeberhard 119e26f4e5 Merge pull request #1142 from dannon/menu_onclick_addition 
Menu onclick addition
 2015-11-20 15:15:08 -05:00
Martin Cech 303af68c33 Merge pull request #1149 from carlfeberhard/history.selector-anim 
UI, Lists: throttle selector animation when number of list items > 20
 2015-11-20 15:07:31 -05:00
carlfeberhard 844facd1f1 UI, Lists: throttle selector animation when number of list items > 20 2015-11-20 14:55:14 -05:00
Dannon Baker 81f1b7f8e0 Remove debugging logic and shortcut. 2015-11-20 13:17:46 -05:00
Martin Cech 286f714287 Merge pull request #1085 from guerler/fix_grids_000 
[15.10] Fix dataset grid history change
 2015-11-20 13:08:26 -05:00
Martin Cech 7bb88b3f44 Merge pull request #1097 from jmchilton/cwl_refactoring 
Small Tool and Workflow Cleanups from CWL Work.
 2015-11-20 12:57:43 -05:00
Daniel Blankenberg 09db120ad8 Merge pull request #1141 from martenson/tweak-notes 
[15.10] release notes tweaks
 2015-11-20 12:46:38 -05:00
carlfeberhard dba7e6640f Webpack: correct handlebars template generation to return an AMD function - this normalizes import of templates between webpack and require, fix sweepster tools import and templates 2015-11-20 12:36:05 -05:00
Dannon Baker f0e28555af Support onclick for menu items. 2015-11-20 12:11:55 -05:00
Dannon Baker b8b0e44122 Strip whitespace 2015-11-20 12:11:01 -05:00
Martin Cech ceb8ee127a Merge pull request #11 from dannon/tweak-notes 
Slight wording tweak
 2015-11-20 12:03:44 -05:00
Dannon Baker a5aeea0685 Slight wording tweak 2015-11-20 11:56:27 -05:00
Martin Cech e9ed5bfa62 clarify the bitbucket support 2015-11-20 11:45:58 -05:00
Martin Cech a98e56c9ee Merge pull request #868 from jmchilton/release_notes 
[15.10] Release notes
 2015-11-20 11:24:03 -05:00
John Chilton 0c22d13889 Implement type_source on output collections. 
Inherit collection_type from an input, the way metadata and format can be.

This commit includes a test tool demonstrating this functionality. The tool test for this tool can be executed using the following command:

```
./run_tests.sh -framework -id collection_type_source
```
 2015-11-20 15:32:38 +00:00
Martin Cech 76fc6becd6 add text highlights 2015-11-20 10:30:04 -05:00
carlfeberhard 9c5d4cfc0e (merge dev) 2015-11-20 10:29:23 -05:00
Martin Cech cf16e2c7d3 add bitbucker deprecation notice 2015-11-20 10:27:59 -05:00
Martin Cech 743603b4b7 Merge pull request #1140 from dannon/menufix_2 
[15.10] Don't override search url
 2015-11-20 10:14:12 -05:00
carlfeberhard 7cd5713dbb Webpack: simplify query routes in analysis, remove duplicate js in display.mako and tabular_chunked.mako, change order of requirejs import; testing, casperjs: quiet requirejs scripterrors when navigating away from pages 2015-11-20 10:08:44 -05:00
Dannon Baker adcf513390 Simply remove tool_search_url -- it isn't used and it's totally composable. 2015-11-20 09:47:01 -05:00
Dannon Baker cbf5c68ad7 Don't override search url -- this currently affects main where Help->Search ends up at root.com... 2015-11-20 09:44:01 -05:00
Dannon Baker 05ed245353 Fix the bad merge :( 2015-11-19 20:48:16 -05:00
Dannon Baker f61ec1c3c0 Merge and rebuild client 2015-11-19 20:34:32 -05:00
Dannon Baker 0fdca7d40a A large assortment of escaping fixes to primarily grids and javascript templating, and one bad-data-ingress fix (copy history name). 2015-11-19 20:27:25 -05:00
Dannon Baker 96b17bd856 Merge pull request #1117 from jmchilton/input_hang 
Don't let $input hang cheetah evaluation...
 2015-11-19 17:18:57 -05:00
Eric Rasche 81f842743d Merge pull request #1131 from bgruening/IE_iobio 
Add BAM iobio visualisation as Interactive Environment
 2015-11-19 15:02:37 -06:00
Bjoern Gruening 5188b41790 make travis happy 2015-11-19 20:53:30 +01:00
Bjoern Gruening af36ca6d94 add BAM iobio visualisation as Interactive Environment 2015-11-19 18:58:43 +01:00
Dannon Baker d4a380b49d Swap devDependencies for flat dependencies -- this allows npm ls (and thereby grunt-check-modules) to enforce dep versions. 2015-11-19 12:33:21 -05:00
Dannon Baker 5c285eaee7 Add grunt check task to verify npm modules are up to date 2015-11-19 11:34:49 -05:00
Dannon Baker 40e3e7926a Rebuild style with lessc > 2.5 (which everyone needs to update to now, or we'll have battling commits of packed css 2015-11-19 10:39:24 -05:00
Dannon Baker 5191c2136a Merge pull request #1129 from carlfeberhard/fix.styles 
Style: fix state-success-bg change that was not reverted during 5fd4daf
 2015-11-19 10:23:47 -05:00
carlfeberhard a3fee086c6 Style: fix state-success-bg change that was not reverted during 5fd4daf 2015-11-19 10:18:20 -05:00
Nicola Soranzo d2bab13fa9 Merge pull request #1119 from jmchilton/maxseconds 
Revise and fix waiting for tool tests.
 2015-11-19 10:54:10 +00:00
jgoecks bd476ce146 Readd jquery.migrate to galaxy.panels template because it is needed for farbtastic, which is used in visualizations. 2015-11-18 17:57:56 -05:00
carlfeberhard 17ec1b08fb Webpack: add masthead div to galaxy.panels.mako as a target for replacement and becauseiamgoingcrazyfromtheeightdifferentwayswehavetorenderwebpages 2015-11-18 15:31:56 -05:00
carlfeberhard 5eb9b206e7 Webpack: properly add login app to the repo 2015-11-18 15:29:16 -05:00
carlfeberhard d1d2f8388a Webpack: allow extending options from template call, add /login as app entry point for login app (still allowing user/login), add root/welcome and /login to allowed paths when require_login, fix None type error for redirect when visiting user/login directly, fix rendering of masthead, add query string to object util, correct job_id loading from index 2015-11-18 15:11:30 -05:00
Daniel Blankenberg 7ab070e9df Merge pull request #1123 from natefoo/ie-docfix 
Add nginx config for GIE proxy to documentation
 2015-11-18 14:23:21 -05:00
Nate Coraor 72faca1a3a Document GIE proxy config for nginx, mention the Ansible role. 2015-11-18 14:15:40 -05:00
John Chilton f770128915 Merge pull request #991 from erasche/fix-932 
Fixes #932
 2015-11-18 13:48:34 -05:00
John Chilton e4e44be27b Merge pull request #1004 from jj-umn/uniprotxml_datatype 
UniProtXML datatype
 2015-11-18 13:47:27 -05:00
John Chilton 7fef50f45f Merge pull request #881 from scholtalbers/role-page-fix 
Fix the issue where too many datasets are linked to a certain role
 2015-11-18 13:46:29 -05:00
John Chilton ee2b34c387 Merge pull request #950 from fescudie/dev 
Add BIOM v1 in default datatypes.
 2015-11-18 13:41:02 -05:00
Dannon Baker eb16ba3743 Merge pull request #1122 from jmchilton/empty_cdata_macro 
[15.10] Fix macro bug with empty CDATA being None instead of ''.
 2015-11-18 12:51:00 -05:00
John Chilton 05f3da308d Fix macro bug with empty CDATA being None instead of ''. 
Fixes galaxyproject/planemo#362 thanks for the report @erasche.

Test using the following command:

```
nosetests test/unit/tools/test_tool_loader.py
```
 2015-11-18 12:25:38 +00:00