opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,509 Commits 62 Branches 243 Tags
3e509bd5fb14ac47ba5fac296966ac77e76ff71c
Commit Graph
30509 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dannon Baker 3e509bd5fb Include style-watch in 'watch' overhead task. 2017-10-17 12:49:37 -04:00
Dannon Baker 4309c5467f Style and watch-style naming changes for package scripts. 2017-10-17 12:49:28 -04:00
Dannon Baker a9a81d1f0d Merge remote-tracking branch 'upstream/dev' into es6 2017-10-17 12:10:52 -04:00
Dannon Baker ace6cd719b makefile/Makefile 2017-10-17 10:59:21 -04:00
Dannon Baker ebb8977a78 More minor client readme tweaks. 2017-10-17 10:03:33 -04:00
Dannon Baker 078b431cdc Remove another target from the Makefile, shepherding people into fewer entrypoints for client build. 2017-10-17 10:00:25 -04:00
Dannon Baker 2af5dfad6a Add build-toolshed target to package scripts. 2017-10-17 09:58:49 -04:00
Dannon Baker ca48aa93ab Client README updates. 2017-10-17 09:56:58 -04:00
Nicola Soranzo 5aa624c45a Merge pull request #4814 from blankenberg/depedencies 
Typo: depedencies.
 2017-10-17 07:32:49 +01:00
Daniel Blankenberg 3879f33d39 You're a depedencies. 2017-10-17 00:44:51 -04:00
John Chilton 24e0c3d597 Merge pull request #4811 from nsoranzo/python3 
Extend Python3 flake8 linting to whole codebase
 2017-10-16 18:55:01 -04:00
Nicola Soranzo 255d3daf50 Extend Python3 flake8 linting to whole codebase 
Keep .ci/py3_sources.txt as list of manually ported files.
 2017-10-16 19:53:56 +01:00
Nicola Soranzo f39019e898 Add doctests for unicodify() 2017-10-16 19:47:09 +01:00
Nicola Soranzo b956406c4d Fix Python3 compatibility and import order for 21 files 2017-10-16 19:43:01 +01:00
Dannon Baker 23db8e7109 Remove Makefile cruft; we'll never want to execute webpack directly from here. 2017-10-16 10:46:17 -04:00
Dannon Baker f6b2e1b92c Roll charts building into package scripts, simplify makefile. 2017-10-16 10:44:21 -04:00
Dannon Baker 5707e95d48 Update webpack config, rebuild charts. 2017-10-16 10:27:16 -04:00
Dannon Baker 258675edfa Make package scripts more concise. 2017-10-16 10:06:40 -04:00
Dannon Baker 4df90df0d1 Force yarn to check-files. This is fast, anyway, and prevents confusion when switching between branches and having differing (sometimes missing) node_modules like gulp, etc. 2017-10-16 10:02:58 -04:00
Dannon Baker 9c9cd09894 For js-app, also configure window jquery (supporting unbundled access, things like webhooks, etc.) 2017-10-16 09:39:47 -04:00
Martin Cech f4d45549cf Merge pull request #4722 from jmchilton/empty_datasets 
Fix to respect galaxy.json supplied metadata for empty outputs.
 2017-10-13 15:03:48 -04:00
Dannon Baker 926cf3ef05 Prior to watching, make sure libs are staged. 2017-10-13 12:47:47 -04:00
Dannon Baker f0bf022658 Client-watch does depend on node-deps 2017-10-13 12:46:28 -04:00
Dannon Baker 5e3187405a Bundle toastr in common libs 2017-10-13 12:45:17 -04:00
Dannon Baker 5f64b0b524 More reorg; separate vars. 2017-10-13 12:16:38 -04:00
Dannon Baker deb282c7b4 webpack config formatting 2017-10-13 12:02:50 -04:00
John Chilton 73b4629a0b Merge pull request #4799 from nsoranzo/python3 
Python3: fix remaining print statements
 2017-10-12 21:32:15 -04:00
