 Dannon Baker
|
29ce33ef34
|
Swap from list in universe to a separate config file, add simple UI for managing
|
2015-07-27 11:46:37 -04:00 |
|
|
Dannon Baker
|
4afc756c61
|
Simplest possible tool whitelist implementation
|
2015-07-27 08:19:39 -04:00 |
|
|
Dannon Baker
|
b5e7e1e615
|
Merge branch 'master' into dev
|
2015-07-24 10:39:30 -04:00 |
|
|
Dannon Baker
|
7144ed8f72
|
Merge branch 'release_15.05'
|
2015-07-24 10:37:18 -04:00 |
|
|
Dannon Baker
|
486ba9f23a
|
Merge branch 'release_15.07' into dev
|
2015-07-24 10:23:52 -04:00 |
|
|
Dannon Baker
|
784e07c61f
|
Merge branch 'release_15.05' into release_15.07
|
2015-07-24 10:23:26 -04:00 |
|
|
Eric Rasche
|
8f175ef466
|
Merge pull request #497 from dannon/release_15.05
SCRIPT_NAME can be empty or not in the environment at all. This reso…
|
2015-07-24 09:20:16 -05:00 |
|
|
Dannon Baker
|
5788066a6d
|
SCRIPT_NAME can be empty or not in the environment at all. This resolves http://dev.list.galaxyproject.org/NGINX-uWSGI-with-require-login-needs-uwsgi-param-SCRIPT-NAME-td4666901.html. Thanks to @dctrud and @ericenns for the help tracking it down.
|
2015-07-24 10:04:47 -04:00 |
|
|
Dannon Baker
|
898ff31dd5
|
Merge pull request #492 from carlfeberhard/pephate
Clean up the formatting on mapping.py
|
2015-07-23 14:02:00 -04:00 |
|
|
carlfeberhard
|
05a15c8f7f
|
Merge pull request #2 from dannon/pephate
Tweak a few indentations to avoid kicking toplevel parameters into se…
|
2015-07-23 13:23:30 -04:00 |
|
|
Dannon Baker
|
0c29dd44a4
|
Tweak a few indentations to avoid kicking toplevel parameters into secondary indentation (so they don't get lost), taking logical (as in block) indentation into consideration over line length
|
2015-07-23 13:18:21 -04:00 |
|
|
Carl Eberhard
|
c253eee479
|
Merge branch 'dannon-carlfeberhard-pephate' into pephate
|
2015-07-23 13:03:27 -04:00 |
|
|
Carl Eberhard
|
39c7209c9d
|
Fix conflicts
|
2015-07-23 13:03:14 -04:00 |
|
|
carlfeberhard
|
cd918f633c
|
Merge pull request #494 from dannon/toxfix
Add client to ignore so that tox locally doesn't try to …
|
2015-07-23 11:50:05 -04:00 |
|
|
Dannon Baker
|
e1ade4ea6d
|
Change pep8_sources.txt to flake8_blacklist.txt to be more descriptive about it
|
2015-07-23 11:44:57 -04:00 |
|
|
Dannon Baker
|
134e2b40ff
|
Move all sources to blacklist instead of inline.
|
2015-07-23 11:43:02 -04:00 |
|
|
Dannon Baker
|
30d7d9a056
|
Ignore the whole client dir instead.
|
2015-07-23 11:40:49 -04:00 |
|
|
Dannon Baker
|
5edbdea1fd
|
Add client/node_modules to ignore so that tox locally doesn't try to lint them. This has not been a problem for the CI server, since these never exist.
|
2015-07-23 11:37:43 -04:00 |
|
|
Dannon Baker
|
ef520569d5
|
Slight bracket adjustment
|
2015-07-23 11:30:35 -04:00 |
|
|
Carl Eberhard
|
84474c8a94
|
hulk smash.
|
2015-07-23 11:29:25 -04:00 |
|
|
Dannon Baker
|
b22e1d1329
|
Merge branch 'pephate' of https://github.com/carlfeberhard/galaxy into carlfeberhard-pephate
|
2015-07-23 11:29:13 -04:00 |
|
|
Carl Eberhard
|
df952cb541
|
Fix to 19b2b7d for flubbed text attribute name
|
2015-07-23 11:02:07 -04:00 |
|
|
Dannon Baker
|
07a0341ab6
|
Merge pull request #493 from carlfeberhard/fix.tests
Testing: set order of tags in hda manager tests
|
2015-07-23 09:43:19 -04:00 |
|
|
Carl Eberhard
|
a9c0baae29
|
Testing: set order of tags in hda manager tests
|
2015-07-23 09:38:25 -04:00 |
|
|
Carl Eberhard
|
19b2b7d7cc
|
Clean up the formatting on mapping.py
|
2015-07-22 20:19:59 -04:00 |
|
|
Dannon Baker
|
c77bff0b3c
|
Merge 15.07 into dev
|
2015-07-22 13:47:07 -04:00 |
|
|
Dannon Baker
|
2f8580b931
|
Merge branch 'release_15.05' into release_15.07
|
2015-07-22 13:44:56 -04:00 |
|
|
Dannon Baker
|
558a590e18
|
Merge pull request #475 from blankenberg/custom_builds_objectstore_15.05
[15.05] Fix for users creating Custom DBKeys when objectstore is being used.
|
2015-07-22 13:41:04 -04:00 |
|
|
Dannon Baker
|
a2c50db1fb
|
Merge pull request #482 from carlfeberhard/copy-tags-annos
API, HDAs: use manager copy when copying hdas between histories, pres…
|
2015-07-22 13:06:03 -04:00 |
|
|
Dannon Baker
|
ba7963da5e
|
Merge release_15.07 into dev
|
2015-07-22 12:41:21 -04:00 |
|
|
Dannon Baker
|
488d42deb5
|
Merge branch 'release_15.05' into release_15.07
|
2015-07-22 12:37:26 -04:00 |
|
|
Nitesh Turaga
|
bcd1f74db1
|
Merge pull request #483 from dannon/old_cloudlaunch_errormsg
Catch and return error message during key verification in cloudlaunch.
|
2015-07-22 12:36:12 -04:00 |
|
|
Dannon Baker
|
95f63e7fd3
|
Merge pull request #487 from carlfeberhard/testing
Testing, casperjs: fix the hda api show assertion in the anon tests
|
2015-07-22 12:29:56 -04:00 |
|
|
John Chilton
|
96efac89eb
|
Merge pull request #486 from jgoecks/sweepster-fixes
Fixes to make Sweepster work again: (a) update template syntax to mat…
|
2015-07-22 17:29:31 +01:00 |
|
|
Nicola Soranzo
|
95a46d162a
|
Merge pull request #488 from dannon/tweaks
Improve shortcut logic
|
2015-07-22 18:18:56 +02:00 |
|
|
Dannon Baker
|
14f966ec44
|
Improve shortcut logic (in boolean ANDs, lookup first, calculate second...), cleanup flake8'ing that made this significantly LESS readable.
|
2015-07-22 11:49:51 -04:00 |
|
|
Jeremy Goecks
|
f751314e61
|
Fixes to make Sweepster work again: (a) update template syntax to match changes made in underscore v1.7 and (b) update tool rerun to account for API changes.
|
2015-07-22 10:32:00 -04:00 |
|
|
Carl Eberhard
|
d28f1c7073
|
Testing, casperjs: fix the hda api show assertion in the anon tests
|
2015-07-22 10:06:23 -04:00 |
|
|
Dannon Baker
|
90ddc23714
|
Merge pull request #485 from carlfeberhard/testing
Testing, casperjs: small fixes to selectors and api assertions
|
2015-07-21 18:23:01 -04:00 |
|
|
Dannon Baker
|
cc664ff8a2
|
Merge pull request #484 from carlfeberhard/client-build.grunt-handlebars
Client build: grunt-based handlebars compilation
|
2015-07-21 15:19:52 -04:00 |
|
|
Carl Eberhard
|
e618782ff7
|
Testing, casperjs: small fixes to selectors and api assertions
|
2015-07-21 15:15:51 -04:00 |
|
|
Carl Eberhard
|
e649ff2e5e
|
Client build: transition to grunt based handlebars compilation and minify/map them to static/scripts; cleanup: remove py script, remove uncompiled from minified
|
2015-07-21 14:56:07 -04:00 |
|
|
Carl Eberhard
|
04d5b634b9
|
Client build: update handlebars and complete template compilation task
|
2015-07-21 14:31:07 -04:00 |
|
|
Dannon Baker
|
6049a74468
|
Catch and return error message during key verification in cloudlaunch.
|
2015-07-21 14:03:22 -04:00 |
|
|
Carl Eberhard
|
c91cabf2a4
|
Client build: add template task
|
2015-07-21 13:30:30 -04:00 |
|
|
Carl Eberhard
|
c46be96f21
|
API, HDAs: use manager copy when copying hdas between histories, preserve tags and annotations when copying
|
2015-07-21 11:32:44 -04:00 |
|
|
John Chilton
|
e9e34c9c5f
|
Merge pull request #481 from dannon/flake8_contd
Even more sqlalchemy/flake8 fixes.
|
2015-07-21 14:59:04 +01:00 |
|
|
Dannon Baker
|
e7d3cceb5e
|
Another sqla comparison in the user controller.
|
2015-07-21 08:28:29 -04:00 |
|
|
Dannon Baker
|
ed616f5575
|
sqlalchemy fixes in toolshed repository controller
|
2015-07-21 08:21:33 -04:00 |
|
|
Dannon Baker
|
01010d3a69
|
Another job handler comparison fix.
|
2015-07-21 08:19:11 -04:00 |
|