Dannon Baker 1486ee3730 Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 15:57:35 -04:00
Martin Cech 16843cee9a Merge pull request #4792 from guerler/roles_friendliness 
Add operations to roles, groups and user grids
 2017-10-12 15:55:31 -04:00
Dannon Baker 731a9a6d3e Client-develop -> client-watch, style is built into build and has a package.json target if anyone really needs it. 2017-10-12 15:55:24 -04:00
Dannon Baker 70ef389554 Trim client make targets 2017-10-12 15:52:56 -04:00
Dannon Baker 34749b0440 All libs moving forward are installed by yarn, this endpoint is not to be used. 2017-10-12 14:30:59 -04:00
guerler e9856dec95 Restore sorting by name 2017-10-12 13:53:44 -04:00
Martin Cech 06f6fdd580 Merge pull request #4796 from dannon/dev 
Merges 17.09 -> dev
 2017-10-12 13:35:39 -04:00
Nicola Soranzo d1bc98dfcb Python3: fix remaining print statements 
Remove some debugging prints.
Fix import order.
Consolidate exception logging in ToolShed database migrations.
 2017-10-12 18:34:29 +01:00
Dannon Baker 7ceaec4a22 Merge remote-tracking branch 'upstream/release_17.09' into dev 2017-10-12 12:43:05 -04:00
Dannon Baker ebdadb68ad Merge remote-tracking branch 'upstream/release_17.05' into release_17.09 2017-10-12 12:37:49 -04:00
Dannon Baker a83123ef5e Merge pull request #4794 from mvdbeek/fix_listify_import_in_show_params 
[17.05][BUG] Fix listify import in show params
 2017-10-12 12:37:00 -04:00
Dannon Baker 1e9601d209 Typo fix 2017-10-12 11:36:51 -04:00
mvdbeek 24308fb605 Fix listify import in show_params.mako 
This fixes a problem reported on the [mailing list](http://dev.list.galaxyproject.org/Show-history-structure-Error-Undefined-object-is-not-callable-td4671115.html).
I am not sure why importing at the top of the file is not enough though.
 2017-10-12 17:15:42 +02:00
Dannon Baker 66b89f83ad Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 11:14:17 -04:00
Dannon Baker 6ac5de9ec6 Strip testing cruft from qunit/test-common.js 2017-10-12 11:10:08 -04:00
Dannon Baker c4c15e323c Upgrade sinon to the latest (still legacy) version, fix jquery animation tests handling. 2017-10-12 11:09:04 -04:00
John Chilton dfb2cc2f36 Merge pull request #4779 from guerler/revise_dataset_attributes 
Allow dataset attribute changes without refreshing the page
 2017-10-12 10:37:14 -04:00
John Chilton 49f62e7a35 Merge pull request #4791 from guerler/fix_flatten_label 
Add labels to selection options of the collection flattening tool
 2017-10-12 10:11:22 -04:00
John Chilton 90f9a50574 Merge remote-tracking branch 'jmchilton/dev' into revise_dataset_attributes 2017-10-12 09:43:59 -04:00
Martin Cech e02faa35f9 Merge pull request #4790 from jmchilton/upload_test_no_dbkey 
Add another upload test this time with no dbkey param.
 2017-10-12 09:33:46 -04:00
Martin Cech 643be6463d Merge pull request #4789 from jmchilton/selenium_fix 
Always send dbkey during upload from UI.
 2017-10-12 09:31:02 -04:00
John Chilton 5bf08cf017 Merge pull request #4781 from yhoogstrate/mothur_freq_fix 
Mothur.freq sniffer more stringent
 2017-10-12 07:32:34 -04:00
John Chilton 627fb407ed Merge pull request #59 from guerler/selenium_fix_000 
Use initial dbkey and file_type to specify defaults
 2017-10-12 07:30:57 -04:00