galaxy-commits
Threads by month
- ----- 2025 -----
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
February 2016
- 2 participants
- 135 discussions
[galaxyproject/galaxy] 06e52c: Drop python2.6 (deprecated, will not be supported ...
by GitHub 25 Feb '16
by GitHub 25 Feb '16
25 Feb '16
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 06e52c0129581f7ed4691bc6790eb2418c20c366
https://github.com/galaxyproject/galaxy/commit/06e52c0129581f7ed4691bc6790e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-02-23 (Tue, 23 Feb 2016)
Changed paths:
M .travis.yml
M tox.ini
Log Message:
-----------
Drop python2.6 (deprecated, will not be supported in 16.04) from testing.
Commit: 70a96dd79e4e3479def3e9072d6d0e5076357fc8
https://github.com/galaxyproject/galaxy/commit/70a96dd79e4e3479def3e9072d6d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths:
M .travis.yml
M tox.ini
Log Message:
-----------
Merge pull request #1785 from dannon/26_deprecated
Drop python2.6 (deprecated, will not be supported in 16.04) from test…
Compare: https://github.com/galaxyproject/galaxy/compare/874540e9120d...70a96dd79e4e
1
0
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 87d6467812ff1025955006db1554b3b433b544f5
https://github.com/galaxyproject/galaxy/commit/87d6467812ff1025955006db1554…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
Log Message:
-----------
Fix unused import.
Commit: 874540e9120d33595f6a64ba34a8fcc94481fb50
https://github.com/galaxyproject/galaxy/commit/874540e9120d33595f6a64ba34a8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
Log Message:
-----------
Merge pull request #1796 from nsoranzo/lint_fix
Fix unused import.
Compare: https://github.com/galaxyproject/galaxy/compare/b14e35f48ba8...874540e9120d
1
0
3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ccabdd21cb20/
Changeset: ccabdd21cb20
Branch: release_16.01
User: natefoo
Date: 2016-02-25 02:33:13+00:00
Summary: Update Tags
Affected #: 1 file
diff -r 0079d3c5a85d4f5316a41628a2669c442ead02c4 -r ccabdd21cb20e9d84120dbd1fb85d8c8af881158 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,18 +20,26 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-92a6a3da997408ae10e9085e6ebcd83ef0b5826c latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 v14.10.3
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-6ee7fe93e76d91919d43a3ef2984e182601b82d7 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 v15.01.4
738f4ad0eb62d5e4bcf0d22a2722ee6c570382b9 v15.03
9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1
bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2
ec735da377ca3badbb6c8bf8a60b3909d2333f9b v15.03.3
-ec735da377ca3badbb6c8bf8a60b3909d2333f9b latest_15.03
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 v15.03.4
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 latest_15.03
c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05
403973a6b841888e1a920eac266087703af53718 v15.05.1
-403973a6b841888e1a920eac266087703af53718 latest_15.05
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e v15.05.2
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e latest_15.05
0994712eb599fb98f63816bd9278946066784c4d v15.07
-0994712eb599fb98f63816bd9278946066784c4d latest_15.07
+034cb0fb87dfc2ae56de1072a45a68189797e979 v15.07.1
+034cb0fb87dfc2ae56de1072a45a68189797e979 latest_15.07
37d665ba001b780e08977a1faa310a651e4875db v15.10
-37d665ba001b780e08977a1faa310a651e4875db latest_15.10
+36c05261343412370f9e44f4bdd4b1e19a97aa55 v15.10.2
+36c05261343412370f9e44f4bdd4b1e19a97aa55 latest_15.10
+0079d3c5a85d4f5316a41628a2669c442ead02c4 v16.01
+0079d3c5a85d4f5316a41628a2669c442ead02c4 latest_16.01
https://bitbucket.org/galaxy/galaxy-central/commits/e9926c3b0a23/
Changeset: e9926c3b0a23
Branch: stable
User: natefoo
Date: 2016-02-25 02:33:32+00:00
Summary: Merge release_16.01 to stable
Affected #: 1 file
diff -r b3337bd87fe5c76ab37211f4daaa15a053e8e0b3 -r e9926c3b0a23b051ba96a54306da46aad263b119 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,18 +20,26 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-92a6a3da997408ae10e9085e6ebcd83ef0b5826c latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 v14.10.3
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-6ee7fe93e76d91919d43a3ef2984e182601b82d7 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 v15.01.4
738f4ad0eb62d5e4bcf0d22a2722ee6c570382b9 v15.03
9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1
bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2
ec735da377ca3badbb6c8bf8a60b3909d2333f9b v15.03.3
-ec735da377ca3badbb6c8bf8a60b3909d2333f9b latest_15.03
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 v15.03.4
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 latest_15.03
c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05
403973a6b841888e1a920eac266087703af53718 v15.05.1
-403973a6b841888e1a920eac266087703af53718 latest_15.05
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e v15.05.2
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e latest_15.05
0994712eb599fb98f63816bd9278946066784c4d v15.07
-0994712eb599fb98f63816bd9278946066784c4d latest_15.07
+034cb0fb87dfc2ae56de1072a45a68189797e979 v15.07.1
+034cb0fb87dfc2ae56de1072a45a68189797e979 latest_15.07
37d665ba001b780e08977a1faa310a651e4875db v15.10
-37d665ba001b780e08977a1faa310a651e4875db latest_15.10
+36c05261343412370f9e44f4bdd4b1e19a97aa55 v15.10.2
+36c05261343412370f9e44f4bdd4b1e19a97aa55 latest_15.10
+0079d3c5a85d4f5316a41628a2669c442ead02c4 v16.01
+0079d3c5a85d4f5316a41628a2669c442ead02c4 latest_16.01
https://bitbucket.org/galaxy/galaxy-central/commits/3f95c21b1a85/
Changeset: 3f95c21b1a85
User: natefoo
Date: 2016-02-25 02:33:44+00:00
Summary: Merge stable to default
Affected #: 1 file
diff -r a601b5dfeea28d200985b5af87e3e0202be6b125 -r 3f95c21b1a85af3ae1260eb957ea041d1de8bd5b .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,18 +20,26 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-92a6a3da997408ae10e9085e6ebcd83ef0b5826c latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 latest_2014.10.06
+a94b3a97ed7ae6672c9b1dc87922f7e9f2a70860 v14.10.3
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-6ee7fe93e76d91919d43a3ef2984e182601b82d7 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 latest_2015.01.13
+7ca8f0ecb2ae8b1ba2b53e1fd09ccae481940a49 v15.01.4
738f4ad0eb62d5e4bcf0d22a2722ee6c570382b9 v15.03
9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1
bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2
ec735da377ca3badbb6c8bf8a60b3909d2333f9b v15.03.3
-ec735da377ca3badbb6c8bf8a60b3909d2333f9b latest_15.03
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 v15.03.4
+7ddb41dcb2b2e4d3a6f834d3dd11426f26fb7902 latest_15.03
c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05
403973a6b841888e1a920eac266087703af53718 v15.05.1
-403973a6b841888e1a920eac266087703af53718 latest_15.05
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e v15.05.2
+6c2fd7bddc6c1c4e8a64093f3fc4c4370f515b4e latest_15.05
0994712eb599fb98f63816bd9278946066784c4d v15.07
-0994712eb599fb98f63816bd9278946066784c4d latest_15.07
+034cb0fb87dfc2ae56de1072a45a68189797e979 v15.07.1
+034cb0fb87dfc2ae56de1072a45a68189797e979 latest_15.07
37d665ba001b780e08977a1faa310a651e4875db v15.10
-37d665ba001b780e08977a1faa310a651e4875db latest_15.10
+36c05261343412370f9e44f4bdd4b1e19a97aa55 v15.10.2
+36c05261343412370f9e44f4bdd4b1e19a97aa55 latest_15.10
+0079d3c5a85d4f5316a41628a2669c442ead02c4 v16.01
+0079d3c5a85d4f5316a41628a2669c442ead02c4 latest_16.01
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1
0
Branch: refs/heads/master
Home: https://github.com/galaxyproject/galaxy
Commit: 76bcfaa0ff85fe996ee2afccfb85e01f154e75b3
https://github.com/galaxyproject/galaxy/commit/76bcfaa0ff85fe996ee2afccfb85…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/tools/tools-form-workflow.js
M client/galaxy/scripts/mvc/tools/tools-jobs.js
M client/galaxy/scripts/utils/deferred.js
M client/galaxy/scripts/utils/uploadbox.js
M static/maps/galaxy-app-base.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/tools/tools-form-workflow.js.map
M static/maps/mvc/tools/tools-jobs.js.map
M static/maps/utils/deferred.js.map
M static/maps/utils/uploadbox.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/tools/tools-form-workflow.js
M static/scripts/mvc/tools/tools-jobs.js
M static/scripts/utils/deferred.js
M static/scripts/utils/uploadbox.js
Log Message:
-----------
Fix log comments
Use emit
Fix namespace
Fix namespace
Remove empty line
Check if logger exists
Fix comment
Redo
More
Fix yet another log
Fix statements
More fixes
Move emitter
Commit: c36ff5bcc7e840289e1d6c10610ac1dd90ddee19
https://github.com/galaxyproject/galaxy/commit/c36ff5bcc7e840289e1d6c10610a…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
A scripts/check_eggs.py
A scripts/fetch_eggs.py
Log Message:
-----------
Merge pull request #1037 from natefoo/smash-eggs-bugfix1
Add stub fetch_eggs.py/check_eggs.py
Commit: dc534bb258d7a9aaf262784acdb9893339ca43c0
https://github.com/galaxyproject/galaxy/commit/dc534bb258d7a9aaf262784acdb9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M lib/galaxy/web/framework/webapp.py
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M tools/stats/gsummary.py
Log Message:
-----------
Merge branch 'release_15.10' into dev
Conflicts:
client/galaxy/scripts/mvc/grid/grid-view.js
static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Commit: daccea42bdbd545e6ed9d91bd4685036b95410a8
https://github.com/galaxyproject/galaxy/commit/daccea42bdbd545e6ed9d91bd468…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/tools/tools-form-workflow.js
M client/galaxy/scripts/mvc/tools/tools-jobs.js
M client/galaxy/scripts/utils/deferred.js
M client/galaxy/scripts/utils/uploadbox.js
M static/maps/galaxy-app-base.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/tools/tools-form-workflow.js.map
M static/maps/mvc/tools/tools-jobs.js.map
M static/maps/utils/deferred.js.map
M static/maps/utils/uploadbox.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/tools/tools-form-workflow.js
M static/scripts/mvc/tools/tools-jobs.js
M static/scripts/utils/deferred.js
M static/scripts/utils/uploadbox.js
Log Message:
-----------
Merge pull request #1040 from guerler/revise_logging_000
Fix log statements and link to logger
Commit: 2934c2f3bd2aba6bad02d18f687b4410362738ed
https://github.com/galaxyproject/galaxy/commit/2934c2f3bd2aba6bad02d18f687b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M tools/stats/gsummary.py
Log Message:
-----------
Lint fix for 15.10 to dev merge.
Commit: 9c35d35c52eca6638e25459293ac9a28e40f9d63
https://github.com/galaxyproject/galaxy/commit/9c35d35c52eca6638e25459293ac…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
R client/galaxy/scripts/galaxy.base.js
M client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.panels.js
M client/galaxy/scripts/mvc/app/app-view.js
A client/galaxy/scripts/onload.js
A client/galaxy/scripts/panel.js
M client/galaxy/scripts/ui/autocom_tagging.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/trackster/util.js
M client/webpack.config.js
R static/maps/galaxy.base.js.map
R static/maps/galaxy.panels.js.map
M static/maps/mvc/app/app-view.js.map
A static/maps/onload.js.map
A static/maps/panel.js.map
M static/maps/ui/autocom_tagging.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/trackster/util.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
R static/scripts/galaxy.base.js
R static/scripts/galaxy.panels.js
M static/scripts/mvc/app/app-view.js
A static/scripts/onload.js
A static/scripts/panel.js
M static/scripts/ui/autocom_tagging.js
M static/scripts/viz/trackster/util.js
Log Message:
-----------
Webpack: make autocom_tagging into a module, export commatize, rename galaxy.base to onload and galaxy.panels to panels
Commit: d4ca44c898d173b9a32c3bdc7c7cce313ecbfa73
https://github.com/galaxyproject/galaxy/commit/d4ca44c898d173b9a32c3bdc7c7c…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
Log Message:
-----------
Add pygments back, since it's a dependency of a conditional dependency.
Commit: 063390097e23e0f9c8d956ca8a4e493e41b3b38b
https://github.com/galaxyproject/galaxy/commit/063390097e23e0f9c8d956ca8a4e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M .ci/flake8_wrapper.sh
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/galaxy.panels.js
M client/galaxy/scripts/libs/jquery/select2.js
M client/galaxy/scripts/mvc/app/app-analysis.js
M client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-li-edit.js
M client/galaxy/scripts/mvc/collection/collection-li.js
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/collection/collection-panel.js
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/grid/grid-template.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
M client/galaxy/scripts/mvc/history/history-panel.js
M client/galaxy/scripts/mvc/history/history-structure-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/list/list-item.js
M client/galaxy/scripts/mvc/list/list-panel.js
M client/galaxy/scripts/mvc/tags.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/tools/tools-form-workflow.js
M client/galaxy/scripts/mvc/tools/tools-jobs.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/upload/upload-button.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/user/user-quotameter.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/tool_link.handlebars
M client/galaxy/scripts/utils/add-logging.js
M client/galaxy/scripts/utils/deferred.js
M client/galaxy/scripts/utils/metrics-logger.js
M client/galaxy/scripts/utils/uploadbox.js
M client/galaxy/style/less/base.less
M client/galaxy/style/less/bootstrap.less
M client/galaxy/style/less/ui.less
M client/galaxy/style/less/upload.less
M config/plugins/visualizations/charts/static/build-app.js
M config/plugins/visualizations/charts/static/charts/jqplot/boxplot/wrapper.js
M config/plugins/visualizations/charts/static/charts/nvd3/pie/wrapper.js
M config/plugins/visualizations/charts/static/charts/tools.js
M config/plugins/visualizations/charts/static/views/group.js
M config/plugins/visualizations/charts/static/views/viewport.js
M lib/galaxy/app.py
M lib/galaxy/config.py
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
M lib/galaxy/dependencies/requirements.txt
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/search/__init__.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/util/__init__.py
M lib/galaxy/webapps/galaxy/api/library_contents.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/reports/app.py
M lib/galaxy/webapps/tool_shed/app.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/galaxy_install/tool_migration_manager.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/hg_util.py
M run.sh
A scripts/check_eggs.py
A scripts/fetch_eggs.py
M static/maps/galaxy-app-base.js.map
M static/maps/libs/jquery/select2.js.map
M static/maps/mvc/app/app-analysis.js.map
M static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
M static/maps/mvc/collection/collection-panel.js.map
M static/maps/mvc/collection/list-collection-creator.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/collection/pair-collection-creator.js.map
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/grid/grid-template.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
M static/maps/mvc/history/history-panel.js.map
M static/maps/mvc/history/history-structure-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/list/list-item.js.map
M static/maps/mvc/list/list-panel.js.map
M static/maps/mvc/tags.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/tools/tools-form-workflow.js.map
M static/maps/mvc/tools/tools-jobs.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/upload/upload-button.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/user/user-quotameter.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/utils/add-logging.js.map
M static/maps/utils/deferred.js.map
M static/maps/utils/metrics-logger.js.map
M static/maps/utils/uploadbox.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/galaxy.panels.js
M static/scripts/libs/jquery/select2.js
M static/scripts/mvc/app/app-analysis.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
M static/scripts/mvc/collection/collection-panel.js
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/grid/grid-template.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
M static/scripts/mvc/history/history-panel.js
M static/scripts/mvc/history/history-structure-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/list/list-item.js
M static/scripts/mvc/list/list-panel.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/tools/tools-form-workflow.js
M static/scripts/mvc/tools/tools-jobs.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/upload/upload-button.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/user/user-quotameter.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/utils/add-logging.js
M static/scripts/utils/deferred.js
M static/scripts/utils/metrics-logger.js
M static/scripts/utils/uploadbox.js
M static/style/blue/base.css
M templates/galaxy_client_app.mako
M test/api/helpers.py
M test/qunit/tests/galaxy-app-base.js
M tools/filters/wig_to_bigwig.xml
Log Message:
-----------
Merge and resolve conflicts
Commit: 649a83c1aa8026160f8d77cb423547ecb76cda28
https://github.com/galaxyproject/galaxy/commit/649a83c1aa8026160f8d77cb4235…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.frame.js
M client/galaxy/scripts/galaxy.masthead.js
M client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/style/less/base.less
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/galaxy.frame.js.map
M static/maps/galaxy.masthead.js.map
M static/maps/galaxy.menu.js.map
M static/maps/mvc/app/app-view.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/galaxy.frame.js
M static/scripts/galaxy.masthead.js
M static/scripts/galaxy.menu.js
M static/scripts/mvc/app/app-view.js
M static/style/blue/base.css
M templates/js-app.mako
M templates/webapps/galaxy/galaxy.masthead.mako
Log Message:
-----------
Webpack: (shoulda been 2 sep. commits) re-add minimal DOM for 1,2,3 panel layouts via server-side/js-app.mako, correct noscript tag styling; Instantiate galaxy.frame and galaxy.menu from galaxy.masthead (currently the only user), reverse dependencies in them (masthead imports them), and move GalaxyMastheadTab into galaxy.menu and GalaxyMastheadIcon into galaxy.frame - allowing a single import of galaxy.masthead
Commit: a639b0c996b13d45412115009615af826ca38ed8
https://github.com/galaxyproject/galaxy/commit/a639b0c996b13d45412115009615…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
R client/galaxy/scripts/galaxy.frame.js
R client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.menu.js
A client/galaxy/scripts/layout/masthead.js
A client/galaxy/scripts/layout/menu.js
A client/galaxy/scripts/layout/panel.js
A client/galaxy/scripts/layout/scratchbook.js
M client/galaxy/scripts/mvc/app/app-view.js
R client/galaxy/scripts/panel.js
M client/webpack.config.js
R static/maps/galaxy.frame.js.map
R static/maps/galaxy.masthead.js.map
R static/maps/galaxy.menu.js.map
A static/maps/layout/masthead.js.map
A static/maps/layout/menu.js.map
A static/maps/layout/panel.js.map
A static/maps/layout/scratchbook.js.map
M static/maps/mvc/app/app-view.js.map
R static/maps/panel.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
R static/scripts/galaxy.frame.js
R static/scripts/galaxy.masthead.js
R static/scripts/galaxy.menu.js
A static/scripts/layout/masthead.js
A static/scripts/layout/menu.js
A static/scripts/layout/panel.js
A static/scripts/layout/scratchbook.js
M static/scripts/mvc/app/app-view.js
R static/scripts/panel.js
M templates/webapps/galaxy/galaxy.masthead.mako
Log Message:
-----------
Webpack: move galaxy.masthead and galaxy.menu to layout/masthead and layout/menu, panel to layout/panel, and rename galaxy.frame to layout/scratchbook
Commit: 54382e8c2f0e6a3e54d7968b999708dcb8bd0998
https://github.com/galaxyproject/galaxy/commit/54382e8c2f0e6a3e54d7968b9997…
Author: youri <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M .gitignore
Log Message:
-----------
Added gitignore rules to ignore custom tool-data
Commit: 1333f803757215a77a988bf211e315744ec00024
https://github.com/galaxyproject/galaxy/commit/1333f803757215a77a988bf211e3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M .gitignore
Log Message:
-----------
Merge pull request #1048 from yhoogstrate/tool_data_gitignore
Added gitignore rules to ignore custom tool-data
Commit: b3d5f80621cc7a450158c472aa4bffa0570fbe6c
https://github.com/galaxyproject/galaxy/commit/b3d5f80621cc7a450158c472aa4b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/util/job_script/__init__.py
M lib/galaxy/tools/parameters/basic.py
M test/functional/tools/samples_tool_conf.xml
A test/functional/tools/unicode_stream.xml
Log Message:
-----------
Improved unicode handling stdout/stderr/command_line.
Commit: c790fcb84d005025b331b2a9106e7097860a7545
https://github.com/galaxyproject/galaxy/commit/c790fcb84d005025b331b2a9106e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/model/__init__.py
Log Message:
-----------
Unify standard error and output trimming and unicoding.
Should be more complete now (were paths for task and jobs where it wasn't be unicodified) and with less duplication. Moved logic into model layer where it probably belongs anyway.
Commit: 6b521a3557bc61e37200cbd4c14dbc037cf9696d
https://github.com/galaxyproject/galaxy/commit/6b521a3557bc61e37200cbd4c14d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M test/unit/jobs/test_job_output_checker.py
Log Message:
-----------
Fix failing tests for output checker changes.
Commit: 69dcf36678db48851cb6d820aec85f9fa37ccfbf
https://github.com/galaxyproject/galaxy/commit/69dcf36678db48851cb6d820aec8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
Log Message:
-----------
Fixes for c790fcb84d005025b331b2a9106e7097860a7545.
Thanks to @nsoranzo.
Commit: df576f3d3602cad77ea6829717ea11606bce97c2
https://github.com/galaxyproject/galaxy/commit/df576f3d3602cad77ea6829717ea…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
Log Message:
-----------
Remove more unneeded stuff from galaxy.jobs now.
Thanks to @nsoranzo.
Commit: 6dfacb6fe648097c94fb32db2df5e643cdcc45e1
https://github.com/galaxyproject/galaxy/commit/6dfacb6fe648097c94fb32db2df5…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
M lib/galaxy/dependencies/requirements.txt
Log Message:
-----------
Merge pull request #1017 from dannon/weberror_downgrade
Downgrade WebError.
Commit: d0751ef80c3074e9f67cde240d4b512e1bc9a445
https://github.com/galaxyproject/galaxy/commit/d0751ef80c3074e9f67cde240d4b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
Log Message:
-----------
Restore lost call.
Caught by @nsoranzo.
Commit: 39ff0e9d767a7a4089546d76b0747d4373ea97c9
https://github.com/galaxyproject/galaxy/commit/39ff0e9d767a7a4089546d76b074…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M lib/galaxy/web/framework/webapp.py
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M tools/stats/gsummary.py
Log Message:
-----------
Merge pull request #1044 from jmchilton/release_15.10_to_dev
Bring 15.10 (and 15.07) fixes into dev.
Commit: a956cac4196e0e0c58b45b2efbc79256e4962e0e
https://github.com/galaxyproject/galaxy/commit/a956cac4196e0e0c58b45b2efbc7…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
Log Message:
-----------
Fix import of history datasets into library.
Commit: 4f824cb920e36d2b79250bdd327e59a771b4587c
https://github.com/galaxyproject/galaxy/commit/4f824cb920e36d2b79250bdd327e…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M static/maps/mvc/library/library-folderrow-view.js.map
M static/scripts/mvc/library/library-folderrow-view.js
Log Message:
-----------
Add changed static files.
Commit: 30668fe5344192e7b17f05060062fa330c5496a0
https://github.com/galaxyproject/galaxy/commit/30668fe5344192e7b17f05060062…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/web/base/controllers/admin.py
M templates/admin/reload_tool.mako
Log Message:
-----------
Fix for reloading tools that have non-standard tool_ids/versions.
Commit: 3f898677f19d7600648802b1a428ce916dd35e11
https://github.com/galaxyproject/galaxy/commit/3f898677f19d7600648802b1a428…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
HTML escape tool name, id, version, on tool reload message.
Commit: 045832bd8ecd4515d134cb5e05f64d2b7b4e933a
https://github.com/galaxyproject/galaxy/commit/045832bd8ecd4515d134cb5e05f6…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Also escape tool name, id, version in message when removing tools.
Commit: 75d64893489d56e1a7b80165bacdeb2a8777875c
https://github.com/galaxyproject/galaxy/commit/75d64893489d56e1a7b80165bacd…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M static/maps/mvc/library/library-folderrow-view.js.map
M static/scripts/mvc/library/library-folderrow-view.js
Log Message:
-----------
Merge pull request #1049 from mvdbeek/library_add_from_history
Fix import of history datasets into library.
Commit: 8aab57a09eb322c7f10025ee4518995323fbc637
https://github.com/galaxyproject/galaxy/commit/8aab57a09eb322c7f10025ee4518…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/model/__init__.py
Log Message:
-----------
Fix nit picks unrelated to PR #1052...
... as pointed out by @nsoranzo and @blankenberg.
Commit: 81dc3a955bae39d90f16441dad5a67a708177844
https://github.com/galaxyproject/galaxy/commit/81dc3a955bae39d90f16441dad5a…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/history_contents.py
Log Message:
-----------
Fix typo.
Commit: 86220c7685ff831d3d5b39732706c679e77afd38
https://github.com/galaxyproject/galaxy/commit/86220c7685ff831d3d5b39732706…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/managers/users.py
M lib/galaxy/webapps/galaxy/api/users.py
Log Message:
-----------
Extend users API with delete action.
Commit: f700e38241d302406dde9c0eef9449ae2f054c6d
https://github.com/galaxyproject/galaxy/commit/f700e38241d302406dde9c0eef94…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/users.py
Log Message:
-----------
Fix is_admin value in users API show method to show if the requested user is an admin, not the current user.
Commit: d4e7c601a095c9138f5f5841b29d345c8b2d96a9
https://github.com/galaxyproject/galaxy/commit/d4e7c601a095c9138f5f5841b29d…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/users.py
Log Message:
-----------
Add check for allow_user_deletion.
Commit: 24a7ee6205ac4cb45f9249a6aa3f89241121c7ca
https://github.com/galaxyproject/galaxy/commit/24a7ee6205ac4cb45f9249a6aa3f…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/util/job_script/__init__.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/parameters/basic.py
M test/functional/tools/samples_tool_conf.xml
A test/functional/tools/unicode_stream.xml
M test/unit/jobs/test_job_output_checker.py
Log Message:
-----------
Merge pull request #1052 from jmchilton/unicode_stream_3
Improved Encoding Handling for Jobs
Commit: b1266b45dc4ddd63a2b2ae1cc9c28ba9d43a2bc0
https://github.com/galaxyproject/galaxy/commit/b1266b45dc4ddd63a2b2ae1cc9c2…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/galaxy.js
A client/galaxy/scripts/apps/history-panel.js
A client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/galaxy-app-base.js
A client/galaxy/scripts/layout/page.js
M client/galaxy/scripts/layout/panel.js
M client/galaxy/scripts/mvc/tools.js
M client/galaxy/scripts/onload.js
M client/webpack.config.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/galaxy-app-base.js.map
A static/maps/layout/page.js.map
M static/maps/layout/panel.js.map
M static/maps/mvc/tools.js.map
M static/maps/onload.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/galaxy-app-base.js
A static/scripts/layout/page.js
M static/scripts/layout/panel.js
M static/scripts/mvc/tools.js
M static/scripts/onload.js
M templates/base/base_panels.mako
M templates/js-app.mako
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Webpack: move panel to Backbone, implement ToolPanel and HistoryPanel; simplify js-app.mako (by removing alternate layouts); clean up debugging info, make Galaxy less chatty before logging setup
Commit: 43b8addcbcbe69eb1d223a3689fdb81ef1510f6d
https://github.com/galaxyproject/galaxy/commit/43b8addcbcbe69eb1d223a3689fd…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/managers/users.py
M lib/galaxy/webapps/galaxy/api/history_contents.py
M lib/galaxy/webapps/galaxy/api/users.py
Log Message:
-----------
Merge pull request #1063 from nsoranzo/api_delete_user
Extend users API with delete action.
Commit: ee721c5d360e774636d271db673d1485ddcc7a21
https://github.com/galaxyproject/galaxy/commit/ee721c5d360e774636d271db673d…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M cron/build_chrom_db.py
Log Message:
-----------
Check len files during download from UCSC.
Do not create file in case of errors, so the cron script will not
overwrite a good file with a bad one.
Commit: 11926b3b9c3241d0b72ee4fcea127c18c5aaf9c6
https://github.com/galaxyproject/galaxy/commit/11926b3b9c3241d0b72ee4fcea12…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M CONTRIBUTORS.md
Log Message:
-----------
add @mr-c
Commit: c1bf4caea985d53bbcdf844561a34a588f541eec
https://github.com/galaxyproject/galaxy/commit/c1bf4caea985d53bbcdf844561a3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M CONTRIBUTORS.md
Log Message:
-----------
Merge pull request #1067 from martenson/add-biocrusoe
add biocrusoe to contributors
Commit: c1cc3bd483fc2197b43048f467be6e80f80babea
https://github.com/galaxyproject/galaxy/commit/c1cc3bd483fc2197b43048f467be…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.library.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
M static/scripts/galaxy.library.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-libraryrow-view.js
M templates/base/base_panels.mako
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Webpack: fix masthead in libraries; update Panel usage in base_panels.mako, galaxy.panels.mako
Commit: 11b23bf8392c8ecf7c48978003f0fc3082d07234
https://github.com/galaxyproject/galaxy/commit/11b23bf8392c8ecf7c48978003f0…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
Log Message:
-----------
Fix lped report output from converter
Commit: 22ed188c0344a41df5cf015486be34de197b88fc
https://github.com/galaxyproject/galaxy/commit/22ed188c0344a41df5cf015486be…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
Log Message:
-----------
Merge pull request #1069 from dannon/fix_lped_report_output
Fix lped report output from converter
Commit: be3d9cbf70b1899f316ff7cf5aabdd0d191179ce
https://github.com/galaxyproject/galaxy/commit/be3d9cbf70b1899f316ff7cf5aab…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
Log Message:
-----------
Fix one more hanging div.
Commit: a4edf159be9996d09bb029d2098d9c0d39fb2975
https://github.com/galaxyproject/galaxy/commit/a4edf159be9996d09bb029d2098d…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M .gitignore
M CONTRIBUTORS.md
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/libs/jquery/select2.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/grid/grid-template.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/tools/tools-form-workflow.js
M client/galaxy/scripts/mvc/tools/tools-jobs.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/upload/upload-button.js
M client/galaxy/scripts/utils/deferred.js
M client/galaxy/scripts/utils/uploadbox.js
M client/galaxy/style/less/base.less
M client/galaxy/style/less/ui.less
M client/galaxy/style/less/upload.less
M config/plugins/visualizations/charts/static/build-app.js
M lib/galaxy/dependencies/__init__.py
M lib/galaxy/dependencies/conditional-requirements.txt
M lib/galaxy/dependencies/requirements.txt
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/util/job_script/__init__.py
M lib/galaxy/managers/users.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/api/history_contents.py
M lib/galaxy/webapps/galaxy/api/users.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M run.sh
A scripts/check_eggs.py
A scripts/fetch_eggs.py
M static/maps/galaxy-app-base.js.map
M static/maps/libs/jquery/select2.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/grid/grid-template.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/tools/tools-form-workflow.js.map
M static/maps/mvc/tools/tools-jobs.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/upload/upload-button.js.map
M static/maps/utils/deferred.js.map
M static/maps/utils/uploadbox.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/libs/jquery/select2.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/grid/grid-template.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/tools/tools-form-workflow.js
M static/scripts/mvc/tools/tools-jobs.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/upload/upload-button.js
M static/scripts/utils/deferred.js
M static/scripts/utils/uploadbox.js
M static/style/blue/base.css
M test/api/helpers.py
M test/functional/tools/samples_tool_conf.xml
A test/functional/tools/unicode_stream.xml
M test/unit/jobs/test_job_output_checker.py
M tools/filters/wig_to_bigwig.xml
M tools/stats/gsummary.py
Log Message:
-----------
(merge dev)
Commit: dc0b960ea1242ae3ec34e7d00c5f8619e06f7b59
https://github.com/galaxyproject/galaxy/commit/dc0b960ea1242ae3ec34e7d00c5f…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/layout/page.js
M client/galaxy/scripts/layout/panel.js
M client/galaxy/scripts/onload.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/layout/page.js
M static/scripts/layout/panel.js
M static/scripts/onload.js
M templates/base/base_panels.mako
M templates/js-app.mako
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Webpack: lowercase DD-helper throughout project to reflect changes in 7717659
Commit: 1cf5af4c20231996e58756ace72e4a1ca96b227d
https://github.com/galaxyproject/galaxy/commit/1cf5af4c20231996e58756ace72e…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
Log Message:
-----------
Merge pull request #1070 from dannon/fix_lped_report_output
Fix one more hanging div in lped to pbed converter.
Commit: 240da5e720c069b08caf77828dc4e3e598b56089
https://github.com/galaxyproject/galaxy/commit/240da5e720c069b08caf77828dc4…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
Log Message:
-----------
Update both lped pbed pbed lped converters to be in sync with their html. Thanks @nsoranzo.
Commit: 67d0bcb5b3bba9c13bfa0c556a4460e1304b63a9
https://github.com/galaxyproject/galaxy/commit/67d0bcb5b3bba9c13bfa0c556a44…
Author: Mark Einon <mark.einon(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools.js
M static/maps/mvc/tools.js.map
M static/scripts/mvc/tools.js
Log Message:
-----------
Trivial: Replace unnecessary duplicated var check with 'else if'
Commit: 926b1a2cdd3c772f214a2ae62945427d2c36402f
https://github.com/galaxyproject/galaxy/commit/926b1a2cdd3c772f214a2ae62945…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools.js
M static/maps/mvc/tools.js.map
M static/scripts/mvc/tools.js
Log Message:
-----------
Merge pull request #1073 from einon/einon
Trivial: Replace unnecessary duplicated var check with 'else if'
Commit: 78e6253178b51afa77346b259801f221eb9c201e
https://github.com/galaxyproject/galaxy/commit/78e6253178b51afa77346b259801…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
A client/galaxy/scripts/layout/modal.js
R client/galaxy/scripts/modal.js
M client/galaxy/scripts/onload.js
M client/webpack.config.js
A static/maps/layout/modal.js.map
R static/maps/modal.js.map
A static/scripts/layout/modal.js
R static/scripts/modal.js
Log Message:
-----------
Webpack: move old school modal into layout/
Commit: 215391f571f72725a87f45b556be10e8446db8a9
https://github.com/galaxyproject/galaxy/commit/215391f571f72725a87f45b556be…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
R client/galaxy/scripts/galaxy-async.js
R static/maps/galaxy-async.js.map
R static/scripts/galaxy-async.js
Log Message:
-----------
Webpack: remove galaxy-async
Commit: 3a70dc395a2afb73363440edaa624d6f053467d2
https://github.com/galaxyproject/galaxy/commit/3a70dc395a2afb73363440edaa62…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/web/base/controllers/admin.py
M templates/admin/reload_tool.mako
Log Message:
-----------
Merge pull request #1050 from blankenberg/reload-tool-id-fix
Fix for reloading tools that have non-standard tool_ids/versions.
Commit: 350a53f1ef9c686ad3617cc37f037251a79a28ef
https://github.com/galaxyproject/galaxy/commit/350a53f1ef9c686ad3617cc37f03…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
R client/galaxy/scripts/base.js
M client/galaxy/scripts/viz/trackster.js
R static/maps/base.js.map
M static/maps/viz/trackster.js.map
R static/scripts/base.js
M static/scripts/viz/trackster.js
Log Message:
-----------
Webpack: move base.Base to trackster (which uses it)
Commit: f971e17f95d62662eaec47a96da88f1b45d823ce
https://github.com/galaxyproject/galaxy/commit/f971e17f95d62662eaec47a96da8…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
R client/galaxy/scripts/galaxy.ui.scrollPanel.js
A client/galaxy/scripts/ui/scroll-panel.js
R static/maps/galaxy.ui.scrollPanel.js.map
A static/maps/ui/scroll-panel.js.map
R static/scripts/galaxy.ui.scrollPanel.js
A static/scripts/ui/scroll-panel.js
Log Message:
-----------
Webpack: move galaxy.ui.scrollPanel into ui/scroll-panel
Commit: 2214f887a668a4eed1e3b94d880c57e2e57ef9a1
https://github.com/galaxyproject/galaxy/commit/2214f887a668a4eed1e3b94d880c…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
Log Message:
-----------
Merge pull request #1072 from dannon/fix_lped_report_output
Update both lped pbed pbed lped converters to be in sync with their h…
Commit: f2356ef819111fe2507cc96059f5e1da7fbf6b3e
https://github.com/galaxyproject/galaxy/commit/f2356ef819111fe2507cc96059f5…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M test/base/api.py
M test/base/interactor.py
Log Message:
-----------
extend API interactor to allow http PATCH and DELETE testing
Commit: 43dc7a52e5289acdb681c30a2aeb49bb2f68e61d
https://github.com/galaxyproject/galaxy/commit/43dc7a52e5289acdb681c30a2aeb…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M test/api/test_libraries.py
M test/base/interactor.py
Log Message:
-----------
add more API tests for data libraries
Commit: 93629bb29e35340618aca2d1b420d948b56c695b
https://github.com/galaxyproject/galaxy/commit/93629bb29e35340618aca2d1b420…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools.js
M client/package.json
M client/webpack.config.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
Log Message:
-----------
Webpack: add handlebars loader, update tools.js
Commit: 2f0b64613770c8e59613bb46218e12565d260038
https://github.com/galaxyproject/galaxy/commit/2f0b64613770c8e59613bb46218e…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/galaxy.tools.js
M client/galaxy/scripts/mvc/app/app-analysis.js
R client/galaxy/scripts/mvc/tools.js
A client/galaxy/scripts/mvc/tools/tools.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster/tracks.js
R static/maps/mvc/tools.js.map
A static/maps/mvc/tools/tools.js.map
R static/scripts/mvc/tools.js
A static/scripts/mvc/tools/tools.js
Log Message:
-----------
Webpack: move tools.js into mvc/tools/
Commit: 372c2e9e43854b0e5e576abcead50e22f00923d9
https://github.com/galaxyproject/galaxy/commit/372c2e9e43854b0e5e576abcead5…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/layout/scratchbook.js
R client/galaxy/scripts/mvc/data.js
A client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/tools/tools.js
M client/galaxy/scripts/viz/phyloviz.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/visualization.js
M static/maps/galaxy.tools.js.map
M static/maps/layout/scratchbook.js.map
M static/maps/mvc/app/app-analysis.js.map
R static/maps/mvc/data.js.map
A static/maps/mvc/dataset/data.js.map
M static/maps/mvc/tools/tools.js.map
M static/maps/onload.js.map
M static/maps/ui/scroll-panel.js.map
M static/maps/viz/phyloviz.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/visualization.js.map
M static/scripts/galaxy.tools.js
M static/scripts/layout/scratchbook.js
M static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/data.js
A static/scripts/mvc/dataset/data.js
M static/scripts/mvc/tools/tools.js
M static/scripts/onload.js
M static/scripts/ui/scroll-panel.js
M static/scripts/viz/phyloviz.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/visualization.js
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
Log Message:
-----------
Webpack: move data.js into dataset/data.js; pack scripts
Commit: 6d0ab669ecbd12e75cf38f8c914bbf5954caac20
https://github.com/galaxyproject/galaxy/commit/6d0ab669ecbd12e75cf38f8c914b…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/webpack.config.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
Log Message:
-----------
Webpack: correctly load jQuery-ui, require bibtex in citations, and move polyfills to first loaded
Commit: c66bc7ab766e2af197a668a76e15e1dc21cfb9fa
https://github.com/galaxyproject/galaxy/commit/c66bc7ab766e2af197a668a76e15…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
R client/galaxy/scripts/mvc/collection/collection-panel-edit.js
R client/galaxy/scripts/mvc/collection/collection-panel.js
A client/galaxy/scripts/mvc/collection/collection-view-edit.js
A client/galaxy/scripts/mvc/collection/collection-view.js
R client/galaxy/scripts/mvc/history/history-panel-annotated.js
R client/galaxy/scripts/mvc/history/history-panel-edit-current.js
R client/galaxy/scripts/mvc/history/history-panel-edit.js
R client/galaxy/scripts/mvc/history/history-panel.js
A client/galaxy/scripts/mvc/history/history-view-annotated.js
A client/galaxy/scripts/mvc/history/history-view-edit-current.js
A client/galaxy/scripts/mvc/history/history-view-edit.js
A client/galaxy/scripts/mvc/history/history-view.js
M client/webpack.config.js
R static/maps/mvc/collection/collection-panel-edit.js.map
R static/maps/mvc/collection/collection-panel.js.map
A static/maps/mvc/collection/collection-view-edit.js.map
A static/maps/mvc/collection/collection-view.js.map
R static/maps/mvc/history/history-panel-annotated.js.map
R static/maps/mvc/history/history-panel-edit-current.js.map
R static/maps/mvc/history/history-panel-edit.js.map
R static/maps/mvc/history/history-panel.js.map
A static/maps/mvc/history/history-view-annotated.js.map
A static/maps/mvc/history/history-view-edit-current.js.map
A static/maps/mvc/history/history-view-edit.js.map
A static/maps/mvc/history/history-view.js.map
R static/scripts/mvc/collection/collection-panel-edit.js
R static/scripts/mvc/collection/collection-panel.js
A static/scripts/mvc/collection/collection-view-edit.js
A static/scripts/mvc/collection/collection-view.js
R static/scripts/mvc/history/history-panel-annotated.js
R static/scripts/mvc/history/history-panel-edit-current.js
R static/scripts/mvc/history/history-panel-edit.js
R static/scripts/mvc/history/history-panel.js
A static/scripts/mvc/history/history-view-annotated.js
A static/scripts/mvc/history/history-view-edit-current.js
A static/scripts/mvc/history/history-view-edit.js
A static/scripts/mvc/history/history-view.js
Log Message:
-----------
Webpack: normalize history and panel module names with other mvc modules (history-panel is not a panel - just a view)
Commit: 55068dea285c82232bd9dbf024de580013c5f3d8
https://github.com/galaxyproject/galaxy/commit/55068dea285c82232bd9dbf024de…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/history-panel.js
M client/galaxy/scripts/mvc/app/app-analysis.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-view-annotated.js
M client/galaxy/scripts/mvc/history/history-view-edit-current.js
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/list/list-panel.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/nls/ja/locale.js
M client/galaxy/scripts/nls/locale.js
M client/galaxy/scripts/nls/zh/locale.js
M static/maps/mvc/app/app-analysis.js.map
M static/maps/mvc/collection/collection-view-edit.js.map
M static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-view-annotated.js.map
M static/maps/mvc/history/history-view-edit-current.js.map
M static/maps/mvc/history/history-view-edit.js.map
M static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/mvc/app/app-analysis.js
M static/scripts/mvc/collection/collection-view-edit.js
M static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-view-annotated.js
M static/scripts/mvc/history/history-view-edit-current.js
M static/scripts/mvc/history/history-view-edit.js
M static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
Log Message:
-----------
Webpack: normalize 'panel' names part-2: history and collection modules
Commit: d6d8e5ef86bbfe460709c82590596252de2d5a71
https://github.com/galaxyproject/galaxy/commit/d6d8e5ef86bbfe460709c8259059…
Author: Mark Einon <mark.einon(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M tools/data_source/upload.py
Log Message:
-----------
upload.py: Remove unused function parameter
Commit: 625d49e2de074c240555efbff1319c6ddf9676a1
https://github.com/galaxyproject/galaxy/commit/625d49e2de074c240555efbff131…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M tools/data_source/upload.py
Log Message:
-----------
Merge pull request #1078 from einon/einon
upload.py: Remove unused function parameter
Commit: 8efabbbcd5546441182cbff1cc66e525cf6abf48
https://github.com/galaxyproject/galaxy/commit/8efabbbcd5546441182cbff1cc66…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M templates/grid_base.mako
M templates/webapps/galaxy/dataset/edit_attributes.mako
M templates/webapps/galaxy/library/common/ldda_edit_info.mako
M templates/webapps/galaxy/library/common/move_library_item.mako
M templates/webapps/galaxy/library/common/upload.mako
M templates/webapps/galaxy/page/editor.mako
M templates/webapps/galaxy/requests/common/create_request.mako
M templates/webapps/galaxy/requests/common/find_samples.mako
M templates/webapps/galaxy/workflow/editor.mako
Log Message:
-----------
Webpack: fix load order in embedded grids by removing autocom_tagging script tag (it's in the libs.bundle), remove it from other mako templates as well; remove bibtex script from workflow/editor.mako (unused)
Commit: 2dcb92aa0e83f9893595b68222fc62cf052a9220
https://github.com/galaxyproject/galaxy/commit/2dcb92aa0e83f9893595b68222fc…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M lib/galaxy/model/orm/scripts.py
M lib/galaxy/webapps/tool_shed/buildapp.py
M test/docker/base/Dockerfile
M test/docker/base/ansible_vars.yml
M test/docker/base/provision.yml
M test/docker/base/run_test_wrapper.sh
M test/docker/base/start_mysql.sh
Log Message:
-----------
Merge pull request #942 from davebx/docker
Enable dockerized toolshed tests.
Commit: 7c45bf13fad2d60fbee8be409c6879af2ebc25d1
https://github.com/galaxyproject/galaxy/commit/7c45bf13fad2d60fbee8be409c68…
Author: Dave B <dave(a)bx.psu.edu>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
Log Message:
-----------
Fix 500 error when attempting to update installed repository.
Commit: 321b64d8dcc1917eb107e46124cdb945c5005511
https://github.com/galaxyproject/galaxy/commit/321b64d8dcc1917eb107e46124cd…
Author: Dave B <dave(a)bx.psu.edu>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M lib/galaxy/util/__init__.py
Log Message:
-----------
Ensure that invalid parameters don't break things.
Commit: 6d4328766baa3f8bf35cc5824d870d8fc86e481f
https://github.com/galaxyproject/galaxy/commit/6d4328766baa3f8bf35cc5824d87…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
remove whitespace at line ends
Commit: 7c863eb2aeaa1418dde26ed2101b88435b3a763b
https://github.com/galaxyproject/galaxy/commit/7c863eb2aeaa1418dde26ed2101b…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
update the image tag
Commit: ce418d33fe221b27da162717a208381aa8042ea8
https://github.com/galaxyproject/galaxy/commit/ce418d33fe221b27da162717a208…
Author: jgoecks <jgoecks(a)gwu.edu>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/style/less/trackster.less
M static/maps/viz/trackster/tracks.js.map
M static/scripts/viz/trackster/tracks.js
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Resolve conflicting label CSS class.
Commit: f1abf1e9ab4dc4f1d3e6987c6bb68ab3b188083c
https://github.com/galaxyproject/galaxy/commit/f1abf1e9ab4dc4f1d3e6987c6bb6…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/style/less/trackster.less
M static/maps/viz/trackster/tracks.js.map
M static/scripts/viz/trackster/tracks.js
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Merge pull request #1086 from jgoecks/trackster-pos-label
Resolve conflicting label CSS class for trackster.
Commit: 87f35ea9752a37da76595db1fee481c391ee686b
https://github.com/galaxyproject/galaxy/commit/87f35ea9752a37da76595db1fee4…
Author: Dave B <dave(a)bx.psu.edu>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
Log Message:
-----------
Use preexisting library to parse query string.
Commit: c3f4b54b686ba93b3bb8f65d17f3961d344b9d7c
https://github.com/galaxyproject/galaxy/commit/c3f4b54b686ba93b3bb8f65d17f3…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/utils/localization.js
R client/galaxy/scripts/utils/webpack-localization.js
M client/package.json
M client/webpack.config.js
M static/maps/galaxy-app-base.js.map
M static/maps/utils/localization.js.map
R static/maps/utils/webpack-localization.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/utils/localization.js
R static/scripts/utils/webpack-localization.js
Log Message:
-----------
Webpack, localization: support both requirejs and webpack i18n by including the amdi18n-loader (both now share the utils/localization file)
Commit: 6f754216a4100969b18185aa705065b03a215628
https://github.com/galaxyproject/galaxy/commit/6f754216a4100969b18185aa7050…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
R client/galaxy/scripts/mvc/list/list-panel.js
A client/galaxy/scripts/mvc/list/list-view.js
M static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/history/history-view.js.map
R static/maps/mvc/list/list-panel.js.map
A static/maps/mvc/list/list-view.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/history/history-view.js
R static/scripts/mvc/list/list-panel.js
A static/scripts/mvc/list/list-view.js
Log Message:
-----------
Webpack: normalize list-panel to list-view
Commit: d285c01108f59d1b054955f312b16c3b978aa97a
https://github.com/galaxyproject/galaxy/commit/d285c01108f59d1b054955f312b1…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
A client/galaxy/scripts/mvc/annotation.js
R client/galaxy/scripts/mvc/annotations.js
A client/galaxy/scripts/mvc/tag.js
R client/galaxy/scripts/mvc/tags.js
A client/galaxy/scripts/mvc/tool/tools-form-base.js
A client/galaxy/scripts/mvc/tool/tools-form-workflow.js
A client/galaxy/scripts/mvc/tool/tools-form.js
A client/galaxy/scripts/mvc/tool/tools-jobs.js
A client/galaxy/scripts/mvc/tool/tools-template.js
A client/galaxy/scripts/mvc/tool/tools.js
R client/galaxy/scripts/mvc/tools/tools-form-base.js
R client/galaxy/scripts/mvc/tools/tools-form-workflow.js
R client/galaxy/scripts/mvc/tools/tools-form.js
R client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/tools/tools-template.js
R client/galaxy/scripts/mvc/tools/tools.js
Log Message:
-----------
Webpack: normalize tags, annotations, and tools (the names of)
Commit: 894af4c5deadc75d2f1a5e11e26abc9c3f4f7256
https://github.com/galaxyproject/galaxy/commit/894af4c5deadc75d2f1a5e11e26a…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
A static/maps/mvc/annotation.js.map
R static/maps/mvc/annotations.js.map
A static/maps/mvc/tag.js.map
R static/maps/mvc/tags.js.map
A static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tool/tools-form-workflow.js.map
A static/maps/mvc/tool/tools-form.js.map
A static/maps/mvc/tool/tools-jobs.js.map
A static/maps/mvc/tool/tools-template.js.map
A static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools/tools-form-base.js.map
R static/maps/mvc/tools/tools-form-workflow.js.map
R static/maps/mvc/tools/tools-form.js.map
R static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/tools/tools-template.js.map
R static/maps/mvc/tools/tools.js.map
A static/scripts/mvc/annotation.js
R static/scripts/mvc/annotations.js
A static/scripts/mvc/tag.js
R static/scripts/mvc/tags.js
A static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tool/tools-form-workflow.js
A static/scripts/mvc/tool/tools-form.js
A static/scripts/mvc/tool/tools-jobs.js
A static/scripts/mvc/tool/tools-template.js
A static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools/tools-form-base.js
R static/scripts/mvc/tools/tools-form-workflow.js
R static/scripts/mvc/tools/tools-form.js
R static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/tools/tools-template.js
R static/scripts/mvc/tools/tools.js
Log Message:
-----------
Webpack: normalize tags, annotations, and tools (2 of 3)
Commit: cc6c15f3b102afd22c3a9f1c7d1a5d92daad03bc
https://github.com/galaxyproject/galaxy/commit/cc6c15f3b102afd22c3a9f1c7d1a…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/app/app-analysis.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/tool/tools-form-base.js
M client/galaxy/scripts/mvc/tool/tools-form-workflow.js
M client/galaxy/scripts/mvc/tool/tools-form.js
M client/galaxy/scripts/mvc/tool/tools-jobs.js
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/viz/trackster/tracks.js
M static/maps/mvc/annotation.js.map
M static/maps/mvc/app/app-analysis.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/history/history-view-edit.js.map
M static/maps/mvc/tag.js.map
M static/maps/mvc/tool/tools-form-base.js.map
M static/maps/mvc/tool/tools-form-workflow.js.map
M static/maps/mvc/tool/tools-form.js.map
M static/maps/mvc/tool/tools-jobs.js.map
M static/maps/mvc/tool/tools-template.js.map
M static/maps/mvc/tool/tools.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/viz/trackster/tracks.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/mvc/annotation.js
M static/scripts/mvc/app/app-analysis.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/history/history-view-edit.js
M static/scripts/mvc/tag.js
M static/scripts/mvc/tool/tools-form-base.js
M static/scripts/mvc/tool/tools-form-workflow.js
M static/scripts/mvc/tool/tools-form.js
M static/scripts/mvc/tool/tools-jobs.js
M static/scripts/mvc/tool/tools-template.js
M static/scripts/mvc/tool/tools.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/viz/trackster/tracks.js
Log Message:
-----------
Webpack: normalize tags, annotations, and tools (change refs - 3 of 3)
Commit: 2956b12e9b292e42dfd2e2309b5c7d29b5b0d48b
https://github.com/galaxyproject/galaxy/commit/2956b12e9b292e42dfd2e2309b5c…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/galaxy.library.js
M client/galaxy/scripts/layout/masthead.js
M client/galaxy/scripts/layout/menu.js
M client/galaxy/scripts/layout/scratchbook.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/collection/collection-view-edit.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
M client/galaxy/scripts/mvc/history/history-view-edit-current.js
M client/galaxy/scripts/mvc/history/history-view-edit.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folder-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-library-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
M client/galaxy/scripts/mvc/tag.js
M client/galaxy/scripts/mvc/tool/tools-form-workflow.js
M client/galaxy/scripts/mvc/tool/tools-jobs.js
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
M client/galaxy/scripts/mvc/ui/ui-select-library.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/circster.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/visualization.js
M static/maps/galaxy-app-base.js.map
M static/maps/galaxy.library.js.map
M static/maps/layout/masthead.js.map
M static/maps/layout/menu.js.map
M static/maps/layout/scratchbook.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
M static/maps/mvc/collection/collection-view-edit.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/dataset/data.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
M static/maps/mvc/history/history-view-edit-current.js.map
M static/maps/mvc/history/history-view-edit.js.map
M static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folder-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-library-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/maps/mvc/tag.js.map
M static/maps/mvc/tool/tools-form-workflow.js.map
M static/maps/mvc/tool/tools-jobs.js.map
M static/maps/mvc/tool/tools.js.map
M static/maps/mvc/ui/ui-select-ftp.js.map
M static/maps/mvc/ui/ui-select-library.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/circster.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/visualization.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/galaxy.library.js
M static/scripts/layout/masthead.js
M static/scripts/layout/menu.js
M static/scripts/layout/scratchbook.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
M static/scripts/mvc/collection/collection-view-edit.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/dataset/data.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
M static/scripts/mvc/history/history-view-edit-current.js
M static/scripts/mvc/history/history-view-edit.js
M static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folder-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-library-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
M static/scripts/mvc/tag.js
M static/scripts/mvc/tool/tools-form-workflow.js
M static/scripts/mvc/tool/tools-jobs.js
M static/scripts/mvc/tool/tools.js
M static/scripts/mvc/ui/ui-select-ftp.js
M static/scripts/mvc/ui/ui-select-library.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/visualization/visualization-model.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/utils/utils.js
M static/scripts/viz/circster.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/visualization.js
M templates/base.mako
M templates/base/base_panels.mako
M templates/js-app.mako
M templates/user/logout.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js
Commit: 638e36f51d2c9d1af3a0ff62a869e72c02a38f76
https://github.com/galaxyproject/galaxy/commit/638e36f51d2c9d1af3a0ff62a869…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-14 (Sat, 14 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Newer versions of WebOb set None in referer, older versions set an empty
string. Handle cases where it is assumed to be a string.
I checked all other trans.request attributes to find other cases where
this might crop up and didn't find any.
Commit: 3ba139fe1bf8a40df647282a9884eae543a656bc
https://github.com/galaxyproject/galaxy/commit/3ba139fe1bf8a40df647282a9884…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-14 (Sat, 14 Nov 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
Log Message:
-----------
Merge pull request #1082 from davebx/hg_middleware
Fix 500 error when attempting to update installed repository.
Commit: 1aecca7889681ad9518e26e2a62b470809d2cdd1
https://github.com/galaxyproject/galaxy/commit/1aecca7889681ad9518e26e2a62b…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-11-14 (Sat, 14 Nov 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/api/repositories.py
Log Message:
-----------
Fix API installation of tool_dependencies
This should fix an installation issue with tool_dependencies via the API.
Tool dependency repositories to not have any tools specified and with this no metadata associated.
It was broken in https://github.com/galaxyproject/galaxy/commit/bb6a784f13ff3f91762244d44884…
So I think this should be part of 15.10.
Thanks to Greg for fixing this one.
Commit: 7e67368424a718f2e156b961aaf0a1a9672df9ce
https://github.com/galaxyproject/galaxy/commit/7e67368424a718f2e156b961aaf0…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
Log Message:
-----------
Don't fail if a repository is already installed
If an repository is already installed `installed_tool_shed_repositories` is None and this does not work with map.
Commit: f629cbdb6aa34a349e088382a51054a946e0185e
https://github.com/galaxyproject/galaxy/commit/f629cbdb6aa34a349e088382a510…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Refactor tool parsing, parse id first.
Small refactoring cleans up downstream diff for dynamic tool branch.
Commit: 8189fb450bdb90f3ff7af220c573c128ed776085
https://github.com/galaxyproject/galaxy/commit/8189fb450bdb90f3ff7af220c573…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/workflow/extract.py
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Add tool version to workflow extract.
Commit: 0b070f406c650e664c413dc60897fafd6e3611a8
https://github.com/galaxyproject/galaxy/commit/0b070f406c650e664c413dc60897…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
Log Message:
-----------
Add app property to workflow contents manager.
Most other managers already have this.
Commit: 38f0ed5d043951cc06abeaab9bbf1f4d888e372a
https://github.com/galaxyproject/galaxy/commit/38f0ed5d043951cc06abeaab9bbf…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M templates/show_params.mako
Log Message:
-----------
Improve the API attributes on parameters page.
Make clear what API ID is and add display of API value for job.
Commit: bbe7fbe38c57fd89434eea850621770a1d355231
https://github.com/galaxyproject/galaxy/commit/bbe7fbe38c57fd89434eea850621…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M templates/show_params.mako
Log Message:
-----------
Merge pull request #1098 from jmchilton/show_param
Improve the API attributes on parameters page.
Commit: a26526b085c29d41f5662b7f80dee7e3e7a7c294
https://github.com/galaxyproject/galaxy/commit/a26526b085c29d41f5662b7f80de…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/api/repositories.py
Log Message:
-----------
Merge pull request #1094 from bgruening/fix_api_ts_installation
Fix api TS installation
Commit: cfe45d8e0c357cbe191a346a2ae05e1625bb5010
https://github.com/galaxyproject/galaxy/commit/cfe45d8e0c357cbe191a346a2ae0…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-15 (Sun, 15 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
Log Message:
-----------
Merge pull request #1095 from bgruening/ts_api_fail_if_installed
Don't fail if a repository is already installed
Commit: b19e71ec465c7145840acf684f8f09eeebb99b5a
https://github.com/galaxyproject/galaxy/commit/b19e71ec465c7145840acf684f8f…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Update run_tests.sh help for #844.
Commit: b8870bfedc008d378481bd6740f31ff516271c16
https://github.com/galaxyproject/galaxy/commit/b8870bfedc008d378481bd6740f3…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/style/less/trackster.less
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
M lib/galaxy/model/orm/scripts.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/web/base/controllers/admin.py
M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/webapps/tool_shed/buildapp.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
M static/maps/mvc/tool/tools.js.map
A static/maps/mvc/tools.js.map
M static/maps/viz/trackster/tracks.js.map
M static/scripts/mvc/tool/tools.js
A static/scripts/mvc/tools.js
M static/scripts/viz/trackster/tracks.js
M static/style/blue/trackster.css
M templates/admin/reload_tool.mako
M templates/show_params.mako
M test/docker/base/Dockerfile
M test/docker/base/ansible_vars.yml
M test/docker/base/provision.yml
M test/docker/base/run_test_wrapper.sh
M test/docker/base/start_mysql.sh
M tools/data_source/upload.py
Log Message:
-----------
(merge dev)
Commit: 13eb47e789336f4ebfe0923ae07f0db81afd2d63
https://github.com/galaxyproject/galaxy/commit/13eb47e789336f4ebfe0923ae07f…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M doc/source/project/organization.rst
Log Message:
-----------
Merge pull request #1020 from dannon/issue_procedure
[PROCEDURES] Issue procedure linkage
Commit: d2d2ff12775bc630ff6705c7989fe84fed9cbdbb
https://github.com/galaxyproject/galaxy/commit/d2d2ff12775bc630ff6705c7989f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Merge pull request #1101 from nsoranzo/run_tests_sh
Update run_tests.sh help for #844.
Commit: bb089dfa424cefc64e65f1dd2aab5fe8fe1dad16
https://github.com/galaxyproject/galaxy/commit/bb089dfa424cefc64e65f1dd2aab…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M static/maps/galaxy-app-base.js.map
M test/qunit/test-common.js
M test/qunit/tests/galaxy-app-base.js
Log Message:
-----------
Tests, qunit: fix import of underscore from libs, fix galaxy-app-base to not require config but have it passed in
Commit: 474a454958398bc3e70d16f7eaab5805aa89cf19
https://github.com/galaxyproject/galaxy/commit/474a454958398bc3e70d16f7eaab…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/hda-model.js
M test/qunit/test-app.js
M test/qunit/test-common.js
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Tests, qunit: galaxy_config.root->Galaxy.root, correct locations and shims of underscore and backbone in qunit tests
Commit: 39fe6b44bfbab9f490524dff902ceb80bc52a2ee
https://github.com/galaxyproject/galaxy/commit/39fe6b44bfbab9f490524dff902c…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Rebuild styles, fixes history panel green being wrong.
Commit: 65301bb9c85a1c09fdd36890b68593b320fcf3e7
https://github.com/galaxyproject/galaxy/commit/65301bb9c85a1c09fdd36890b685…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Merge pull request #1102 from dannon/style_rebuild
Rebuild styles, fixes history panel green being wrong.
Commit: 0a09de5453540b55ddb43c63c430a5edfff120b1
https://github.com/galaxyproject/galaxy/commit/0a09de5453540b55ddb43c63c430…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/app/app-login.js
M client/galaxy/scripts/utils/utils.js
M static/maps/mvc/app/app-login.js.map
M static/maps/utils/utils.js.map
M static/scripts/mvc/app/app-login.js
M static/scripts/utils/utils.js
Log Message:
-----------
Show welcome page with required login, remove iframes
Reinsert iframe for login
Use iframes
Commit: a610dc59a85519e3a84455ae5b2b23c3390017a5
https://github.com/galaxyproject/galaxy/commit/a610dc59a85519e3a84455ae5b2b…
Author: Lance Parsons <lparsons(a)princeton.edu>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
Log Message:
-----------
Better error when tool shed repo dir missing
Check for a tool shed repository directory and throw exception if it's
missing. This avoids a cryptic NoneType error when searching for
tool_dependencies.xml file and directory was not found.
Commit: 0b788e97314a9e88b82fa3799127524b16a2adc2
https://github.com/galaxyproject/galaxy/commit/0b788e97314a9e88b82fa3799127…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/app/app-login.js
M client/galaxy/scripts/utils/utils.js
M static/maps/mvc/app/app-login.js.map
M static/maps/utils/utils.js.map
M static/scripts/mvc/app/app-login.js
M static/scripts/utils/utils.js
Log Message:
-----------
Merge pull request #1105 from guerler/revise_require_login_003
Show welcome page with required login
Commit: 51f8e21218757fa82e30986a946bbb7fc5c7a2ac
https://github.com/galaxyproject/galaxy/commit/51f8e21218757fa82e30986a946b…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
Log Message:
-----------
Merge pull request #1107 from lparsons/tool_shed_repo_dir_check
Better error when tool shed repo dir missing
Commit: d40d384a8672b5bc58db210a6e1aca41cb50e9d6
https://github.com/galaxyproject/galaxy/commit/d40d384a8672b5bc58db210a6e1a…
Author: youri <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
CRAM format
Commit: 3df95ae9a6f081090bb554b0778f145f0ec622fa
https://github.com/galaxyproject/galaxy/commit/3df95ae9a6f081090bb554b0778f…
Author: youri <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
flake8
Commit: 727167b8d15063920d01c2f7651cc4a76c2caafc
https://github.com/galaxyproject/galaxy/commit/727167b8d15063920d01c2f7651c…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Merge pull request #1083 from martenson/update-testing-docker-image
Update testing docker image
Commit: 71b27b0f018c6bc3997099137ff2c80ca088981d
https://github.com/galaxyproject/galaxy/commit/71b27b0f018c6bc3997099137ff2…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M templates/ind_share_base.mako
Log Message:
-----------
Select2 for sharing
This adjusts the default 'share' template to use the select2/exposed
user list implemented in 60ad9e934b3e4c50389a624a28578aa9fc326f32. As
previously, if the email list is not exposed then you may still enter an
email address manually.
If usernames are exposed but not emails (e.g. public galaxies) we
currently just hide those results even if searches match.
Fixes #977
Commit: 86bb4aeaca80b9fbf98ef89f92c1ce2a5bfc6208
https://github.com/galaxyproject/galaxy/commit/86bb4aeaca80b9fbf98ef89f92c1…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M templates/webapps/galaxy/history/share.mako
Log Message:
-----------
Patch other share implementation to handle case of undefined emails more gracefully
Commit: 944df4a5647a71304bab12185b708b4bb28da049
https://github.com/galaxyproject/galaxy/commit/944df4a5647a71304bab12185b70…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/users.py
M templates/ind_share_base.mako
M templates/webapps/galaxy/history/share.mako
Log Message:
-----------
Followup to #1109, #1110, add f_any to user API
Commit: 312746d1698e99e13b9a60db881d0093da6cc4c0
https://github.com/galaxyproject/galaxy/commit/312746d1698e99e13b9a60db881d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
A test/functional/tools/output_format_collection.xml
M test/functional/tools/samples_tool_conf.xml
M test/unit/tools/test_actions.py
Log Message:
-----------
Allow accessing collection elements in format_source.
Can do it by numeric index or element name, e.g. input[0] or input["forward"]. Only works for 1-D collections.
Implements #699.
Run new and most relevant existing tests with the following commands:
```
nosetests test/unit/tools/test_actions.py
./run_tests.sh -framework -id output_format_collection
./run_tests.sh -framework -id output_format
```
Commit: 0030f4c5499b0121e2c7e25388ac402272728ba7
https://github.com/galaxyproject/galaxy/commit/0030f4c5499b0121e2c7e25388ac…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/workflows.py
Log Message:
-----------
API test fix from @nsoranzo.
Commit: 7018753bc9def1ec0b461f95918bb16d569ab326
https://github.com/galaxyproject/galaxy/commit/7018753bc9def1ec0b461f95918b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/jobs/runners/__init__.py
Log Message:
-----------
Give writing job script more time to flush and sync during verification.
Still having occasional failures - https://jenkins.galaxyproject.org/job/docker-api/1172/testReport/junit/api.….
Commit: d8152f3336d68fbf9bdecd89fd866c94338c3557
https://github.com/galaxyproject/galaxy/commit/d8152f3336d68fbf9bdecd89fd86…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/templates/ipython.mako
M lib/galaxy/managers/configuration.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/web/base/interactive_environments.py
M lib/galaxy/webapps/galaxy/api/jobs.py
M static/maps/galaxy-app-base.js.map
M static/scripts/galaxy-app-base.js
M test/api/helpers.py
M test/api/test_jobs.py
M test/api/test_workflow_extraction.py
Log Message:
-----------
Merge branch 'release_15.10' into dev
Commit: 2374c55f7233a9b2ff4a72ff3c2535ce9dc732e3
https://github.com/galaxyproject/galaxy/commit/2374c55f7233a9b2ff4a72ff3c25…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
Log Message:
-----------
Fix removal of comment missed in merge.
Commit: 7b93a53a4cbe671c40bb39849ae354938fffa284
https://github.com/galaxyproject/galaxy/commit/7b93a53a4cbe671c40bb39849ae3…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/history-panel.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/layout/masthead.js
M client/galaxy/scripts/layout/page.js
M client/galaxy/scripts/polyfills.js
M client/galaxy/scripts/utils/localization.js
M lib/galaxy/webapps/galaxy/controllers/user.py
M static/maps/layout/masthead.js.map
M static/maps/layout/page.js.map
M static/maps/polyfills.js.map
M static/maps/utils/localization.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/layout/masthead.js
M static/scripts/layout/page.js
M static/scripts/polyfills.js
M static/scripts/utils/localization.js
R static/style/blue/galaxy.frame.masthead.css
M templates/base/base_panels.mako
M templates/js-app.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M test/casperjs/api-history-permission-tests.js
Log Message:
-----------
Webpack: polyfill object.assign for phantomjs; remove galaxy.frame.masthead.css in favor of adding styles locally; change css load order to prevent 'ui-button' name collision between base and jquery-ui
Commit: 9516b7179d541953ebaea4061300440d02f11bb7
https://github.com/galaxyproject/galaxy/commit/9516b7179d541953ebaea4061300…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/users.py
Log Message:
-----------
Documented API call
Commit: d5fe49ec6f1250da732faaf5c605549183249938
https://github.com/galaxyproject/galaxy/commit/d5fe49ec6f1250da732faaf5c605…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Incorporate @nsoranzo's suggestions
Commit: e6d651be32f0afb34792a3be204df54c9e36bb53
https://github.com/galaxyproject/galaxy/commit/e6d651be32f0afb34792a3be204d…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Merge pull request #1091 from natefoo/webob-string-to-none
Fix bug with referer attribute type change in WebOb
Commit: 1063c175be53962e8d55097ddb04537cdbac5da6
https://github.com/galaxyproject/galaxy/commit/1063c175be53962e8d55097ddb04…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M lib/galaxy/jobs/runners/__init__.py
Log Message:
-----------
Merge pull request #1114 from jmchilton/sync_more
Give writing job script more time to flush and sync during verification.
Commit: f4db7587565c912005da35410228b293b11555cd
https://github.com/galaxyproject/galaxy/commit/f4db7587565c912005da35410228…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M cron/build_chrom_db.py
Log Message:
-----------
Merge pull request #1066 from nsoranzo/cron_ucsc
Check len files during download from UCSC.
Commit: 729ed463aa87d07bc27dc669ba80d0187dd85b47
https://github.com/galaxyproject/galaxy/commit/729ed463aa87d07bc27dc669ba80…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
Merge pull request #1108 from yhoogstrate/cram_datatype
CRAM datatype definiton
Commit: 3d933edd32dd872a1e660a061cdef4cffc587ec0
https://github.com/galaxyproject/galaxy/commit/3d933edd32dd872a1e660a061cde…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M test/api/test_libraries.py
M test/base/api.py
M test/base/interactor.py
Log Message:
-----------
Merge pull request #1074 from martenson/lib-api-tests
[WIP] add more data libraries API tests
Commit: c252987b4c5febb7fa10db3c7359449f325fc9ca
https://github.com/galaxyproject/galaxy/commit/c252987b4c5febb7fa10db3c7359…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.menu.js
M lib/galaxy/webapps/galaxy/api/remote_files.py
M static/maps/galaxy.menu.js.map
M static/scripts/galaxy.menu.js
Log Message:
-----------
Merge branch 'master' into dev
Commit: 704144c16936e6ddedee9d509ee4361f50f152f2
https://github.com/galaxyproject/galaxy/commit/704144c16936e6ddedee9d509ee4…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M lib/galaxy/tools/evaluation.py
Log Message:
-----------
Don't let $input hang cheetah evaluation...
If $input is undefined. The Python input command was being used and causing Galaxy to hang during evaluation.
Commit: 0ff8a21891f7780dd30f81047cb5f8112c924b4a
https://github.com/galaxyproject/galaxy/commit/0ff8a21891f7780dd30f81047cb5…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M lib/galaxy/tools/evaluation.py
A test/functional/tools/cheetah_problem_unbound_var.xml
A test/functional/tools/cheetah_problem_unbound_var_input.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Add example tools demonstrating cheetah problem (unbound variable).
Refine default override of input to raise an exception instead of just throwing in a dummy string.
Commit: 7dedb3ff18f06b123ac9d64ac1d9b42948ba903c
https://github.com/galaxyproject/galaxy/commit/7dedb3ff18f06b123ac9d64ac1d9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
A test/functional/tools/cheetah_problem_syntax_error.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Add another cheetah syntax error example...
... ensure the test framework run the tool, detects that there is an error, and handles things appropriately.
Commit: b4c77b761799b3a8752a6fec500717b1a6f3818b
https://github.com/galaxyproject/galaxy/commit/b4c77b761799b3a8752a6fec5007…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
A test/api/workflows_format_2/README.txt
A test/api/workflows_format_2/__init__.py
A test/api/workflows_format_2/converter.py
A test/api/workflows_format_2/interface.py
A test/api/workflows_format_2/main.py
R test/api/yaml_to_workflow.py
M test/functional/tools/simple_constructs.yml
M test/unit/tools/test_parsing.py
Log Message:
-----------
Introduce "Format 2" workflow definitions.
This is a slight tightening up of the ad-hoc, experimental workflow YAML definition used by the test framework (and by Kyle, but lets just admit Kyle is part of Galaxy's test framework).
This format is still defined entirely client side by transcoding the YAML or python object description into real (or format 1) Galaxy workflows - so these cannot realisticaly be declared part of Galaxy's public interface and can remain experimental and subject to change.
In addition to refactoring the code implementing these workflows for upstream modifications to explore new features, the format itself has been made slightly more stringent in two ways:
- 'steps' must now be explicit (previously converted auto-convert list to dict).
- Ensure the workflow declared a 'class' is defined and the class is 'GalaxyWorkflow'.
This will help with discovery of workflow objects with downstream tooling (planemo for workflows?) and brings the Galaxy definition slightly more inline with the CWL definition for workflows (very slightly).
Commit: b25b8c3f243e87a196a6cb0fa23328ee7c7e26f7
https://github.com/galaxyproject/galaxy/commit/b25b8c3f243e87a196a6cb0fa233…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/test.py
M test/base/twilltestcase.py
A test/functional/tools/maxseconds.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Revise and fix waiting for tool tests.
- maxseconds on test tag stopped being respected at some point, fix that.
- maxseconds on test tag stopped being parsed at some later point, fix that.
- Revise default behavior so it can be overridden with yet another testing environment variable GALAXY_TEST_DEFAULT_WAIT.
- Add test case to ensure there is no future regression of these behaviors.
Commit: ee2b34c387d9bb6189c8befaa069887b535d413c
https://github.com/galaxyproject/galaxy/commit/ee2b34c387d9bb6189c8befaa069…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Merge pull request #950 from fescudie/dev
Add BIOM v1 in default datatypes.
Commit: 7fef50f45fb6484fcb600cfd167e43d1a735a9d2
https://github.com/galaxyproject/galaxy/commit/7fef50f45fb6484fcb600cfd167e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M lib/galaxy/web/base/controllers/admin.py
Log Message:
-----------
Merge pull request #881 from scholtalbers/role-page-fix
Fix the issue where too many datasets are linked to a certain role
Commit: e4e44be27b7b3ddf778eb95559b4d0f11e4aecb7
https://github.com/galaxyproject/galaxy/commit/e4e44be27b7b3ddf778eb95559b4…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/proteomics.py
Log Message:
-----------
Merge pull request #1004 from jj-umn/uniprotxml_datatype
UniProtXML datatype
Commit: f770128915df3fa9d8a3a9fe2c4a210fbd9ac2c6
https://github.com/galaxyproject/galaxy/commit/f770128915df3fa9d8a3a9fe2c4a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/data.py
Log Message:
-----------
Merge pull request #991 from erasche/fix-932
Fixes #932
Commit: 72faca1a3a81b6104c776353ee7b4dc03d6ae9be
https://github.com/galaxyproject/galaxy/commit/72faca1a3a81b6104c776353ee7b…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M doc/source/admin/interactive_environments.rst
Log Message:
-----------
Document GIE proxy config for nginx, mention the Ansible role.
Commit: 7ab070e9df6ebf0658c966942d38779fbc9d16f1
https://github.com/galaxyproject/galaxy/commit/7ab070e9df6ebf0658c966942d38…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M doc/source/admin/interactive_environments.rst
Log Message:
-----------
Merge pull request #1123 from natefoo/ie-docfix
Add nginx config for GIE proxy to documentation
Commit: d1d2f8388a4bc077275f535e41841158076a56de
https://github.com/galaxyproject/galaxy/commit/d1d2f8388a4bc077275f535e4184…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/layout/masthead.js
M client/galaxy/scripts/layout/page.js
M client/galaxy/scripts/utils/query-string-parsing.js
M client/webpack.config.js
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M static/maps/layout/masthead.js.map
M static/maps/layout/page.js.map
M static/maps/utils/query-string-parsing.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/layout/masthead.js
M static/scripts/layout/page.js
M static/scripts/utils/query-string-parsing.js
M templates/js-app.mako
Log Message:
-----------
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
Commit: 5eb9b206e798522fff1a9332e5d1a58c83528523
https://github.com/galaxyproject/galaxy/commit/5eb9b206e798522fff1a9332e5d1…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
A client/galaxy/scripts/apps/login.js
A static/scripts/bundled/login.bundled.js
A static/scripts/bundled/login.bundled.js.map
Log Message:
-----------
Webpack: properly add login app to the repo
Commit: 17ec1b08fbc88c4960b94fbd19252c40e8a4e579
https://github.com/galaxyproject/galaxy/commit/17ec1b08fbc88c4960b94fbd1925…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Webpack: add masthead div to galaxy.panels.mako as a target for replacement and becauseiamgoingcrazyfromtheeightdifferentwayswehavetorenderwebpages
Commit: bd476ce146d47e12b25e4faacc6ae7eeed09fbe2
https://github.com/galaxyproject/galaxy/commit/bd476ce146d47e12b25e4faacc6a…
Author: jgoecks <jgoecks(a)gwu.edu>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Readd jquery.migrate to galaxy.panels template because it is needed for farbtastic, which is used in visualizations.
Commit: d2bab13fa92a87a3c4959d782ba0bf061ecf07db
https://github.com/galaxyproject/galaxy/commit/d2bab13fa92a87a3c4959d782ba0…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/test.py
M test/base/twilltestcase.py
A test/functional/tools/maxseconds.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Merge pull request #1119 from jmchilton/maxseconds
Revise and fix waiting for tool tests.
Commit: a3fee086c6dee9a688ffb7da13f71c1210cb76da
https://github.com/galaxyproject/galaxy/commit/a3fee086c6dee9a688ffb7da13f7…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/galaxy/style/less/galaxy_bootstrap/variables.less
Log Message:
-----------
Style: fix state-success-bg change that was not reverted during 5fd4daf
Commit: 5191c2136a9131005533faff4b0c1267f1ce35c1
https://github.com/galaxyproject/galaxy/commit/5191c2136a9131005533faff4b0c…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/galaxy/style/less/galaxy_bootstrap/variables.less
Log Message:
-----------
Merge pull request #1129 from carlfeberhard/fix.styles
Style: fix state-success-bg change that was not reverted during 5fd4daf
Commit: 40e3e7926aec154fa5f761cf5a7e84fad98b785c
https://github.com/galaxyproject/galaxy/commit/40e3e7926aec154fa5f761cf5a7e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Rebuild style with lessc > 2.5 (which everyone needs to update to now, or we'll have battling commits of packed css
Commit: 5c285eaee751a9257e01b6ae4fcff70305e34d56
https://github.com/galaxyproject/galaxy/commit/5c285eaee751a9257e01b6ae4fcf…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/GruntFile.js
M client/grunt-tasks/style.js
M client/package.json
M static/maps/galaxy-app-base.js.map
Log Message:
-----------
Add grunt check task to verify npm modules are up to date
Commit: d4a380b49d0c84fd1765aa5f6e6ad0f85f1b5585
https://github.com/galaxyproject/galaxy/commit/d4a380b49d0c84fd1765aa5f6e6a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/package.json
Log Message:
-----------
Swap devDependencies for flat dependencies -- this allows npm ls (and thereby grunt-check-modules) to enforce dep versions.
Commit: af36ca6d9467932036d19a448ca4c74affffae9a
https://github.com/galaxyproject/galaxy/commit/af36ca6d9467932036d19a448ca4…
Author: Bjoern Gruening <bjoern.gruening(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.xml
A config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js
A config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/static/js/ipython.js
M config/plugins/interactive_environments/rstudio/static/js/rstudio.js
M lib/galaxy/web/base/interactive_environments.py
Log Message:
-----------
add BAM iobio visualisation as Interactive Environment
Commit: 5188b4179063b3cc57c5c983d48a5fb62387d2b3
https://github.com/galaxyproject/galaxy/commit/5188b4179063b3cc57c5c983d48a…
Author: Bjoern Gruening <bjoern.gruening(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M lib/galaxy/web/base/interactive_environments.py
Log Message:
-----------
make travis happy
Commit: 81f842743d0c42522f7f80b603eccbc78d697a3c
https://github.com/galaxyproject/galaxy/commit/81f842743d0c42522f7f80b603ec…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.xml
A config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js
A config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/static/js/ipython.js
M config/plugins/interactive_environments/rstudio/static/js/rstudio.js
M lib/galaxy/web/base/interactive_environments.py
Log Message:
-----------
Merge pull request #1131 from bgruening/IE_iobio
Add BAM iobio visualisation as Interactive Environment
Commit: 96b17bd8560f938ee9d3244b6cf5b198864c44ce
https://github.com/galaxyproject/galaxy/commit/96b17bd8560f938ee9d3244b6cf5…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M lib/galaxy/tools/evaluation.py
A test/functional/tools/cheetah_problem_syntax_error.xml
A test/functional/tools/cheetah_problem_unbound_var.xml
A test/functional/tools/cheetah_problem_unbound_var_input.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Merge pull request #1117 from jmchilton/input_hang
Don't let $input hang cheetah evaluation...
Commit: f61ec1c3c01b51fe3449a583e1966cc3dff099f2
https://github.com/galaxyproject/galaxy/commit/f61ec1c3c01b51fe3449a583e196…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/history-panel.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/job/job-li.js
M client/galaxy/scripts/mvc/list/list-panel.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/toolshed/scripts/mvc/groups/group-detail-view.js
M client/toolshed/scripts/mvc/groups/group-listrow-view.js
M lib/galaxy/util/xml_macros.py
M lib/galaxy/webapps/galaxy/controllers/admin.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/library.py
M lib/galaxy/webapps/galaxy/controllers/library_admin.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/workflows.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_grids.py
M lib/tool_shed/grids/repository_review_grids.py
M static/maps/galaxy-app-base.js.map
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/history-panel.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/job/job-li.js
M static/scripts/mvc/list/list-panel.js
M static/scripts/mvc/ui/ui-select-default.js
M test/unit/tools/test_tool_loader.py
Log Message:
-----------
Merge and rebuild client
Commit: 05ed245353331489ee443ac483b1569dab38f500
https://github.com/galaxyproject/galaxy/commit/05ed245353331489ee443ac483b1…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/workflows.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_review_grids.py
Log Message:
-----------
Fix the bad merge :(
Commit: ed992b3b28c7f6d9d637e82e88305b665733a50b
https://github.com/galaxyproject/galaxy/commit/ed992b3b28c7f6d9d637e82e8830…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/history-panel.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/job/job-li.js
M client/galaxy/scripts/mvc/list/list-panel.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/toolshed/scripts/mvc/groups/group-detail-view.js
M client/toolshed/scripts/mvc/groups/group-listrow-view.js
M lib/galaxy/webapps/galaxy/controllers/admin.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/library.py
M lib/galaxy/webapps/galaxy/controllers/library_admin.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/workflows.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_grids.py
M lib/tool_shed/grids/repository_review_grids.py
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/scripts/libs/jquery/jquery.dynatree.js
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/history-panel.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/job/job-li.js
M static/scripts/mvc/list/list-panel.js
M static/scripts/mvc/ui/ui-select-default.js
Log Message:
-----------
A large assortment of escaping fixes to primarily grids and javascript
templating, and one bad-data-ingress fix (copy history name).
Commit: 458766b00f05a2d46c834d461e59201796ff0358
https://github.com/galaxyproject/galaxy/commit/458766b00f05a2d46c834d461e59…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/app/app-analysis.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/form/form-data.js
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
A client/galaxy/scripts/mvc/tool/tool-form-base.js
A client/galaxy/scripts/mvc/tool/tool-form-composite.js
A client/galaxy/scripts/mvc/tool/tool-form-workflow.js
A client/galaxy/scripts/mvc/tool/tool-form.js
A client/galaxy/scripts/mvc/tool/tool-template.js
M client/galaxy/scripts/mvc/tools.js
R client/galaxy/scripts/mvc/tools/tools-form-base.js
R client/galaxy/scripts/mvc/tools/tools-form-workflow.js
R client/galaxy/scripts/mvc/tools/tools-form.js
R client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/tools/tools-template.js
M client/galaxy/scripts/mvc/ui/ui-misc.js
M client/galaxy/scripts/mvc/ui/ui-portlet.js
M client/galaxy/scripts/mvc/ui/ui-slider.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/style/less/galaxy_bootstrap/variables.less
M client/galaxy/style/less/ui.less
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M static/maps/galaxy-app-base.js.map
M static/maps/mvc/app/app-analysis.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/form/form-data.js.map
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
A static/maps/mvc/tool/tool-form-base.js.map
A static/maps/mvc/tool/tool-form-composite.js.map
A static/maps/mvc/tool/tool-form-workflow.js.map
A static/maps/mvc/tool/tool-form.js.map
A static/maps/mvc/tool/tool-template.js.map
M static/maps/mvc/tools.js.map
R static/maps/mvc/tools/tools-form-base.js.map
R static/maps/mvc/tools/tools-form-workflow.js.map
R static/maps/mvc/tools/tools-form.js.map
R static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/tools/tools-template.js.map
M static/maps/mvc/ui/ui-misc.js.map
M static/maps/mvc/ui/ui-portlet.js.map
M static/maps/mvc/ui/ui-slider.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/utils/utils.js.map
M static/scripts/mvc/app/app-analysis.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/form/form-data.js
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
A static/scripts/mvc/tool/tool-form-base.js
A static/scripts/mvc/tool/tool-form-composite.js
A static/scripts/mvc/tool/tool-form-workflow.js
A static/scripts/mvc/tool/tool-form.js
A static/scripts/mvc/tool/tool-template.js
M static/scripts/mvc/tools.js
R static/scripts/mvc/tools/tools-form-base.js
R static/scripts/mvc/tools/tools-form-workflow.js
R static/scripts/mvc/tools/tools-form.js
R static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/tools/tools-template.js
M static/scripts/mvc/ui/ui-misc.js
M static/scripts/mvc/ui/ui-portlet.js
M static/scripts/mvc/ui/ui-slider.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/utils/utils.js
M static/style/blue/base.css
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Add run workflow tool form
Move styles to css
Improve handling of numeric workflow parameters
Commit: 7cd5713dbb3acc82ee7c01f5110d37cb413392c8
https://github.com/galaxyproject/galaxy/commit/7cd5713dbb3acc82ee7c01f5110d…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M templates/base.mako
M templates/base/base_panels.mako
M templates/display_base.mako
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
M templates/webapps/galaxy/galaxy.panels.mako
M test/casperjs/spaceghost.js
Log Message:
-----------
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
Commit: 9c5d4cfc0e95966f8a41e8dedf83ea4b4793868e
https://github.com/galaxyproject/galaxy/commit/9c5d4cfc0e95966f8a41e8dedf83…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/layout/menu.js
M client/galaxy/scripts/mvc/app/app-login.js
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/job/job-li.js
M client/galaxy/scripts/mvc/list/list-view.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/style/less/galaxy_bootstrap/variables.less
M client/toolshed/scripts/mvc/groups/group-detail-view.js
M client/toolshed/scripts/mvc/groups/group-listrow-view.js
M config/datatypes_conf.xml.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.xml
A config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js
A config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/static/js/ipython.js
M config/plugins/interactive_environments/ipython/templates/ipython.mako
M config/plugins/interactive_environments/rstudio/static/js/rstudio.js
M cron/build_chrom_db.py
M doc/source/admin/interactive_environments.rst
M doc/source/project/organization.rst
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/text.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/test.py
M lib/galaxy/util/xml_macros.py
M lib/galaxy/web/base/controllers/admin.py
M lib/galaxy/web/base/interactive_environments.py
M lib/galaxy/webapps/galaxy/api/jobs.py
M lib/galaxy/webapps/galaxy/api/remote_files.py
M lib/galaxy/webapps/galaxy/controllers/admin.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/library.py
M lib/galaxy/webapps/galaxy/controllers/library_admin.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/workflows.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_grids.py
M lib/tool_shed/grids/repository_review_grids.py
M run_tests.sh
M static/maps/galaxy-app-base.js.map
A static/maps/galaxy.menu.js.map
M static/maps/layout/menu.js.map
M static/maps/mvc/app/app-login.js.map
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/utils/utils.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
A static/scripts/galaxy.menu.js
M static/scripts/layout/menu.js
M static/scripts/mvc/app/app-login.js
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/history/copy-dialog.js
A static/scripts/mvc/history/history-panel.js
M static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/job/job-li.js
M static/scripts/mvc/list/list-view.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/utils/utils.js
M test/api/helpers.py
M test/api/test_jobs.py
M test/api/test_libraries.py
M test/api/test_workflow_extraction.py
M test/base/api.py
M test/base/interactor.py
M test/base/twilltestcase.py
A test/functional/tools/cheetah_problem_syntax_error.xml
A test/functional/tools/cheetah_problem_unbound_var.xml
A test/functional/tools/cheetah_problem_unbound_var_input.xml
A test/functional/tools/maxseconds.xml
M test/functional/tools/samples_tool_conf.xml
M test/unit/tools/test_tool_loader.py
Log Message:
-----------
(merge dev)
Commit: 0c22d138891604d0df98784ab7edc43e9b541c1d
https://github.com/galaxyproject/galaxy/commit/0c22d138891604d0df98784ab7ed…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/parser/xml.py
A test/functional/tools/collection_type_source.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
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
```
Commit: 9f7dff740f0133d6ba66abe067fb2edeb7a6b705
https://github.com/galaxyproject/galaxy/commit/9f7dff740f0133d6ba66abe067fb…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/scripts/mvc/tool/tool-form-workflow.js
Log Message:
-----------
Revise is_workflow setting
Commit: b8b0e4412247bd0f7611710ce69e0b4e9a76b4d7
https://github.com/galaxyproject/galaxy/commit/b8b0e4412247bd0f7611710ce69e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.masthead.js
Log Message:
-----------
Strip whitespace
Commit: f0e28555af8129eae424c3e677b6bb22a4c68154
https://github.com/galaxyproject/galaxy/commit/f0e28555af8129eae424c3e677b6…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.masthead.js
M static/maps/galaxy.masthead.js.map
M static/scripts/galaxy.masthead.js
Log Message:
-----------
Support onclick for menu items.
Commit: dba7e6640f816325c853fcc320e97c454a465bae
https://github.com/galaxyproject/galaxy/commit/dba7e6640f816325c853fcc320e9…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/layout/panel.js
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/templates/compiled/panel_section.js
M client/galaxy/scripts/templates/compiled/tool_form.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/compiled/tool_search.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/grunt-tasks/templates.js
M static/maps/layout/panel.js.map
M static/maps/mvc/tool/tools.js.map
M static/maps/templates/compiled/panel_section.js.map
M static/maps/templates/compiled/tool_form.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/templates/compiled/tool_search.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/layout/panel.js
M static/scripts/templates/compiled/panel_section.js
M static/scripts/templates/compiled/tool_form.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/templates/compiled/tool_search.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster/tracks.js
M templates/base/base_panels.mako
M templates/webapps/galaxy/visualization/sweepster.mako
Log Message:
-----------
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
Commit: 0770d8d988b20e36c2178d906bd05c6471018edf
https://github.com/galaxyproject/galaxy/commit/0770d8d988b20e36c2178d906bd0…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-base.js
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M static/maps/mvc/tool/tool-form-base.js.map
M static/scripts/mvc/tool/tool-form-base.js
M templates/webapps/galaxy/workflow/editor_tool_form.mako
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Revise workflow mode flag handling
Fix comment
Commit: 7bb88b3f44a53fcd881d69f01d84d88624157ff5
https://github.com/galaxyproject/galaxy/commit/7bb88b3f44a53fcd881d69f01d84…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/workflow/extract.py
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Merge pull request #1097 from jmchilton/cwl_refactoring
Small Tool and Workflow Cleanups from CWL Work.
Commit: 81f1b7f8e0ce0febe18460e67a97651aa1fd72a3
https://github.com/galaxyproject/galaxy/commit/81f1b7f8e0ce0febe18460e67a97…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.masthead.js
M static/maps/galaxy.masthead.js.map
M static/scripts/galaxy.masthead.js
Log Message:
-----------
Remove debugging logic and shortcut.
Commit: 844facd1f1ea3d669cf7e61463c8ca8966c69006
https://github.com/galaxyproject/galaxy/commit/844facd1f1ea3d669cf7e61463c8…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/list/list-panel.js
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/list/list-panel.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/list/list-panel.js
Log Message:
-----------
UI, Lists: throttle selector animation when number of list items > 20
Commit: 303af68c33699bada56ddbc95a5f8272401b2f0e
https://github.com/galaxyproject/galaxy/commit/303af68c33699bada56ddbc95a5f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/list/list-panel.js
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/list/list-panel.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/list/list-panel.js
Log Message:
-----------
Merge pull request #1149 from carlfeberhard/history.selector-anim
UI, Lists: throttle selector animation when number of list items > 20
Commit: 119e26f4e5f91a2091ff1cacffb3f2f99c4c79f4
https://github.com/galaxyproject/galaxy/commit/119e26f4e5f91a2091ff1cacffb3…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.masthead.js
M static/maps/galaxy.masthead.js.map
M static/scripts/galaxy.masthead.js
Log Message:
-----------
Merge pull request #1142 from dannon/menu_onclick_addition
Menu onclick addition
Commit: 51e098649070435570f9b68bf17ecc005da65bc2
https://github.com/galaxyproject/galaxy/commit/51e098649070435570f9b68bf17e…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
A static/scripts/bundled/libs.bundled.js
A static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Webpack: add in the libs bundles, Carl. They're kinda important.
Commit: baeaae99059fc94ae2a0dc059cfd448d05bdcbbe
https://github.com/galaxyproject/galaxy/commit/baeaae99059fc94ae2a0dc059cfd…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/galaxy.bundled.js
M static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
Log Message:
-----------
Webpack: rebuild bundles using webpack 1.12.8 as defined in the package.json
Commit: a664deeee76bcde33c725f37d61d8b41ea220b3d
https://github.com/galaxyproject/galaxy/commit/a664deeee76bcde33c725f37d61d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M client/GruntFile.js
M client/grunt-tasks/style.js
M client/package.json
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
Log Message:
-----------
Merge pull request #1130 from dannon/repack_dev
Enforce client build deps are up-to-date. Rebuild style with lessc > 2.5
Commit: ab0829f2e8df480d467f3b575c18a1ace38543cd
https://github.com/galaxyproject/galaxy/commit/ab0829f2e8df480d467f3b575c18…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
A test/api/workflows_format_2/README.txt
A test/api/workflows_format_2/__init__.py
A test/api/workflows_format_2/converter.py
A test/api/workflows_format_2/interface.py
A test/api/workflows_format_2/main.py
R test/api/yaml_to_workflow.py
M test/functional/tools/simple_constructs.yml
M test/unit/tools/test_parsing.py
Log Message:
-----------
Merge pull request #1096 from jmchilton/format_2
Outline "Format 2" workflow definitions.
Commit: 2e510bd5e12ab5e2c401e835e0f84f29376766db
https://github.com/galaxyproject/galaxy/commit/2e510bd5e12ab5e2c401e835e0f8…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
A test/functional/tools/output_format_collection.xml
M test/functional/tools/samples_tool_conf.xml
M test/unit/tools/test_actions.py
Log Message:
-----------
Merge pull request #1113 from jmchilton/format_source_collection
Allow accessing collection elements in format_source.
Commit: a16cb06705676aa49e725c8ab58521c239dfea4d
https://github.com/galaxyproject/galaxy/commit/a16cb06705676aa49e725c8ab585…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-11-22 (Sun, 22 Nov 2015)
Changed paths:
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Fix for re-installing an uninstalled TS repository with a dependency
where both the repository and the dependency were updated in the TS
after the repository was uninstalled.
Commit: 11f9fed4acb3fb912bc0e0e5c0232fb85c974f2f
https://github.com/galaxyproject/galaxy/commit/11f9fed4acb3fb912bc0e0e5c023…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-22 (Sun, 22 Nov 2015)
Changed paths:
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Merge pull request #1154 from gregvonkuster/dev
Fix for re-installing an uninstalled TS repository with a dependency
Commit: b6451d0be60a3bf2ca7c65c7700cb7361cb50754
https://github.com/galaxyproject/galaxy/commit/b6451d0be60a3bf2ca7c65c7700c…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
M test/functional/tools/output_format_collection.xml
M test/unit/tools/test_actions.py
Log Message:
-----------
Fix bugs in test and code introduced in PR #1113.
Commit: 3cadcdffb51f3994ed6ca0f4a9508f31fba1c4a6
https://github.com/galaxyproject/galaxy/commit/3cadcdffb51f3994ed6ca0f4a950…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
M test/functional/tools/output_format_collection.xml
M test/unit/tools/test_actions.py
Log Message:
-----------
Merge pull request #1155 from nsoranzo/fix_for_1113
Fix bugs in test and code introduced in PR #1113.
Commit: 368da171f5f4490029fb6e80b888e5b091051901
https://github.com/galaxyproject/galaxy/commit/368da171f5f4490029fb6e80b888…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/app/app-analysis.js
M config/plugins/visualizations/charts/templates/charts.mako
M static/maps/mvc/app/app-analysis.js.map
M static/scripts/mvc/app/app-analysis.js
Log Message:
-----------
Call onbeforeunload before hiding iframe through display()
Validated message
Commit: 9cc8e08537291a85885ee3ad52daeb36b95b4f8e
https://github.com/galaxyproject/galaxy/commit/9cc8e08537291a85885ee3ad52da…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M test/qunit/package.json
Log Message:
-----------
add local grunt-cli dependency for qunit tests
Commit: 77166a7295b1fe13f366414361b1752e6c0dd953
https://github.com/galaxyproject/galaxy/commit/77166a7295b1fe13f366414361b1…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M test/qunit/package.json
Log Message:
-----------
Merge pull request #1159 from martenson/local-grunt-cli-dep
add local grunt-cli dependency for qunit tests
Commit: 6e185fa208c27564b4cd2db5e31f55bf58c6eb4e
https://github.com/galaxyproject/galaxy/commit/6e185fa208c27564b4cd2db5e31f…
Author: Christian-B <github(a)brenn.co.uk>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
Log Message:
-----------
Allowed for capitailsed packgae name such as R
Commit: 32728e23921553c75fda61acadb4f5dc82a4f915
https://github.com/galaxyproject/galaxy/commit/32728e23921553c75fda61acadb4…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Small optimizations to running tools.
Commit: 1ea68f938408b72f8f0f4ebe2545550baea85037
https://github.com/galaxyproject/galaxy/commit/1ea68f938408b72f8f0f4ebe2545…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Save a query per output during tool execution.
Commit: 42d006162c095669a2c7afe1ab0f1fb67b000798
https://github.com/galaxyproject/galaxy/commit/42d006162c095669a2c7afe1ab0f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Another tool dataset creation optimization...
Rather than using three transactions to create an HDA, a dataset, and its roles - do this all in one transaction.
Commit: 01c57908eaf8bd589ce8738fdab14d415543d072
https://github.com/galaxyproject/galaxy/commit/01c57908eaf8bd589ce8738fdab1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Another tool execution optimization...
Prefetch all groups, roles, and associations when using User.all_users(). This reduces three queries down to one if the user has no groups or group roles and only belongs to the private user role, obviously the number of queries saved would increase more and more if the user belonged to multiple roles or groups.
Commit: 853efcea14d1ce11961d171324dbce03e6694117
https://github.com/galaxyproject/galaxy/commit/853efcea14d1ce11961d171324db…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Merge pull request #1163 from jmchilton/tool_opts_1
Small optimizations to running tools.
Commit: f3f8fef28a55c7b4e6994b08e3125a0d66a36140
https://github.com/galaxyproject/galaxy/commit/f3f8fef28a55c7b4e6994b08e312…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
R client/galaxy/scripts/apps/galaxy.js
M client/galaxy/scripts/apps/history-panel.js
M client/galaxy/scripts/apps/login.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/galaxy-app-base.js
M client/grunt-tasks/scripts.js
M client/webpack.config.js
M lib/galaxy/web/base/controller.py
M static/maps/galaxy-app-base.js.map
R static/maps/galaxy.menu.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
R static/scripts/bundled/galaxy.bundled.js
R static/scripts/bundled/galaxy.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/galaxy-app-base.js
R static/scripts/galaxy.menu.js
M templates/js-app.mako
Log Message:
-----------
Webpack: move Galaxy object creation from mako to app js, clean up and localize page, panels, and app
Commit: b15a4082939be8b533dddf9a6a63efec9be6b817
https://github.com/galaxyproject/galaxy/commit/b15a4082939be8b533dddf9a6a63…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R client/galaxy/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/tools/rgenetics/helper_functions.js
R client/galaxy/scripts/tools/rgenetics/timer.js
R static/maps/tools/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/tools/rgenetics/helper_functions.js.map
R static/maps/tools/rgenetics/timer.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
R static/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R static/scripts/tools/rgenetics/helper_functions.js
R static/scripts/tools/rgenetics/timer.js
Log Message:
-----------
Client: remove duplicate rgenetics directory tools/rgenetics
Commit: d921b4243101130d7de5517167eb38fa1aa6b1d3
https://github.com/galaxyproject/galaxy/commit/d921b4243101130d7de5517167eb…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R client/galaxy/scripts/mvc/app/app-analysis.js
R client/galaxy/scripts/mvc/app/app-login.js
R client/galaxy/scripts/mvc/app/app-view.js
R static/maps/mvc/app/app-analysis.js.map
R static/maps/mvc/app/app-login.js.map
R static/maps/mvc/app/app-view.js.map
R static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/app/app-login.js
R static/scripts/mvc/app/app-view.js
Log Message:
-----------
Webpack: remove mvc/app
Commit: 9f91b82245fc3ba467e8bef7b57bfc58ef02e9f0
https://github.com/galaxyproject/galaxy/commit/9f91b82245fc3ba467e8bef7b57b…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
R client/galaxy/scripts/libs/IE/IE7.js
R client/galaxy/scripts/libs/IE/IE8.js
R client/galaxy/scripts/libs/IE/blank.gif
R client/galaxy/scripts/libs/IE/excanvas.js
R client/galaxy/scripts/libs/IE/ie7-recalc.js
M client/galaxy/scripts/libs/d3.js
M client/galaxy/scripts/mvc/workflow/workflow-connector.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/polyfills.js
M client/galaxy/scripts/viz/visualization.js
A static/incompatible-browser.html
R static/maps/libs/IE/IE7.js.map
R static/maps/libs/IE/IE8.js.map
R static/maps/libs/IE/excanvas.js.map
R static/maps/libs/IE/ie7-recalc.js.map
M static/maps/mvc/workflow/workflow-connector.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/polyfills.js.map
M static/maps/viz/visualization.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
R static/scripts/libs/IE/IE7.js
R static/scripts/libs/IE/IE8.js
R static/scripts/libs/IE/blank.gif
R static/scripts/libs/IE/excanvas.js
R static/scripts/libs/IE/ie7-recalc.js
M static/scripts/mvc/workflow/workflow-connector.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/polyfills.js
M static/scripts/viz/visualization.js
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M templates/webapps/galaxy/workflow/editor.mako
Log Message:
-----------
Client: remove IE7/8 and excanvas polyfills
Commit: e3e9579a812c468fba3f8a64fae7c7455e4b5a9e
https://github.com/galaxyproject/galaxy/commit/e3e9579a812c468fba3f8a64fae7…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/login.js
R client/galaxy/scripts/galaxy-app-base.js
A client/galaxy/scripts/galaxy.js
R static/maps/galaxy-app-base.js.map
A static/maps/galaxy.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
R static/scripts/galaxy-app-base.js
A static/scripts/galaxy.js
M templates/galaxy_client_app.mako
Log Message:
-----------
Webpack: pack scripts, move galaxy-app-base.js to galaxy.js
Commit: 11edf3559d7092c9e3fada3f04d9291bea64f2f0
https://github.com/galaxyproject/galaxy/commit/11edf3559d7092c9e3fada3f04d9…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Merge pull request #1166 from jmchilton/tool_opts_2
Another set of tool execution optimizations
Commit: 4261403fad1c5fd1346b0cfe9fd25e97459cd028
https://github.com/galaxyproject/galaxy/commit/4261403fad1c5fd1346b0cfe9fd2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Fixes for WorkflowContentsManager requiring app during init.
Commit: 6752fcc100e0448d6fef6d27dacb8e2467de88ee
https://github.com/galaxyproject/galaxy/commit/6752fcc100e0448d6fef6d27dacb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Fix interface and usage of WorkflowModule.get_runtime_inputs.
Run workflow workflow form was broken for workflows with pause steps.
Fixes #1015 (thanks @afgane).
Commit: 68da0004709e88ed8a856d39e9fa4e64aa3bc653
https://github.com/galaxyproject/galaxy/commit/68da0004709e88ed8a856d39e9fa…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
R client/galaxy/scripts/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/rgenetics/helper_functions.js
R client/galaxy/scripts/rgenetics/timer.js
R static/maps/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/rgenetics/helper_functions.js.map
R static/maps/rgenetics/timer.js.map
R static/scripts/rgenetics/checkbox_and_radiobutton.js
R static/scripts/rgenetics/helper_functions.js
R static/scripts/rgenetics/timer.js
Log Message:
-----------
Client, rgenetics: 'Nuke 'em all' - R.Lazarus
Commit: c408b0ec6515deccd92a264edd4ab78061a06b87
https://github.com/galaxyproject/galaxy/commit/c408b0ec6515deccd92a264edd4a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M scripts/functional_tests.py
Log Message:
-----------
Do not check for tool migrations when running tests.
This is an inappropriate time for the check and causes slow down when running tests.
Commit: 4f6aad473d99d7327b3c2aa395f1b546a443fc02
https://github.com/galaxyproject/galaxy/commit/4f6aad473d99d7327b3c2aa395f1…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M config/tool_shed.ini.sample
A doc/source/releases/15.10.rst
M doc/source/releases/15.10_announce.rst
A doc/source/releases/16.01_announce.rst
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/tool_shed/config.py
M scripts/bootstrap_history.py
M templates/webapps/galaxy/root/index.mako
Log Message:
-----------
Merge branch 'master' into dev
Commit: 6fda0e0aac54c1c9e758110b4868b4a3fece16aa
https://github.com/galaxyproject/galaxy/commit/6fda0e0aac54c1c9e758110b4868…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Log Message:
-----------
Merge branch 'master' into dev
Conflicts:
run_tests.sh
Commit: f397584538f59d03d9c37d3f9366b455022e97b2
https://github.com/galaxyproject/galaxy/commit/f397584538f59d03d9c37d3f9366…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M client/galaxy/scripts/polyfills.js
M static/maps/polyfills.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/polyfills.js
M templates/base.mako
M templates/base/base_panels.mako
M templates/js-app.mako
Log Message:
-----------
Webpack: add link rel='index' with href to Galaxy.root, rework browser testing to use the same when redirecting to error pages
Commit: c11c07d9bb124d41a301c5adf8f81c42b99430cc
https://github.com/galaxyproject/galaxy/commit/c11c07d9bb124d41a301c5adf8f8…
Author: Dave B <dave(a)bx.psu.edu>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M .ci/flake8_blacklist.txt
M .ci/flake8_wrapper.sh
M .gitignore
A CODE_OF_CONDUCT.md
M CONTRIBUTING.md
M CONTRIBUTORS.md
M README.rst
M client/GruntFile.js
M client/galaxy/scripts/galaxy-app-base.js
M client/galaxy/scripts/galaxy.library.js
M client/galaxy/scripts/galaxy.masthead.js
M client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/galaxy.panels.js
M client/galaxy/scripts/libs/jquery/jquery.dynatree.js
M client/galaxy/scripts/libs/jquery/select2.js
A client/galaxy/scripts/mvc/app/app-analysis.js
A client/galaxy/scripts/mvc/app/app-login.js
A client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-li-edit.js
M client/galaxy/scripts/mvc/collection/collection-li.js
M client/galaxy/scripts/mvc/collection/collection-model.js
M client/galaxy/scripts/mvc/collection/collection-panel.js
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/grid/grid-model.js
M client/galaxy/scripts/mvc/grid/grid-template.js
M client/galaxy/scripts/mvc/grid/grid-view.js
A client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/hda-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
M client/galaxy/scripts/mvc/history/history-panel-edit-current.js
M client/galaxy/scripts/mvc/history/history-panel.js
M client/galaxy/scripts/mvc/history/history-structure-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-li.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
M client/galaxy/scripts/mvc/list/list-item.js
M client/galaxy/scripts/mvc/list/list-panel.js
M client/galaxy/scripts/mvc/tags.js
M client/galaxy/scripts/mvc/tools.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/tools/tools-form-workflow.js
M client/galaxy/scripts/mvc/tools/tools-form.js
M client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/ui/ui-button-check.js
R client/galaxy/scripts/mvc/ui/ui-button-menu.js
A client/galaxy/scripts/mvc/ui/ui-buttons.js
M client/galaxy/scripts/mvc/ui/ui-color-picker.js
M client/galaxy/scripts/mvc/ui/ui-misc.js
M client/galaxy/scripts/mvc/ui/ui-modal.js
M client/galaxy/scripts/mvc/ui/ui-options.js
M client/galaxy/scripts/mvc/ui/ui-popover.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
A client/galaxy/scripts/mvc/upload/composite/composite-row.js
A client/galaxy/scripts/mvc/upload/composite/composite-view.js
A client/galaxy/scripts/mvc/upload/default/default-row.js
A client/galaxy/scripts/mvc/upload/default/default-view.js
M client/galaxy/scripts/mvc/upload/upload-button.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-model.js
R client/galaxy/scripts/mvc/upload/upload-row.js
M client/galaxy/scripts/mvc/upload/upload-settings.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/user/user-quotameter.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-terminals.js
M client/galaxy/scripts/reports_webapp/run_stats.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/tool_link.handlebars
M client/galaxy/scripts/utils/add-logging.js
M client/galaxy/scripts/utils/deferred.js
M client/galaxy/scripts/utils/metrics-logger.js
M client/galaxy/scripts/utils/uploadbox.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/style/less/base.less
M client/galaxy/style/less/bootstrap.less
M client/galaxy/style/less/galaxy_bootstrap/variables.less
M client/galaxy/style/less/history.less
M client/galaxy/style/less/library.less
M client/galaxy/style/less/list-item.less
M client/galaxy/style/less/reports.less
M client/galaxy/style/less/trackster.less
M client/galaxy/style/less/ui.less
M client/galaxy/style/less/upload.less
M client/grunt-tasks/scripts.js
M client/grunt-tasks/style.js
M client/package.json
M client/toolshed/scripts/mvc/groups/group-detail-view.js
M client/toolshed/scripts/mvc/groups/group-listrow-view.js
M config/auth_conf.xml.sample
M config/datatypes_conf.xml.sample
M config/galaxy.ini.sample
M config/job_conf.xml.sample_advanced
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.xml
A config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js
A config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/static/js/ipython.js
M config/plugins/interactive_environments/ipython/templates/ipython.mako
M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample
M config/plugins/interactive_environments/rstudio/static/js/rstudio.js
M config/plugins/interactive_environments/rstudio/templates/rstudio.mako
M config/plugins/visualizations/charts/static/build-app.js
M config/plugins/visualizations/charts/static/charts/jqplot/boxplot/wrapper.js
M config/plugins/visualizations/charts/static/charts/nvd3/pie/wrapper.js
M config/plugins/visualizations/charts/static/charts/tools.js
M config/plugins/visualizations/charts/static/views/group.js
M config/plugins/visualizations/charts/static/views/viewport.js
A config/plugins/visualizations/graphviz/README.md
A config/plugins/visualizations/graphviz/config/graphviz.xml
A config/plugins/visualizations/graphviz/static/css/style.css
A config/plugins/visualizations/graphviz/static/img/15xvbd5.png
A config/plugins/visualizations/graphviz/static/img/lite-blue-check.png
A config/plugins/visualizations/graphviz/static/js/collapse.js
A config/plugins/visualizations/graphviz/static/js/cytoscape.min.js
A config/plugins/visualizations/graphviz/static/js/graphVis.js
A config/plugins/visualizations/graphviz/static/js/jquery.qtip.js
A config/plugins/visualizations/graphviz/static/js/tip_centerwindow.js
A config/plugins/visualizations/graphviz/static/js/tip_followscroll.js
A config/plugins/visualizations/graphviz/static/js/toolPanelFunctions.js
A config/plugins/visualizations/graphviz/static/js/wz_tooltip.js
A config/plugins/visualizations/graphviz/templates/graphviz.mako
M config/tool_data_table_conf.xml.sample
M config/tool_shed.ini.sample
M contrib/galaxy_config_merger.py
M contrib/nagios/check_galaxy.py
M create_db.sh
M cron/add_manual_builds.py
M cron/build_chrom_db.py
M cron/cleanup_datasets.py
R dist-eggs.ini
A doc/source/admin/index.rst
A doc/source/admin/interactive_environments.png
A doc/source/admin/interactive_environments.rst
A doc/source/admin/interactive_environments.svg
A doc/source/admin/interactive_environments_success.png
A doc/source/admin/useful_scripts.rst
A doc/source/api/quickstart.rst
M doc/source/api_doc.rst
M doc/source/conf.py
A doc/source/dev/faq.rst
A doc/source/dev/index.rst
M doc/source/index.rst
M doc/source/lib/galaxy.auth.providers.rst
M doc/source/lib/galaxy.datatypes.rst
A doc/source/lib/galaxy.dependencies.rst
M doc/source/lib/galaxy.eggs.rst
R doc/source/lib/galaxy.jobs.runners.lwr_client.rst
R doc/source/lib/galaxy.jobs.runners.lwr_client.staging.rst
R doc/source/lib/galaxy.jobs.runners.lwr_client.transport.rst
M doc/source/lib/galaxy.jobs.runners.rst
M doc/source/lib/galaxy.rst
M doc/source/lib/galaxy.tools.deps.resolvers.rst
M doc/source/lib/galaxy.web.framework.middleware.rst
M doc/source/lib/galaxy.webapps.galaxy.controllers.rst
M doc/source/lib/galaxy.webapps.reports.controllers.rst
M doc/source/lib/galaxy.webapps.rst
M doc/source/lib/galaxy.webapps.tool_shed.api.rst
M doc/source/lib/modules.rst
R doc/source/lib/pkg_resources.rst
A doc/source/project/issues.rst
M doc/source/project/organization.rst
A doc/source/releases/15.07.rst
M doc/source/releases/15.07_announce.rst
A doc/source/releases/15.10.rst
A doc/source/releases/15.10_announce.rst
A doc/source/releases/16.01_announce.rst
M doc/source/releases/index.rst
M doc/source/ts_api_doc.rst
R eggs.ini
M lib/galaxy/__init__.py
M lib/galaxy/app.py
M lib/galaxy/auth/__init__.py
M lib/galaxy/auth/providers/ldap_ad.py
M lib/galaxy/config.py
M lib/galaxy/dataset_collections/matching.py
M lib/galaxy/dataset_collections/structure.py
M lib/galaxy/dataset_collections/type_description.py
M lib/galaxy/datatypes/binary.py
A lib/galaxy/datatypes/constructive_solid_geometry.py
M lib/galaxy/datatypes/converters/bedgraph_to_array_tree_converter.py
M lib/galaxy/datatypes/converters/bgzip.py
M lib/galaxy/datatypes/converters/gff_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/interval_to_bed_converter.py
M lib/galaxy/datatypes/converters/interval_to_bedstrict_converter.py
M lib/galaxy/datatypes/converters/interval_to_coverage.py
M lib/galaxy/datatypes/converters/interval_to_fli.py
M lib/galaxy/datatypes/converters/interval_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/interval_to_tabix_converter.py
M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py
M lib/galaxy/datatypes/converters/maf_to_fasta_converter.py
M lib/galaxy/datatypes/converters/maf_to_interval_converter.py
M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py
M lib/galaxy/datatypes/converters/pileup_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/vcf_to_interval_index_converter.py
M lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py
M lib/galaxy/datatypes/converters/wiggle_to_array_tree_converter.py
M lib/galaxy/datatypes/converters/wiggle_to_simple_converter.py
M lib/galaxy/datatypes/coverage.py
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/dataproviders/dataset.py
M lib/galaxy/datatypes/display_applications/util.py
M lib/galaxy/datatypes/genetics.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/datatypes/metadata.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sequence.py
A lib/galaxy/datatypes/set_metadata_tool.xml
M lib/galaxy/datatypes/tabular.py
A lib/galaxy/datatypes/test/1.gg
A lib/galaxy/datatypes/test/oxli_countgraph.oxlicg
A lib/galaxy/datatypes/test/oxli_graphlabels.oxligl
A lib/galaxy/datatypes/test/oxli_nodegraph.oxling
A lib/galaxy/datatypes/test/oxli_stoptags.oxlist
A lib/galaxy/datatypes/test/oxli_subset.oxliss
A lib/galaxy/datatypes/test/oxli_tagset.oxlits
M lib/galaxy/datatypes/text.py
M lib/galaxy/datatypes/util/gff_util.py
A lib/galaxy/dependencies/__init__.py
A lib/galaxy/dependencies/conditional-requirements.txt
A lib/galaxy/dependencies/dev-requirements.txt
A lib/galaxy/dependencies/requirements.txt
M lib/galaxy/eggs/__init__.py
R lib/galaxy/eggs/dist.py
R lib/galaxy/eggs/scramble.py
M lib/galaxy/exceptions/__init__.py
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/actions/post.py
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/jobs/deferred/__init__.py
M lib/galaxy/jobs/metrics/instrumenters/collectl.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/cli.py
M lib/galaxy/jobs/runners/condor.py
M lib/galaxy/jobs/runners/drmaa.py
M lib/galaxy/jobs/runners/local.py
R lib/galaxy/jobs/runners/lwr.py
R lib/galaxy/jobs/runners/lwr_client/__init__.py
R lib/galaxy/jobs/runners/lwr_client/action_mapper.py
R lib/galaxy/jobs/runners/lwr_client/amqp_exchange.py
R lib/galaxy/jobs/runners/lwr_client/amqp_exchange_factory.py
R lib/galaxy/jobs/runners/lwr_client/client.py
R lib/galaxy/jobs/runners/lwr_client/config_util.py
R lib/galaxy/jobs/runners/lwr_client/decorators.py
R lib/galaxy/jobs/runners/lwr_client/destination.py
R lib/galaxy/jobs/runners/lwr_client/interface.py
R lib/galaxy/jobs/runners/lwr_client/job_directory.py
R lib/galaxy/jobs/runners/lwr_client/manager.py
R lib/galaxy/jobs/runners/lwr_client/object_client.py
R lib/galaxy/jobs/runners/lwr_client/path_mapper.py
R lib/galaxy/jobs/runners/lwr_client/setup_handler.py
R lib/galaxy/jobs/runners/lwr_client/staging/__init__.py
R lib/galaxy/jobs/runners/lwr_client/staging/down.py
R lib/galaxy/jobs/runners/lwr_client/staging/up.py
R lib/galaxy/jobs/runners/lwr_client/transport/__init__.py
R lib/galaxy/jobs/runners/lwr_client/transport/curl.py
R lib/galaxy/jobs/runners/lwr_client/transport/standard.py
R lib/galaxy/jobs/runners/lwr_client/util.py
M lib/galaxy/jobs/runners/pbs.py
M lib/galaxy/jobs/runners/pulsar.py
A lib/galaxy/jobs/runners/util/drmaa/__init__.py
M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh
M lib/galaxy/jobs/runners/util/job_script/__init__.py
A lib/galaxy/jobs/runners/util/retry.py
A lib/galaxy/jobs/runners/util/sudo.py
M lib/galaxy/jobs/transfer_manager.py
M lib/galaxy/main.py
M lib/galaxy/managers/base.py
M lib/galaxy/managers/citations.py
M lib/galaxy/managers/collections.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/managers/datasets.py
M lib/galaxy/managers/folders.py
M lib/galaxy/managers/hdas.py
M lib/galaxy/managers/histories.py
M lib/galaxy/managers/libraries.py
M lib/galaxy/managers/rbac_secured.py
M lib/galaxy/managers/sharable.py
M lib/galaxy/managers/users.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/custom_types.py
M lib/galaxy/model/mapping.py
M lib/galaxy/model/migrate/check.py
M lib/galaxy/model/migrate/versions/0001_initial_tables.py
M lib/galaxy/model/migrate/versions/0002_metadata_file_table.py
M lib/galaxy/model/migrate/versions/0003_security_and_libraries.py
M lib/galaxy/model/migrate/versions/0004_indexes_and_defaults.py
M lib/galaxy/model/migrate/versions/0005_cleanup_datasets_fix.py
M lib/galaxy/model/migrate/versions/0006_change_qual_datatype.py
M lib/galaxy/model/migrate/versions/0007_sharing_histories.py
M lib/galaxy/model/migrate/versions/0008_galaxy_forms.py
M lib/galaxy/model/migrate/versions/0009_request_table.py
M lib/galaxy/model/migrate/versions/0010_hda_display_at_authz_table.py
M lib/galaxy/model/migrate/versions/0011_v0010_mysql_index_fix.py
M lib/galaxy/model/migrate/versions/0012_user_address.py
M lib/galaxy/model/migrate/versions/0013_change_lib_item_templates_to_forms.py
M lib/galaxy/model/migrate/versions/0014_pages.py
M lib/galaxy/model/migrate/versions/0015_tagging.py
M lib/galaxy/model/migrate/versions/0016_v0015_mysql_index_fix.py
M lib/galaxy/model/migrate/versions/0017_library_item_indexes.py
M lib/galaxy/model/migrate/versions/0018_ordered_tags_and_page_tags.py
M lib/galaxy/model/migrate/versions/0019_request_library_folder.py
M lib/galaxy/model/migrate/versions/0020_library_upload_job.py
M lib/galaxy/model/migrate/versions/0021_user_prefs.py
M lib/galaxy/model/migrate/versions/0022_visualization_tables.py
M lib/galaxy/model/migrate/versions/0023_page_published_and_deleted_columns.py
M lib/galaxy/model/migrate/versions/0024_page_slug_unique_constraint.py
M lib/galaxy/model/migrate/versions/0025_user_info.py
M lib/galaxy/model/migrate/versions/0026_cloud_tables.py
M lib/galaxy/model/migrate/versions/0027_request_events.py
M lib/galaxy/model/migrate/versions/0028_external_metadata_file_override.py
M lib/galaxy/model/migrate/versions/0029_user_actions.py
M lib/galaxy/model/migrate/versions/0030_history_slug_column.py
M lib/galaxy/model/migrate/versions/0031_community_and_workflow_tags.py
M lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py
M lib/galaxy/model/migrate/versions/0033_published_cols_for_histories_and_workflows.py
M lib/galaxy/model/migrate/versions/0034_page_user_share_association.py
M lib/galaxy/model/migrate/versions/0035_item_annotations_and_workflow_step_tags.py
M lib/galaxy/model/migrate/versions/0036_add_deleted_column_to_library_template_assoc_tables.py
M lib/galaxy/model/migrate/versions/0037_samples_library.py
M lib/galaxy/model/migrate/versions/0038_add_inheritable_column_to_library_template_assoc_tables.py
M lib/galaxy/model/migrate/versions/0039_add_synopsis_column_to_library_table.py
M lib/galaxy/model/migrate/versions/0040_page_annotations.py
M lib/galaxy/model/migrate/versions/0041_workflow_invocation.py
M lib/galaxy/model/migrate/versions/0042_workflow_invocation_fix.py
M lib/galaxy/model/migrate/versions/0043_visualization_sharing_tagging_annotating.py
M lib/galaxy/model/migrate/versions/0044_add_notify_column_to_request_table.py
M lib/galaxy/model/migrate/versions/0045_request_type_permissions_table.py
M lib/galaxy/model/migrate/versions/0046_post_job_actions.py
M lib/galaxy/model/migrate/versions/0047_job_table_user_id_column.py
M lib/galaxy/model/migrate/versions/0048_dataset_instance_state_column.py
M lib/galaxy/model/migrate/versions/0049_api_keys_table.py
M lib/galaxy/model/migrate/versions/0050_drop_cloud_tables.py
M lib/galaxy/model/migrate/versions/0051_imported_col_for_jobs_table.py
M lib/galaxy/model/migrate/versions/0052_sample_dataset_table.py
M lib/galaxy/model/migrate/versions/0053_item_ratings.py
M lib/galaxy/model/migrate/versions/0054_visualization_dbkey.py
M lib/galaxy/model/migrate/versions/0055_add_pja_assoc_for_jobs.py
M lib/galaxy/model/migrate/versions/0056_workflow_outputs.py
M lib/galaxy/model/migrate/versions/0057_request_notify.py
M lib/galaxy/model/migrate/versions/0058_history_import_export.py
M lib/galaxy/model/migrate/versions/0059_sample_dataset_file_path.py
M lib/galaxy/model/migrate/versions/0060_history_archive_import.py
M lib/galaxy/model/migrate/versions/0061_tasks.py
M lib/galaxy/model/migrate/versions/0062_user_openid_table.py
M lib/galaxy/model/migrate/versions/0063_sequencer_table.py
M lib/galaxy/model/migrate/versions/0064_add_run_and_sample_run_association_tables.py
M lib/galaxy/model/migrate/versions/0065_add_name_to_form_fields_and_values.py
M lib/galaxy/model/migrate/versions/0066_deferred_job_and_transfer_job_tables.py
M lib/galaxy/model/migrate/versions/0067_populate_sequencer_table.py
M lib/galaxy/model/migrate/versions/0068_rename_sequencer_to_external_services.py
M lib/galaxy/model/migrate/versions/0069_rename_sequencer_form_type.py
M lib/galaxy/model/migrate/versions/0070_add_info_column_to_deferred_job_table.py
M lib/galaxy/model/migrate/versions/0071_add_history_and_workflow_to_sample.py
M lib/galaxy/model/migrate/versions/0072_add_pid_and_socket_columns_to_transfer_job_table.py
M lib/galaxy/model/migrate/versions/0073_add_ldda_to_implicit_conversion_table.py
M lib/galaxy/model/migrate/versions/0074_add_purged_column_to_library_dataset_table.py
M lib/galaxy/model/migrate/versions/0075_add_subindex_column_to_run_table.py
M lib/galaxy/model/migrate/versions/0076_fix_form_values_data_corruption.py
M lib/galaxy/model/migrate/versions/0077_create_tool_tag_association_table.py
M lib/galaxy/model/migrate/versions/0078_add_columns_for_disk_usage_accounting.py
M lib/galaxy/model/migrate/versions/0079_input_library_to_job_table.py
M lib/galaxy/model/migrate/versions/0080_quota_tables.py
M lib/galaxy/model/migrate/versions/0081_add_tool_version_to_hda_ldda.py
M lib/galaxy/model/migrate/versions/0082_add_tool_shed_repository_table.py
M lib/galaxy/model/migrate/versions/0083_add_prepare_files_to_task.py
M lib/galaxy/model/migrate/versions/0084_add_ldda_id_to_implicit_conversion_table.py
M lib/galaxy/model/migrate/versions/0085_add_task_info.py
M lib/galaxy/model/migrate/versions/0086_add_tool_shed_repository_table_columns.py
M lib/galaxy/model/migrate/versions/0087_tool_id_guid_map_table.py
M lib/galaxy/model/migrate/versions/0088_add_installed_changeset_revison_column.py
M lib/galaxy/model/migrate/versions/0089_add_object_store_id_columns.py
M lib/galaxy/model/migrate/versions/0090_add_tool_shed_repository_table_columns.py
M lib/galaxy/model/migrate/versions/0091_add_tool_version_tables.py
M lib/galaxy/model/migrate/versions/0092_add_migrate_tools_table.py
M lib/galaxy/model/migrate/versions/0093_add_job_params_col.py
M lib/galaxy/model/migrate/versions/0094_add_job_handler_col.py
M lib/galaxy/model/migrate/versions/0095_hda_subsets.py
M lib/galaxy/model/migrate/versions/0096_openid_provider.py
M lib/galaxy/model/migrate/versions/0097_add_ctx_rev_column.py
M lib/galaxy/model/migrate/versions/0098_genome_index_tool_data_table.py
M lib/galaxy/model/migrate/versions/0099_add_tool_dependency_table.py
M lib/galaxy/model/migrate/versions/0100_alter_tool_dependency_table_version_column.py
M lib/galaxy/model/migrate/versions/0101_drop_installed_changeset_revision_column.py
M lib/galaxy/model/migrate/versions/0102_add_tool_dependency_status_columns.py
M lib/galaxy/model/migrate/versions/0103_add_tool_shed_repository_status_columns.py
M lib/galaxy/model/migrate/versions/0104_update_genome_downloader_job_parameters.py
M lib/galaxy/model/migrate/versions/0105_add_cleanup_event_table.py
M lib/galaxy/model/migrate/versions/0106_add_missing_indexes.py
M lib/galaxy/model/migrate/versions/0107_add_exit_code_to_job_and_task.py
M lib/galaxy/model/migrate/versions/0108_add_extended_metadata.py
M lib/galaxy/model/migrate/versions/0109_add_repository_dependency_tables.py
M lib/galaxy/model/migrate/versions/0110_add_dataset_uuid.py
M lib/galaxy/model/migrate/versions/0111_add_job_destinations.py
M lib/galaxy/model/migrate/versions/0112_add_data_manager_history_association_and_data_manager_job_association_tables.py
M lib/galaxy/model/migrate/versions/0113_update_migrate_tools_table.py
M lib/galaxy/model/migrate/versions/0114_update_migrate_tools_table_again.py
M lib/galaxy/model/migrate/versions/0115_longer_user_password_field.py
M lib/galaxy/model/migrate/versions/0116_drop_update_available_col_add_tool_shed_status_col.py
M lib/galaxy/model/migrate/versions/0117_add_user_activation.py
M lib/galaxy/model/migrate/versions/0118_add_hda_extended_metadata.py
M lib/galaxy/model/migrate/versions/0119_job_metrics.py
M lib/galaxy/model/migrate/versions/0120_dataset_collections.py
M lib/galaxy/model/migrate/versions/0121_workflow_uuids.py
M lib/galaxy/model/migrate/versions/0123_add_workflow_request_tables.py
M lib/galaxy/model/migrate/versions/0124_job_state_history.py
M lib/galaxy/model/migrate/versions/0125_workflow_step_tracking.py
M lib/galaxy/model/migrate/versions/0126_password_reset.py
M lib/galaxy/model/migrate/versions/0127_output_collection_adjustments.py
M lib/galaxy/model/migrate/versions/0128_session_timeout.py
M lib/galaxy/model/migrate/versions/0129_job_external_output_metadata_validity.py
A lib/galaxy/model/migrate/versions/0130_change_pref_datatype.py
M lib/galaxy/model/orm/__init__.py
M lib/galaxy/model/orm/engine_factory.py
M lib/galaxy/model/orm/logging_connection_proxy.py
M lib/galaxy/model/orm/scripts.py
M lib/galaxy/model/search.py
M lib/galaxy/model/tool_shed_install/__init__.py
M lib/galaxy/model/tool_shed_install/migrate/check.py
M lib/galaxy/objectstore/__init__.py
M lib/galaxy/objectstore/rods.py
M lib/galaxy/objectstore/s3.py
M lib/galaxy/objectstore/s3_multipart_upload.py
M lib/galaxy/queue_worker.py
M lib/galaxy/queues.py
M lib/galaxy/quota/__init__.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/actions/upload_common.py
M lib/galaxy/tools/data_manager/manager.py
M lib/galaxy/tools/deps/commands.py
M lib/galaxy/tools/deps/docker_util.py
M lib/galaxy/tools/deps/dockerfiles.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/deps/resolvers/tool_shed_packages.py
M lib/galaxy/tools/errors.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/imp_exp/__init__.py
A lib/galaxy/tools/imp_exp/exp_history_to_archive.xml
M lib/galaxy/tools/imp_exp/export_history.py
M lib/galaxy/tools/lint.py
A lib/galaxy/tools/lint_util.py
M lib/galaxy/tools/linters/command.py
M lib/galaxy/tools/linters/help.py
M lib/galaxy/tools/linters/inputs.py
M lib/galaxy/tools/linters/outputs.py
A lib/galaxy/tools/linters/stdio.py
M lib/galaxy/tools/linters/tests.py
M lib/galaxy/tools/linters/top_level.py
A lib/galaxy/tools/linters/xml_order.py
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/tools/parameters/grouping.py
M lib/galaxy/tools/parameters/meta.py
M lib/galaxy/tools/parameters/output_collect.py
M lib/galaxy/tools/parser/factory.py
M lib/galaxy/tools/parser/interface.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/tools/search/__init__.py
M lib/galaxy/tools/test.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/lineages/stock.py
M lib/galaxy/tools/util/maf_utilities.py
M lib/galaxy/tools/wrappers.py
M lib/galaxy/util/__init__.py
M lib/galaxy/util/bunch.py
M lib/galaxy/util/jstree.py
M lib/galaxy/util/log/fluent_log.py
M lib/galaxy/util/plugin_config.py
M lib/galaxy/util/template.py
M lib/galaxy/util/topsort.py
M lib/galaxy/util/xml_macros.py
M lib/galaxy/version.py
M lib/galaxy/visualization/data_providers/genome.py
M lib/galaxy/visualization/plugins/config_parser.py
M lib/galaxy/visualization/plugins/plugin.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/base/controllers/admin.py
M lib/galaxy/web/base/interactive_environments.py
M lib/galaxy/web/base/pluginframework.py
M lib/galaxy/web/framework/__init__.py
M lib/galaxy/web/framework/base.py
M lib/galaxy/web/framework/decorators.py
M lib/galaxy/web/framework/helpers/__init__.py
M lib/galaxy/web/framework/middleware/profile.py
M lib/galaxy/web/framework/middleware/remoteuser.py
M lib/galaxy/web/framework/middleware/sentry.py
A lib/galaxy/web/framework/middleware/statsd.py
M lib/galaxy/web/framework/openid_manager.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/web/proxy/__init__.py
M lib/galaxy/web/proxy/js/package.json
M lib/galaxy/web/security/__init__.py
M lib/galaxy/webapps/galaxy/api/datatypes.py
M lib/galaxy/webapps/galaxy/api/folders.py
M lib/galaxy/webapps/galaxy/api/histories.py
M lib/galaxy/webapps/galaxy/api/history_contents.py
M lib/galaxy/webapps/galaxy/api/jobs.py
M lib/galaxy/webapps/galaxy/api/lda_datasets.py
M lib/galaxy/webapps/galaxy/api/library_contents.py
M lib/galaxy/webapps/galaxy/api/quotas.py
M lib/galaxy/webapps/galaxy/api/remote_files.py
M lib/galaxy/webapps/galaxy/api/requests.py
M lib/galaxy/webapps/galaxy/api/roles.py
M lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py
M lib/galaxy/webapps/galaxy/api/tools.py
M lib/galaxy/webapps/galaxy/api/users.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/admin.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/async.py
R lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py
M lib/galaxy/webapps/galaxy/controllers/data_manager.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/library.py
M lib/galaxy/webapps/galaxy/controllers/library_admin.py
M lib/galaxy/webapps/galaxy/controllers/library_common.py
M lib/galaxy/webapps/galaxy/controllers/mobile.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/tool_runner.py
R lib/galaxy/webapps/galaxy/controllers/ucsc_proxy.py
M lib/galaxy/webapps/galaxy/controllers/user.py
M lib/galaxy/webapps/galaxy/controllers/userskeys.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/reports/app.py
M lib/galaxy/webapps/reports/buildapp.py
M lib/galaxy/webapps/reports/controllers/home.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/query.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/system.py
M lib/galaxy/webapps/reports/controllers/users.py
M lib/galaxy/webapps/reports/controllers/workflows.py
A lib/galaxy/webapps/tool_shed/api/configuration.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/webapps/tool_shed/api/repository_revisions.py
M lib/galaxy/webapps/tool_shed/app.py
M lib/galaxy/webapps/tool_shed/buildapp.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/webapps/tool_shed/controllers/admin.py
M lib/galaxy/webapps/tool_shed/controllers/hg.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/galaxy/webapps/tool_shed/controllers/repository_review.py
M lib/galaxy/webapps/tool_shed/controllers/upload.py
M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/galaxy/webapps/tool_shed/model/mapping.py
M lib/galaxy/webapps/tool_shed/model/migrate/check.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0001_initial_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0002_add_tool_suite_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0003_review_and_review_association_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0004_repository_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0005_drop_tool_related_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0006_add_email_alerts_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0007_add_long_description_times_downloaded_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0008_add_repository_metadata_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0009_add_malicious_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0010_add_new_repo_alert_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0011_add_tool_versions_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0012_add_downloadable_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0013_add_review_tables.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0014_add_deprecated_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0015_add_api_keys_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0016_add_do_not_test_tools_functionally_correct_errors_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0017_add_galaxy_utility_columns_to_repository_metadata_table.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0018_add_repository_metadata_flag_columns.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0019_add_skip_tool_test_table_and_test_install_error_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0020_add_repository_type_column.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0021_change_repository_type_value.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0022_add_repository_admin_roles.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0024_password_reset.py
M lib/galaxy/webapps/tool_shed/model/migrate/versions/0025_session_timeout.py
M lib/galaxy/webapps/tool_shed/search/repo_search.py
M lib/galaxy/webapps/tool_shed/search/tool_search.py
M lib/galaxy/webapps/tool_shed/security/__init__.py
A lib/galaxy/webapps/util.py
M lib/galaxy/workflow/extract.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/render.py
M lib/galaxy/workflow/run.py
M lib/galaxy_ext/metadata/set_metadata.py
M lib/galaxy_utils/sequence/fasta.py
M lib/galaxy_utils/sequence/fastq.py
M lib/galaxy_utils/sequence/sequence.py
M lib/galaxy_utils/sequence/transform.py
M lib/galaxy_utils/sequence/vcf.py
R lib/pkg_resources.py
M lib/pulsar/client/action_mapper.py
M lib/pulsar/client/amqp_exchange.py
M lib/pulsar/client/amqp_exchange_factory.py
M lib/pulsar/client/client.py
M lib/pulsar/client/config_util.py
M lib/pulsar/client/decorators.py
M lib/pulsar/client/interface.py
M lib/pulsar/client/manager.py
M lib/pulsar/client/staging/__init__.py
M lib/pulsar/client/staging/down.py
M lib/pulsar/client/staging/up.py
M lib/pulsar/client/transport/curl.py
M lib/pulsar/client/transport/poster.py
M lib/pulsar/client/transport/requests.py
M lib/pulsar/client/util.py
M lib/tool_shed/capsule/capsule_manager.py
M lib/tool_shed/dependencies/attribute_handlers.py
M lib/tool_shed/dependencies/repository/relation_builder.py
M lib/tool_shed/dependencies/tool/tag_attribute_handler.py
M lib/tool_shed/galaxy_install/datatypes/custom_datatype_manager.py
M lib/tool_shed/galaxy_install/dependency_display.py
M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/installed_repository_manager.py
M lib/tool_shed/galaxy_install/metadata/installed_repository_metadata_manager.py
M lib/tool_shed/galaxy_install/migrate/check.py
M lib/tool_shed/galaxy_install/migrate/common.py
M lib/tool_shed/galaxy_install/migrate/versions/0001_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0002_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0003_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0004_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0005_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0006_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0007_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0008_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0009_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0010_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0011_tools.py
M lib/tool_shed/galaxy_install/migrate/versions/0012_tools.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/env_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/asynchronous_reader.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/recipe_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/galaxy_install/tool_migration_manager.py
M lib/tool_shed/galaxy_install/tools/data_manager.py
M lib/tool_shed/galaxy_install/update_repository_manager.py
M lib/tool_shed/galaxy_install/utility_containers/__init__.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_grid_filter_manager.py
M lib/tool_shed/grids/repository_grids.py
M lib/tool_shed/grids/repository_review_grids.py
M lib/tool_shed/grids/util.py
M lib/tool_shed/managers/groups.py
M lib/tool_shed/metadata/metadata_generator.py
M lib/tool_shed/metadata/repository_metadata_manager.py
M lib/tool_shed/repository_registry.py
M lib/tool_shed/repository_types/metadata.py
M lib/tool_shed/repository_types/repository_suite_definition.py
M lib/tool_shed/repository_types/tool_dependency_definition.py
M lib/tool_shed/repository_types/util.py
M lib/tool_shed/scripts/api/add_repository_registry_entry.py
M lib/tool_shed/scripts/api/common.py
M lib/tool_shed/scripts/api/create_categories.py
M lib/tool_shed/scripts/api/create_users.py
M lib/tool_shed/scripts/api/export.py
M lib/tool_shed/scripts/api/get_filtered_repository_revisions.py
M lib/tool_shed/scripts/api/import_capsule.py
M lib/tool_shed/scripts/api/remove_repository_registry_entry.py
M lib/tool_shed/scripts/api/reset_metadata_on_repositories.py
M lib/tool_shed/scripts/api/tool_shed_repository_revision_update.py
M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py
M lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py
M lib/tool_shed/scripts/check_filesystem_for_empty_tool_dependency_installation_paths.py
M lib/tool_shed/scripts/check_repositories_for_functional_tests.py
M lib/tool_shed/scripts/check_s3_for_empty_tool_dependency_installation_paths.py
M lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py
M lib/tool_shed/scripts/clean_up_tool_dependency_directory.py
M lib/tool_shed/scripts/deprecate_repositories_without_metadata.py
M lib/tool_shed/scripts/show_tool_dependency_installation_dir_contents.py
M lib/tool_shed/tool_shed_registry.py
M lib/tool_shed/tools/data_table_manager.py
M lib/tool_shed/tools/tool_version_manager.py
M lib/tool_shed/util/basic_util.py
M lib/tool_shed/util/commit_util.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/container_util.py
M lib/tool_shed/util/encoding_util.py
M lib/tool_shed/util/hg_util.py
M lib/tool_shed/util/metadata_util.py
M lib/tool_shed/util/readme_util.py
M lib/tool_shed/util/repository_util.py
M lib/tool_shed/util/review_util.py
M lib/tool_shed/util/search_util.py
M lib/tool_shed/util/shed_util_common.py
M lib/tool_shed/util/tool_dependency_util.py
M lib/tool_shed/util/xml_util.py
M lib/tool_shed/utility_containers/__init__.py
M lib/tool_shed/utility_containers/utility_container_manager.py
M manage_db.sh
M manage_tools.sh
M requirements.txt
M run.sh
R run_functional_tests.sh
M run_reports.sh
M run_tests.sh
M run_tool_shed.sh
M scripts/api/common.py
A scripts/api/library_upload_dir.py
A scripts/binary_compatibility.py
M scripts/bootstrap_history.py
A scripts/bootstrap_history_announce_template.rst
M scripts/check_eggs.py
M scripts/check_galaxy.py
M scripts/cleanup_datasets/admin_cleanup_datasets.py
M scripts/cleanup_datasets/cleanup_datasets.py
M scripts/cleanup_datasets/pgcleanup.py
M scripts/common_startup.sh
M scripts/data_libraries/build_lucene_index.py
M scripts/data_libraries/build_whoosh_index.py
M scripts/db_shell.py
R scripts/dist-scramble.py
M scripts/drmaa_external_killer.py
M scripts/drmaa_external_runner.py
R scripts/egg_packager_template.py
M scripts/fetch_eggs.py
M scripts/functional_tests.py
A scripts/galaxy-main
R scripts/make_egg_packager.py
M scripts/manage_db.py
M scripts/manage_tools.py
M scripts/nosetests.py
M scripts/others/incorrect_gops_jobs.py
M scripts/others/incorrect_gops_join_jobs.py
M scripts/paster.py
R scripts/scramble.py
R scripts/scramble/lib/scramble_lib.py
R scripts/scramble/patches/Cheetah/SetupConfig.py
R scripts/scramble/patches/MySQL_python/site.cfg
R scripts/scramble/patches/PasteScript/setup.py
R scripts/scramble/patches/python_daemon/setup.py
R scripts/scramble/scripts/DRMAA_python-macosx.py
R scripts/scramble/scripts/DRMAA_python-solaris.py
R scripts/scramble/scripts/DRMAA_python.py
R scripts/scramble/scripts/MySQL_python-solaris.py
R scripts/scramble/scripts/MySQL_python.py
R scripts/scramble/scripts/PyRods.py
R scripts/scramble/scripts/bx_python-solaris.py
R scripts/scramble/scripts/generic.py
R scripts/scramble/scripts/pbs_python.py
R scripts/scramble/scripts/psycopg2-linux.py
R scripts/scramble/scripts/psycopg2-macosx.py
R scripts/scramble/scripts/psycopg2-solaris.py
R scripts/scramble/scripts/psycopg2.py
R scripts/scramble/scripts/pysam-solaris.py
R scripts/scramble/scripts/pysqlite.py
M scripts/summarize_timings.py
R scripts/test_dist_egg.py
M scripts/tool_shed/build_ts_whoosh_index.py
M scripts/tool_shed/migrate_tools_to_repositories.py
M scripts/tools/maf/check_loc_file.py
M scripts/transfer.py
M scripts/update_shed_config_path.py
M set_metadata.sh
M static/maps/galaxy-app-base.js.map
M static/maps/galaxy.library.js.map
M static/maps/galaxy.masthead.js.map
M static/maps/galaxy.menu.js.map
M static/maps/galaxy.panels.js.map
M static/maps/libs/jquery/jquery.dynatree.js.map
M static/maps/libs/jquery/select2.js.map
A static/maps/mvc/app/app-analysis.js.map
A static/maps/mvc/app/app-login.js.map
A static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-li-edit.js.map
M static/maps/mvc/collection/collection-li.js.map
M static/maps/mvc/collection/collection-model.js.map
M static/maps/mvc/collection/collection-panel.js.map
M static/maps/mvc/collection/list-collection-creator.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/collection/pair-collection-creator.js.map
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/grid/grid-template.js.map
M static/maps/mvc/grid/grid-view.js.map
A static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/hda-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
M static/maps/mvc/history/history-panel-edit-current.js.map
M static/maps/mvc/history/history-panel.js.map
M static/maps/mvc/history/history-structure-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-folderlist-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-librarylist-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/maps/mvc/list/list-item.js.map
M static/maps/mvc/list/list-panel.js.map
M static/maps/mvc/tags.js.map
M static/maps/mvc/tools.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/tools/tools-form-workflow.js.map
M static/maps/mvc/tools/tools-form.js.map
M static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/ui/ui-button-check.js.map
R static/maps/mvc/ui/ui-button-menu.js.map
A static/maps/mvc/ui/ui-buttons.js.map
M static/maps/mvc/ui/ui-color-picker.js.map
M static/maps/mvc/ui/ui-misc.js.map
M static/maps/mvc/ui/ui-modal.js.map
M static/maps/mvc/ui/ui-options.js.map
M static/maps/mvc/ui/ui-popover.js.map
M static/maps/mvc/ui/ui-select-default.js.map
A static/maps/mvc/upload/composite/composite-row.js.map
A static/maps/mvc/upload/composite/composite-view.js.map
A static/maps/mvc/upload/default/default-row.js.map
A static/maps/mvc/upload/default/default-view.js.map
M static/maps/mvc/upload/upload-button.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-model.js.map
M static/maps/mvc/upload/upload-row.js.map
M static/maps/mvc/upload/upload-settings.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/user/user-quotameter.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-terminals.js.map
M static/maps/reports_webapp/run_stats.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/utils/add-logging.js.map
M static/maps/utils/deferred.js.map
M static/maps/utils/metrics-logger.js.map
M static/maps/utils/uploadbox.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/trackster/tracks.js.map
M static/scripts/galaxy-app-base.js
M static/scripts/galaxy.library.js
M static/scripts/galaxy.masthead.js
M static/scripts/galaxy.menu.js
M static/scripts/galaxy.panels.js
M static/scripts/libs/jquery/jquery.dynatree.js
M static/scripts/libs/jquery/select2.js
A static/scripts/mvc/app/app-analysis.js
A static/scripts/mvc/app/app-login.js
A static/scripts/mvc/app/app-view.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-li-edit.js
M static/scripts/mvc/collection/collection-li.js
M static/scripts/mvc/collection/collection-model.js
M static/scripts/mvc/collection/collection-panel.js
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/grid/grid-template.js
M static/scripts/mvc/grid/grid-view.js
A static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/hda-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
M static/scripts/mvc/history/history-panel-edit-current.js
M static/scripts/mvc/history/history-panel.js
M static/scripts/mvc/history/history-structure-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-li.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
M static/scripts/mvc/list/list-item.js
M static/scripts/mvc/list/list-panel.js
M static/scripts/mvc/tools.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/tools/tools-form-workflow.js
M static/scripts/mvc/tools/tools-form.js
M static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/ui/ui-button-check.js
R static/scripts/mvc/ui/ui-button-menu.js
A static/scripts/mvc/ui/ui-buttons.js
M static/scripts/mvc/ui/ui-color-picker.js
M static/scripts/mvc/ui/ui-misc.js
M static/scripts/mvc/ui/ui-modal.js
M static/scripts/mvc/ui/ui-options.js
M static/scripts/mvc/ui/ui-popover.js
M static/scripts/mvc/ui/ui-select-default.js
A static/scripts/mvc/upload/composite/composite-row.js
A static/scripts/mvc/upload/composite/composite-view.js
A static/scripts/mvc/upload/default/default-row.js
A static/scripts/mvc/upload/default/default-view.js
M static/scripts/mvc/upload/upload-button.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-model.js
M static/scripts/mvc/upload/upload-row.js
M static/scripts/mvc/upload/upload-settings.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/user/user-quotameter.js
M static/scripts/mvc/workflow/workflow-terminals.js
M static/scripts/reports_webapp/run_stats.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/utils/add-logging.js
M static/scripts/utils/deferred.js
M static/scripts/utils/metrics-logger.js
M static/scripts/utils/uploadbox.js
M static/scripts/utils/utils.js
M static/scripts/viz/trackster/tracks.js
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
R static/style/blue/dynatree_skin/cbChecked.gif
R static/style/blue/dynatree_skin/cbChecked_hover.gif
R static/style/blue/dynatree_skin/cbIntermediate.gif
R static/style/blue/dynatree_skin/cbIntermediate_hover.gif
R static/style/blue/dynatree_skin/cbUnchecked.gif
R static/style/blue/dynatree_skin/cbUnchecked_hover.gif
R static/style/blue/dynatree_skin/customDoc1.gif
R static/style/blue/dynatree_skin/customFolder1.gif
A static/style/blue/dynatree_skin/icons-rtl.gif
A static/style/blue/dynatree_skin/icons.gif
A static/style/blue/dynatree_skin/loading.gif
R static/style/blue/dynatree_skin/ltD_ne.gif
R static/style/blue/dynatree_skin/ltD_nes.gif
R static/style/blue/dynatree_skin/ltDoc.gif
R static/style/blue/dynatree_skin/ltError.gif
R static/style/blue/dynatree_skin/ltFld.gif
R static/style/blue/dynatree_skin/ltFld_o.gif
R static/style/blue/dynatree_skin/ltL_.gif
R static/style/blue/dynatree_skin/ltL_ne.gif
R static/style/blue/dynatree_skin/ltL_nes.gif
R static/style/blue/dynatree_skin/ltL_ns.gif
R static/style/blue/dynatree_skin/ltM_ne.gif
R static/style/blue/dynatree_skin/ltM_nes.gif
R static/style/blue/dynatree_skin/ltP_ne.gif
R static/style/blue/dynatree_skin/ltP_nes.gif
R static/style/blue/dynatree_skin/ltWait.gif
R static/style/blue/dynatree_skin/rbChecked.gif
R static/style/blue/dynatree_skin/rbChecked_hover.gif
R static/style/blue/dynatree_skin/rbIntermediate.gif
R static/style/blue/dynatree_skin/rbIntermediate_hover.gif
R static/style/blue/dynatree_skin/rbUnchecked.gif
R static/style/blue/dynatree_skin/rbUnchecked_hover.gif
M static/style/blue/dynatree_skin/ui.dynatree.css
A static/style/blue/dynatree_skin/vline-rtl.gif
A static/style/blue/dynatree_skin/vline.gif
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/reports.css
M static/style/blue/trackster.css
M static/welcome.html.sample
M templates/admin/reload_tool.mako
M templates/admin/requests/select_datasets_to_transfer.mako
M templates/admin/tool_shed_repository/common.mako
M templates/base.mako
M templates/base/base_panels.mako
M templates/galaxy_client_app.mako
M templates/page_base.mako
M templates/show_params.mako
M templates/spark_base.mako
M templates/user/login.mako
M templates/webapps/galaxy/admin/center.mako
M templates/webapps/galaxy/admin/index.mako
R templates/webapps/galaxy/cloud/index.mako
M templates/webapps/galaxy/data_manager/index.mako
M templates/webapps/galaxy/data_manager/view_job.mako
M templates/webapps/galaxy/galaxy.masthead.mako
A templates/webapps/galaxy/history/as_xml.mako
M templates/webapps/galaxy/history/copy.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
R templates/webapps/galaxy/root/history.mako
R templates/webapps/galaxy/root/history_as_xml.mako
M templates/webapps/galaxy/root/index.mako
R templates/webapps/galaxy/root/tool_menu.mako
A templates/webapps/galaxy/root/tool_runner.mako
R templates/webapps/galaxy/tool_executed.mako
R templates/webapps/galaxy/tool_form.mako
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/reports/job_info.mako
M templates/webapps/reports/jobs_errors_per_tool.mako
M templates/webapps/reports/jobs_per_month_all.mako
M templates/webapps/reports/jobs_per_month_in_error.mako
M templates/webapps/reports/jobs_per_tool.mako
M templates/webapps/reports/jobs_per_user.mako
M templates/webapps/reports/jobs_specified_month_all.mako
M templates/webapps/reports/jobs_specified_month_in_error.mako
M templates/webapps/reports/jobs_tool_per_month.mako
M templates/webapps/reports/jobs_user_per_month.mako
M templates/webapps/reports/registered_users.mako
M templates/webapps/reports/registered_users_per_month.mako
M templates/webapps/reports/registered_users_specified_date.mako
M templates/webapps/reports/registered_users_specified_month.mako
M templates/webapps/reports/requests_per_month_all.mako
M templates/webapps/reports/requests_per_user.mako
M templates/webapps/reports/requests_user_per_month.mako
M templates/webapps/reports/run_stats.mako
M templates/webapps/reports/system.mako
M templates/webapps/reports/users_last_access_date.mako
M templates/webapps/reports/users_user_disk_usage.mako
M templates/webapps/reports/workflows_per_month_all.mako
M templates/webapps/reports/workflows_per_user.mako
M templates/webapps/reports/workflows_per_workflow.mako
M templates/webapps/reports/workflows_user_per_month.mako
M templates/webapps/tool_shed/repository/common.mako
A test-data/1.RData
A test-data/3.bam
M test/api/helpers.py
M test/api/test_dataset_collections.py
M test/api/test_jobs.py
M test/api/test_libraries.py
M test/api/test_tools.py
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
A test/api/workflows_format_2/README.txt
A test/api/workflows_format_2/__init__.py
A test/api/workflows_format_2/converter.py
A test/api/workflows_format_2/interface.py
A test/api/workflows_format_2/main.py
R test/api/yaml_to_workflow.py
M test/base/api.py
M test/base/asserts/__init__.py
M test/base/instrument.py
M test/base/interactor.py
M test/base/nose_util.py
M test/base/test_data.py
M test/base/test_db_util.py
A test/base/test_logging.py
M test/base/tool_shed_util.py
M test/base/twilltestcase.py
M test/casperjs/anon-history-tests.js
M test/casperjs/api-hda-tests.js
M test/casperjs/api-history-tests.js
M test/casperjs/casperjs_runner.py
M test/casperjs/hda-state-tests.js
M test/casperjs/history-panel-tests.js
M test/casperjs/modules/historypanel.js
M test/casperjs/server_env.py
M test/docker/README.md
M test/docker/base/Dockerfile
M test/docker/base/ansible_vars.yml
M test/docker/base/provision.yml
M test/docker/base/run_test_wrapper.sh
M test/docker/base/start_mysql.sh
M test/functional/test_metadata_editing.py
A test/functional/tools/cheetah_problem_syntax_error.xml
A test/functional/tools/cheetah_problem_unbound_var.xml
A test/functional/tools/cheetah_problem_unbound_var_input.xml
R test/functional/tools/compare_bam_as_sam.xml
M test/functional/tools/disambiguate_cond.xml
A test/functional/tools/maxseconds.xml
M test/functional/tools/metadata_bam.xml
M test/functional/tools/min_repeat.xml
M test/functional/tools/multi_data_param.xml
M test/functional/tools/multi_output_configured.xml
M test/functional/tools/output_format.xml
A test/functional/tools/output_format_collection.xml
M test/functional/tools/samples_tool_conf.xml
M test/functional/tools/simple_constructs.yml
A test/functional/tools/unicode_stream.xml
M test/functional/tools/validation_repeat.xml
M test/install_and_test_tool_shed_repositories/base/test_db_util.py
M test/install_and_test_tool_shed_repositories/base/twilltestcase.py
M test/install_and_test_tool_shed_repositories/base/util.py
M test/install_and_test_tool_shed_repositories/functional/test_install_repositories.py
M test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
M test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
M test/manual/workflows_scaling.py
M test/qunit/README.txt
M test/qunit/package.json
A test/qunit/test-app.js
M test/qunit/test-common.js
A test/qunit/test-data/bootstrapped.js
A test/qunit/test-data/fakeserver.js
M test/qunit/tests/galaxy-app-base.js
A test/qunit/tests/upload_dialog_tests.html
A test/qunit/tests/upload_dialog_tests.js
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/base/test_db_util.py
M test/tool_shed/base/twilltestcase.py
M test/tool_shed/functional/test_0000_basic_repository_features.py
M test/tool_shed/functional/test_0010_repository_with_tool_dependencies.py
M test/tool_shed/functional/test_0020_basic_repository_dependencies.py
M test/tool_shed/functional/test_0030_repository_dependency_revisions.py
M test/tool_shed/functional/test_0040_repository_circular_dependencies.py
M test/tool_shed/functional/test_0050_circular_dependencies_4_levels.py
M test/tool_shed/functional/test_0060_workflows.py
M test/tool_shed/functional/test_0070_invalid_tool.py
M test/tool_shed/functional/test_0080_advanced_circular_dependencies.py
M test/tool_shed/functional/test_0090_tool_search.py
M test/tool_shed/functional/test_0100_complex_repository_dependencies.py
M test/tool_shed/functional/test_0110_invalid_simple_repository_dependencies.py
M test/tool_shed/functional/test_0120_simple_repository_dependency_multiple_owners.py
M test/tool_shed/functional/test_0130_datatype_converters.py
M test/tool_shed/functional/test_0140_tool_help_images.py
M test/tool_shed/functional/test_0150_prior_installation_required.py
M test/tool_shed/functional/test_0160_circular_prior_installation_required.py
M test/tool_shed/functional/test_0170_complex_prior_installation_required.py
M test/tool_shed/functional/test_0300_reset_all_metadata.py
M test/tool_shed/functional/test_0310_hg_push_from_api.py
M test/tool_shed/functional/test_0400_repository_component_reviews.py
M test/tool_shed/functional/test_0410_repository_component_review_access_control.py
M test/tool_shed/functional/test_0420_citable_urls_for_repositories.py
M test/tool_shed/functional/test_0430_browse_utilities.py
M test/tool_shed/functional/test_0440_deleting_dependency_definitions.py
M test/tool_shed/functional/test_0450_skip_tool_tests.py
M test/tool_shed/functional/test_0460_upload_to_repository.py
M test/tool_shed/functional/test_0470_tool_dependency_repository_type.py
M test/tool_shed/functional/test_0480_tool_dependency_xml_verification.py
M test/tool_shed/functional/test_0490_export_import_repositories.py
M test/tool_shed/functional/test_0500_export_repository_simple_dependency.py
M test/tool_shed/functional/test_0510_export_import_repository_complex_dependencies.py
M test/tool_shed/functional/test_0520_import_export_circular_dependencies.py
M test/tool_shed/functional/test_0530_repository_admin_feature.py
M test/tool_shed/functional/test_1000_install_basic_repository.py
M test/tool_shed/functional/test_1010_install_repository_with_tool_dependencies.py
M test/tool_shed/functional/test_1020_install_repository_with_repository_dependencies.py
M test/tool_shed/functional/test_1030_install_repository_with_dependency_revisions.py
M test/tool_shed/functional/test_1040_install_repository_basic_circular_dependencies.py
M test/tool_shed/functional/test_1050_circular_dependencies_4_levels.py
M test/tool_shed/functional/test_1060_install_repository_with_workflow.py
M test/tool_shed/functional/test_1070_invalid_tool.py
M test/tool_shed/functional/test_1080_advanced_circular_dependency_installation.py
M test/tool_shed/functional/test_1085_repository_dependency_handling.py
M test/tool_shed/functional/test_1087_install_updated_repository_dependencies.py
M test/tool_shed/functional/test_1090_install_tool_from_tool_search.py
M test/tool_shed/functional/test_1100_install_repository_with_complex_dependencies.py
M test/tool_shed/functional/test_1110_install_repository_with_invalid_repository_dependency.py
M test/tool_shed/functional/test_1120_simple_repository_dependency_multiple_owners.py
M test/tool_shed/functional/test_1130_datatype_converters.py
M test/tool_shed/functional/test_1140_tool_help_images.py
M test/tool_shed/functional/test_1150_prior_installation_required.py
M test/tool_shed/functional/test_1160_circular_prior_installation_required.py
M test/tool_shed/functional/test_1170_complex_prior_installation_required.py
M test/tool_shed/functional/test_1200_uninstall_and_reinstall_basic_repository.py
M test/tool_shed/functional/test_1210_uninstall_reinstall_repository_with_tool_dependencies.py
M test/tool_shed/functional/test_1220_uninstall_reinstall_repository_with_repository_dependencies.py
M test/tool_shed/functional/test_1230_uninstall_reinstall_repository_with_dependency_revisions.py
M test/tool_shed/functional/test_1300_reset_all_metadata.py
M test/tool_shed/functional/test_1400_review_migration_stages.py
M test/tool_shed/functional/test_1410_update_manager.py
M test/tool_shed/functional/test_1420_tool_dependency_environment_inheritance.py
M test/tool_shed/functional/test_1430_repair_installed_repository.py
M test/tool_shed/functional/test_1440_missing_env_sh_files.py
M test/tool_shed/functional/test_1450_installing_datatypes_sniffers.py
M test/tool_shed/functional/test_1460_data_managers.py
M test/tool_shed/functional/test_1470_updating_installed_repositories.py
M test/tool_shed/functional_tests.py
M test/tool_shed/test_data/proteomics_datatypes/proteomics_datatypes.tar
M test/unit/jobs/test_job_configuration.py
M test/unit/jobs/test_job_output_checker.py
M test/unit/jobs/test_runner_local.py
M test/unit/managers/base.py
M test/unit/managers/test_DatasetManager.py
M test/unit/managers/test_HDAManager.py
M test/unit/managers/test_HistoryManager.py
M test/unit/managers/test_UserManager.py
M test/unit/test_galaxy_mapping.py
M test/unit/test_objectstore.py
M test/unit/tools/test_actions.py
M test/unit/tools/test_execution.py
M test/unit/tools/test_parsing.py
M test/unit/tools/test_tool_loader.py
M test/unit/tools/test_toolbox_filters.py
M test/unit/unittest_utils/utility.py
M test/unit/workflows/test_modules.py
R tool-data/fastx_clipper_sequences.txt
R tool-data/shared/ucsc/manual_builds.txt
A tool-data/shared/ucsc/manual_builds.txt.sample
M tools/data_source/biomart.xml
M tools/data_source/biomart_test.xml
M tools/data_source/data_source.py
R tools/data_source/echo.py
R tools/data_source/echo.xml
R tools/data_source/ucsc_archaea.xml
R tools/data_source/ucsc_filter.py
R tools/data_source/ucsc_proxy.py
R tools/data_source/ucsc_proxy.xml
M tools/data_source/ucsc_tablebrowser.xml
M tools/data_source/ucsc_tablebrowser_archaea.xml
M tools/data_source/ucsc_tablebrowser_test.xml
R tools/data_source/ucsc_testproxy.xml
M tools/data_source/upload.py
M tools/evolution/add_scores.py
M tools/extract/extract_genomic_dna.py
M tools/extract/liftOver_wrapper.py
M tools/extract/liftOver_wrapper.xml
M tools/filters/axt_to_concat_fasta.py
M tools/filters/axt_to_fasta.py
M tools/filters/axt_to_lav.py
M tools/filters/catWrapper.py
M tools/filters/cutWrapper.xml
M tools/filters/gff/extract_GFF_Features.py
M tools/filters/gff/gff_filter_by_attribute.py
M tools/filters/gff/gff_filter_by_attribute.xml
M tools/filters/gff/gff_filter_by_feature_count.py
M tools/filters/gff/sort_gtf.py
M tools/filters/gff_to_bed_converter.py
M tools/filters/lav_to_bed.py
M tools/filters/secure_hash_message_digest.py
M tools/filters/wig_to_bigwig.xml
M tools/filters/wiggle_to_simple.py
M tools/genomespace/genomespace_exporter.py
M tools/genomespace/genomespace_exporter.xml
M tools/genomespace/genomespace_file_browser.py
M tools/genomespace/genomespace_file_browser_dev.xml
M tools/genomespace/genomespace_file_browser_prod.xml
M tools/genomespace/genomespace_file_browser_test.xml
M tools/genomespace/genomespace_importer.py
M tools/genomespace/genomespace_importer.xml
M tools/maf/interval2maf.py
M tools/maf/interval2maf.xml
M tools/maf/interval_maf_to_merged_fasta.py
M tools/maf/maf_by_block_number.py
M tools/maf/maf_filter.py
M tools/maf/maf_limit_size.py
M tools/maf/maf_limit_to_species.py
M tools/maf/maf_reverse_complement.py
M tools/maf/maf_split_by_species.py
M tools/maf/maf_stats.py
M tools/maf/maf_thread_for_species.py
M tools/maf/maf_to_bed.py
M tools/maf/maf_to_bed_code.py
M tools/maf/maf_to_fasta_concat.py
M tools/maf/maf_to_fasta_multiple_sets.py
M tools/maf/maf_to_interval.py
M tools/maf/vcf_to_maf_customtrack.py
M tools/next_gen_conversion/fastq_conversions.py
M tools/next_gen_conversion/fastq_gen_conv.py
M tools/next_gen_conversion/solid2fastq.py
M tools/next_gen_conversion/solid_to_fastq.py
M tools/ngs_simulation/ngs_simulation.py
M tools/sr_mapping/bfast_wrapper.xml
M tools/sr_mapping/fastq_statistics.xml
M tools/sr_mapping/mosaik.xml
M tools/sr_mapping/srma_wrapper.xml
M tools/stats/aggregate_scores_in_intervals.py
M tools/stats/filtering.py
M tools/stats/grouping.py
M tools/stats/gsummary.py
M tools/visualization/LAJ.xml
M tox.ini
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into async_metadata_reset
Commit: 0c75af7192b7f34260098a21ff30d98492ba738e
https://github.com/galaxyproject/galaxy/commit/0c75af7192b7f34260098a21ff30…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/app/app-analysis.js
M config/plugins/visualizations/charts/templates/charts.mako
M static/maps/mvc/app/app-analysis.js.map
M static/scripts/mvc/app/app-analysis.js
Log Message:
-----------
Merge pull request #1157 from guerler/revise_iframe_unload_001
Call onbeforeunload before hiding iframe through display()
Commit: 62474100f8f075ce519d008336060dfa952da725
https://github.com/galaxyproject/galaxy/commit/62474100f8f075ce519d00833606…
Author: Bjoern Gruening <bjoern.gruening(a)gmail.com>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M config/plugins/interactive_environments/common/templates/ie.mako
Log Message:
-----------
add onbeforeunload to IE
Commit: 1931bd59077f97946a1af6daa93bc920fceee58e
https://github.com/galaxyproject/galaxy/commit/1931bd59077f97946a1af6daa93b…
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M lib/galaxy/model/mapping.py
Log Message:
-----------
lazy load metadata to speed up history loading
Commit: 2a54ff08292d85b3ecdab79e307b4b5d0aba4cc3
https://github.com/galaxyproject/galaxy/commit/2a54ff08292d85b3ecdab79e307b…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M scripts/functional_tests.py
Log Message:
-----------
Merge pull request #1176 from jmchilton/auto_migrate
Do not check for tool migrations when running tests.
Commit: 7d4f0d82de328ffb763737c067fc9332b61534e9
https://github.com/galaxyproject/galaxy/commit/7d4f0d82de328ffb763737c067fc…
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M lib/galaxy/model/mapping.py
Log Message:
-----------
fix indentation
Commit: f4dab5523b687c079df68d4d2988dc830429bd93
https://github.com/galaxyproject/galaxy/commit/f4dab5523b687c079df68d4d2988…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M config/plugins/interactive_environments/common/templates/ie.mako
Log Message:
-----------
Merge pull request #1178 from bgruening/obbeforechange_ie
Prevent GIEs from being closed without user confirmation
Commit: 2be9aa2569b35a86f4c593215189a07eb5dd62f0
https://github.com/galaxyproject/galaxy/commit/2be9aa2569b35a86f4c593215189…
Author: y.hoogstrate(a)erasmusmc.nl <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
cram datatype: support for crai indexes via pysam
Commit: 2568e85e7b84a8d9c7039f4c4b44661b9930a55e
https://github.com/galaxyproject/galaxy/commit/2568e85e7b84a8d9c7039f4c4b44…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
A config/reports.ini.sample
R config/reports_wsgi.ini.sample
Log Message:
-----------
Renames reports_wsgi.ini
Commit: a3668355961e3988158a8bdb1bbe0f898d475967
https://github.com/galaxyproject/galaxy/commit/a3668355961e3988158a8bdb1bbe…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M run_reports.sh
Log Message:
-----------
Changed reports_wsgi.ini to reports.ini
Commit: 9fceddf8a2f62df2774f269755398ce7d9f203b3
https://github.com/galaxyproject/galaxy/commit/9fceddf8a2f62df2774f26975539…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M scripts/sync_reports_config.py
Log Message:
-----------
Changed reports_wsgi.ini to reports.ini
Commit: ca3e3760ccd92e3162a5740e713a7b3daf4c4e03
https://github.com/galaxyproject/galaxy/commit/ca3e3760ccd92e3162a5740e713a…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M .gitignore
Log Message:
-----------
Changed reports_wsgi.ini to reports.ini
Commit: d7eb84e57bbd119d788ca759e0d61a464a030c7a
https://github.com/galaxyproject/galaxy/commit/d7eb84e57bbd119d788ca759e0d6…
Author: youri <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-11-27 (Fri, 27 Nov 2015)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
cram datatype: support for crai index (using built-in pysam)
Commit: 2e97553194a0e13dc4158c29a161c0b678bcd02e
https://github.com/galaxyproject/galaxy/commit/2e97553194a0e13dc4158c29a161…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M client/galaxy/scripts/galaxy.frame.js
M client/galaxy/scripts/galaxy.masthead.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/ui/ui-buttons.js
M static/maps/galaxy.frame.js.map
M static/maps/galaxy.masthead.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-buttons.js.map
M static/scripts/galaxy.frame.js
M static/scripts/galaxy.masthead.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-buttons.js
Log Message:
-----------
Filter download links
Commit: 7b85684683b3a6ee07ec024f943bada03f51195b
https://github.com/galaxyproject/galaxy/commit/7b85684683b3a6ee07ec024f943b…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M run_reports.sh
Log Message:
-----------
Updated run_reports.sh
Updated run_reports.sh to reflect new changes.
Commit: 1b06e8d674edd7f1a1f9397429b319670891a8bd
https://github.com/galaxyproject/galaxy/commit/1b06e8d674edd7f1a1f9397429b3…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M templates/webapps/galaxy/galaxy.panels.mako
Log Message:
-----------
Merge pull request #1126 from jgoecks/farbtastic-fix
Readd jquery.migrate to galaxy.panels template because it is needed f…
Commit: 8971badb10aa216fab3ce7318ec28389e0ea79b9
https://github.com/galaxyproject/galaxy/commit/8971badb10aa216fab3ce7318ec2…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M .gitignore
Log Message:
-----------
Updated gitignore
Commit: 9e353028d5ad5ef6a0ba7889f5f5e8b975261811
https://github.com/galaxyproject/galaxy/commit/9e353028d5ad5ef6a0ba7889f5f5…
Author: Sourav Singh <souravsingh(a)users.noreply.github.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M run_reports.sh
Log Message:
-----------
Updated run_reports.sh
Updated run_reports.sh to mark the latest changes.
Commit: dc41856812f9064c518a8e45c4559b2f32fe9db2
https://github.com/galaxyproject/galaxy/commit/dc41856812f9064c518a8e45c455…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
Log Message:
-----------
Merge pull request #1173 from jmchilton/wfcfix
Fixes for WorkflowContentsManager requiring app during init.
Commit: c2f93316112ce90d0f1f7fe947ce1881cae3c773
https://github.com/galaxyproject/galaxy/commit/c2f93316112ce90d0f1f7fe947ce…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Merge pull request #1174 from jmchilton/workflow_runtime_fix
Fix interface and usage of WorkflowModule.get_runtime_inputs.
Commit: 2829cab105c202a49904d65d88a9ac37dc12d81e
https://github.com/galaxyproject/galaxy/commit/2829cab105c202a49904d65d88a9…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Add enhancements to the Galaxy repository install process
to cleanly handle the case described here:
https://github.com/galaxyproject/galaxy/issues/667. Specifically, the
following scenario is now cleanly handled:
Example use case: In a toolshed I have a repository of a tool, say
package_new_gene_db_1_2_3, and in revision 1 it depends on
package_sqlite_1_0_0:
package_new_gene_db_1_2_3
package_sqlite_1_0_0
At some point in time I discover that postgres is a better solution for
my gene database, and I upload revision 2:
package_new_gene_db_1_2_3
package_postgres__2_0_0
And I remove the dependecy of sqlite. If I go to my galaxy instance and
I remove revision 1 and install revision 2, the installation is cleanly
handled with theis PR.
It should be noted that this enhancement could adversely impact
reproducibility if best practices are not followed with regard to
defining package dependencies. Since it is now cleanly possible to
eliminate dependencies over time, best practices must be followed to
ensure that elimination of a dependency does not affect the output of a
tool that uses the underlying hierarchy of packages.
Commit: f35bd9ae02aaa814d9ab62838146be2ba4791f2b
https://github.com/galaxyproject/galaxy/commit/f35bd9ae02aaa814d9ab62838146…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M .gitignore
A config/reports.ini.sample
R config/reports_wsgi.ini.sample
M run_reports.sh
M scripts/sync_reports_config.py
Log Message:
-----------
Merge pull request #1181 from souravsingh/rename_file
Renames reports_wsgi.ini
Commit: 492fcdab9fa1cdc1465c191289077e103d8d8020
https://github.com/galaxyproject/galaxy/commit/492fcdab9fa1cdc1465c19128907…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Merge pull request #1193 from mvdbeek/gvk_ts_fixes
Add enhancements to the Galaxy repository install process
Commit: 9e28f2e786bcb2bc727f7dba571742f9d2773165
https://github.com/galaxyproject/galaxy/commit/9e28f2e786bcb2bc727f7dba5717…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/interval.py
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
Log Message:
-----------
Merge branch 'release_15.10' into dev
Commit: 78558beec3ebeca63a282e667948a18c2b21c508
https://github.com/galaxyproject/galaxy/commit/78558beec3ebeca63a282e667948…
Author: y.hoogstrate(a)erasmusmc.nl <y.hoogstrate(a)erasmusmc.nl>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/binary.py
Log Message:
-----------
cram datatype definition: flake8 correction
Commit: 28715a5bca299933c69859559d5b88b381b6c998
https://github.com/galaxyproject/galaxy/commit/28715a5bca299933c69859559d5b…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M client/galaxy/style/less/ui.less
M lib/galaxy/tools/__init__.py
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/style/blue/base.css
Log Message:
-----------
Add runtime modification switch
Commit: 3524476bc6c75461fd8b793a3bf047d1ad475e2a
https://github.com/galaxyproject/galaxy/commit/3524476bc6c75461fd8b793a3bf0…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M doc/source/releases/15.10_announce.rst
Log Message:
-----------
Merge branch 'master' into dev
Commit: 84464288b18ca587334dba89c9fd011c7f3a0fc6
https://github.com/galaxyproject/galaxy/commit/84464288b18ca587334dba89c9fd…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M client/galaxy/scripts/galaxy.frame.js
M client/galaxy/scripts/galaxy.masthead.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M client/galaxy/scripts/mvc/ui/ui-buttons.js
M static/maps/galaxy.frame.js.map
M static/maps/galaxy.masthead.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-buttons.js.map
M static/scripts/galaxy.frame.js
M static/scripts/galaxy.masthead.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-buttons.js
Log Message:
-----------
Merge pull request #1184 from guerler/fix_download_links_002
Filter download links, avoid warning dialog
Commit: bb23701fa80c74a6621b1826b050d9e42c12455f
https://github.com/galaxyproject/galaxy/commit/bb23701fa80c74a6621b1826b050…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
White space in BIOM1 datatype.
Commit: 64506bbd43e21b299a8b42ee3cfd2ef8e40c06d2
https://github.com/galaxyproject/galaxy/commit/64506bbd43e21b299a8b42ee3cfd…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Prevent unneccessary extra read in BIOM1 sniffer.
Commit: ff619df3946621b819df03909fc63ce9ee412ced
https://github.com/galaxyproject/galaxy/commit/ff619df3946621b819df03909fc6…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
M lib/tool_shed/util/hg_util.py
Log Message:
-----------
Downgrade Mercurial wheel to 3.4.2 to restore hg push of Tool Shed repositories. Fix #1183.
Commit: 657afa89d3ac91e53a84ae132334f137eb07acdc
https://github.com/galaxyproject/galaxy/commit/657afa89d3ac91e53a84ae132334…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/tool_shed/util/common_util.py
Log Message:
-----------
Small fixes.
Commit: 194d871e38b3815bba120d6bb40c3eef45660738
https://github.com/galaxyproject/galaxy/commit/194d871e38b3815bba120d6bb40c…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/tool_shed/util/hg_util.py
Log Message:
-----------
Fix Tool Shed export capsule for Mercurial >= 3.4 .
Fix the following error:
tool_shed.capsule.capsule_manager ERROR 2015-12-01 12:24:37,542 unable to find mercurial command "archive"
Traceback (most recent call last):
File "/opt/galaxy/lib/tool_shed/capsule/capsule_manager.py", line 88, in export_repository
work_dir )
File "/opt/galaxy/lib/tool_shed/capsule/capsule_manager.py", line 148, in generate_repository_archive
changeset_revision )
File "/opt/galaxy/lib/tool_shed/util/hg_util.py", line 28, in archive_repository_revision
options_dict = get_mercurial_default_options_dict( 'archive' )
File "/opt/galaxy/lib/tool_shed/util/hg_util.py", line 200, in get_mercurial_default_options_dict
raise Exception('unable to find mercurial command "%s"' % command)
Exception: unable to find mercurial command "archive"
Commit: b5c77a8e8c0255f61ca62a7ff2311d443e224bec
https://github.com/galaxyproject/galaxy/commit/b5c77a8e8c0255f61ca62a7ff231…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Add metadata for BIOM1 datatype. I am not yet sure that we should store table_rows and table_columns, as these could grow quite large, but could be useful in tools.
Commit: f41540f6137a2f63a6dcb27327e33bf73752f954
https://github.com/galaxyproject/galaxy/commit/f41540f6137a2f63a6dcb27327e3…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Most of these should probably not be user visible.
Commit: b20fb71e33c1779e42dd67bb68aa9b31b69ffca2
https://github.com/galaxyproject/galaxy/commit/b20fb71e33c1779e42dd67bb68aa…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Fix extraneous white space.
Commit: f64d1597b84801dd48c2cdb5bc0c303355786942
https://github.com/galaxyproject/galaxy/commit/f64d1597b84801dd48c2cdb5bc0c…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Extension point for environment variables.
Commit: ea9f4a0467b6955ccc470da06eaf7c13e7643715
https://github.com/galaxyproject/galaxy/commit/ea9f4a0467b6955ccc470da06eaf…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Initialize a ToolOutput.from_work_dir.
Commit: 7ce43a0463c3d98b757d78d0600aadf5d7876eb9
https://github.com/galaxyproject/galaxy/commit/7ce43a0463c3d98b757d78d0600a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/workflow/run_request.py
Log Message:
-----------
Refactor run_request for downstream diff improvements.
Commit: 77ed5681f8565b12ab1d5e5c7d0302c938e9c73d
https://github.com/galaxyproject/galaxy/commit/77ed5681f8565b12ab1d5e5c7d03…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/api/test_workflows.py
Log Message:
-----------
Extend base api workflow _run_jobs helper...
... to allow loading content from test-data files.
Commit: 42778e27539d919ff11d67a07368c0b6e4ebae75
https://github.com/galaxyproject/galaxy/commit/42778e27539d919ff11d67a07368…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/workflow/run.py
Log Message:
-----------
Improved error handling in workflow run code.
Commit: 2f31a3cbcd087f26caa9b8754920a6dddb924b30
https://github.com/galaxyproject/galaxy/commit/2f31a3cbcd087f26caa9b8754920…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/tool/tool-form-workflow.js
Log Message:
-----------
Cleanup collapsible handling
Commit: 3017c61f380c8caa722ff04d11e2e3d37ca56b1c
https://github.com/galaxyproject/galaxy/commit/3017c61f380c8caa722ff04d11e2…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Fix step order
Commit: 98e738d6f0cb2faae1c304a889baaa66b10df953
https://github.com/galaxyproject/galaxy/commit/98e738d6f0cb2faae1c304a889ba…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Show pja info inside form portlet
Improve readability
Commit: 28501ab676f9df797bae316c3d24e9ae8fd58a9b
https://github.com/galaxyproject/galaxy/commit/28501ab676f9df797bae316c3d24…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M test/unit/test_galaxy_mapping.py
Log Message:
-----------
Refactor workflow manager for extension.
Commit: 4584a579a297ffd02bd77584b71a8c17d85d261a
https://github.com/galaxyproject/galaxy/commit/4584a579a297ffd02bd77584b71a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Fix interface declaration for WorkflowModule.get_state.
Implementers all take this attribute.
Commit: 21213ef70f535e06bc485370686807a6d2850345
https://github.com/galaxyproject/galaxy/commit/21213ef70f535e06bc4853706868…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/unit/workflows/test_render.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Refactor workflow testing code to quickly bootstrap workflows.
Commit: 031a39aba83932fd0291f440a7e58c962deadfe8
https://github.com/galaxyproject/galaxy/commit/031a39aba83932fd0291f440a7e5…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
A test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Basic unit tests for workflow progress tracking.
Commit: 8a01b42112ec32e5f978f3a4245127cad3219c45
https://github.com/galaxyproject/galaxy/commit/8a01b42112ec32e5f978f3a42451…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Refactor input_by_connections_name logic into model.
Continue to delay calculation of this but auto-compute it if requested and module injection code hasn't been called explicitly. Moves logic internal to class where it belongs also.
Commit: cf367ff0c75454837359b74046c05cc7cb456dc5
https://github.com/galaxyproject/galaxy/commit/cf367ff0c75454837359b74046c0…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Add another workflow progress test case.
This one for replacing a tool input with an input dataset.
Commit: 7974c1f33486c0a66803004c5d7885a9d91b9c70
https://github.com/galaxyproject/galaxy/commit/7974c1f33486c0a66803004c5d78…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Add unit tests for workflow progress initialization.
Commit: 07c3d10f31e48f783baf05c133b117e7f3e7ee1a
https://github.com/galaxyproject/galaxy/commit/07c3d10f31e48f783baf05c133b1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Extend workflow recovery progress test case to include replacement check.
Commit: 48340b5829fb5ca346060d9372ba7df7e3effcef
https://github.com/galaxyproject/galaxy/commit/48340b5829fb5ca346060d9372ba…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Add TODO items to workflow progress unit tests.
Commit: 67c98f54cad4f20413568417e2cbb97bee24b0e5
https://github.com/galaxyproject/galaxy/commit/67c98f54cad4f20413568417e2cb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/hg_util.py
Log Message:
-----------
Merge pull request #1200 from nsoranzo/tool_shed_fixes
Tool shed fixes.
Commit: ffb3de9ede515d10fbdf06519140a726e0cfa7d1
https://github.com/galaxyproject/galaxy/commit/ffb3de9ede515d10fbdf06519140…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/parser/xml.py
A test/functional/tools/collection_type_source.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Merge pull request #1153 from jmchilton/collection_type_source
Implement type_source on output collections.
Commit: aa90e346dd4e10850482e38c7331864bef50f007
https://github.com/galaxyproject/galaxy/commit/aa90e346dd4e10850482e38c7331…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/tool/tool-form-base.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M client/galaxy/scripts/mvc/tool/tool-form.js
M lib/galaxy/tools/parameters/basic.py
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/tool/tool-form-base.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/maps/mvc/tool/tool-form.js.map
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/tool/tool-form-base.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/scripts/mvc/tool/tool-form-workflow.js
M static/scripts/mvc/tool/tool-form.js
Log Message:
-----------
Revise form base
Fix style
Commit: 2c6c5236323dbea196cfd2e8fe3915f0c7e4c6df
https://github.com/galaxyproject/galaxy/commit/2c6c5236323dbea196cfd2e8fe39…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Only store ids for row and column in BIOM1 datatype.
Commit: 3acfa9c786e1fa5567cf313b294b68ab4c508c1b
https://github.com/galaxyproject/galaxy/commit/3acfa9c786e1fa5567cf313b294b…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Add blank lines around internal function.
Commit: 002bc6b40a4314fc5f35f6156a73cad91532484d
https://github.com/galaxyproject/galaxy/commit/002bc6b40a4314fc5f35f6156a73…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M .gitignore
M client/GruntFile.js
M client/galaxy/scripts/layout/masthead.js
M client/galaxy/scripts/layout/panel.js
M client/galaxy/scripts/layout/scratchbook.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/list/list-view.js
M client/galaxy/scripts/mvc/tool/tools-form-base.js
M client/galaxy/scripts/mvc/ui/ui-buttons.js
M client/grunt-tasks/style.js
M client/package.json
M config/datatypes_conf.xml.sample
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/visualizations/charts/templates/charts.mako
A config/reports.ini.sample
R config/reports_wsgi.ini.sample
M config/tool_shed.ini.sample
A doc/source/releases/15.10.rst
M doc/source/releases/15.10_announce.rst
A doc/source/releases/16.01_announce.rst
M lib/galaxy/datatypes/interval.py
M lib/galaxy/dependencies/requirements.txt
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/galaxy/workflow/extract.py
M lib/galaxy/workflow/modules.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/hg_util.py
M lib/tool_shed/util/shed_util_common.py
M run_reports.sh
M scripts/bootstrap_history.py
M scripts/functional_tests.py
M scripts/sync_reports_config.py
M static/maps/layout/masthead.js.map
M static/maps/layout/panel.js.map
M static/maps/layout/scratchbook.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
A static/maps/mvc/list/list-panel.js.map
M static/maps/mvc/list/list-view.js.map
M static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-buttons.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/masthead.js
M static/scripts/layout/panel.js
M static/scripts/layout/scratchbook.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/list/list-view.js
M static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-buttons.js
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
M templates/webapps/galaxy/root/index.mako
M templates/webapps/galaxy/workflow/run.mako
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
A test/api/workflows_format_2/README.txt
A test/api/workflows_format_2/__init__.py
A test/api/workflows_format_2/converter.py
A test/api/workflows_format_2/interface.py
A test/api/workflows_format_2/main.py
R test/api/yaml_to_workflow.py
A test/functional/tools/collection_type_source.xml
A test/functional/tools/output_format_collection.xml
M test/functional/tools/samples_tool_conf.xml
M test/functional/tools/simple_constructs.yml
M test/qunit/package.json
M test/unit/tools/test_actions.py
M test/unit/tools/test_parsing.py
Log Message:
-----------
(merge dev)
Commit: cfdbf8c0e71c5cdfa0ae47f6da7cc4553efd8429
https://github.com/galaxyproject/galaxy/commit/cfdbf8c0e71c5cdfa0ae47f6da7c…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M test/qunit/test-app.js
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
Log Message:
-----------
Testing, webpack: correct name of Galaxy module in qunit, properly call require, pass GalaxyApp data
Commit: 963d8637e869a214ee0e2c352a8184feb980a40e
https://github.com/galaxyproject/galaxy/commit/963d8637e869a214ee0e2c352a81…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
R client/galaxy/scripts/galaxy.tools.js
R static/maps/galaxy.tools.js.map
R static/maps/galaxy.workflows.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
R static/scripts/galaxy.tools.js
R static/scripts/galaxy.workflows.js
Log Message:
-----------
Webpack: remove cruft galaxy.tools.js and (remnants of) galaxy.workflows.js
Commit: 97415de3ce2bda54fb0730a41b4e0c7d8e93778a
https://github.com/galaxyproject/galaxy/commit/97415de3ce2bda54fb0730a41b4e…
Author: chambm <matt.chambers42(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
A lib/galaxy/datatypes/test/test.idpDB
A lib/galaxy/datatypes/test/test.mz5
Log Message:
-----------
Move idpDB and MzSQlite formats from proteomics.py to binary.py, because the SQLite sniffer lives there, and more specialized formats must be registered for sniffing before the generic format
Add proper idpDB sniffing logic (akin to MzSQlite) and test case
Add H5 sniffing based on magic number and test case
Add SQLite/IdpDB/MzSQlite/GeminiSQLite and H5 to default datatypes in registry.py
Commit: dd5f3aec52d1cec8e2a98dc9cf7134cd9b381d84
https://github.com/galaxyproject/galaxy/commit/dd5f3aec52d1cec8e2a98dc9cf71…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M test/api/test_workflows.py
Log Message:
-----------
Fix workflow extraction test cases broken with 77ed5681f8565b12ab1d5e5c7d0302c938e9c73d
Commit: dd7bddcaa682d6d7cdaba8661c2c7cc80997ade0
https://github.com/galaxyproject/galaxy/commit/dd7bddcaa682d6d7cdaba8661c2c…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/model/__init__.py
Log Message:
-----------
Optimize initial queueing of jobs.
- Don't refresh job when this is the only thread fetching it.
- Avoid a bunch of unnecessary flushes, just flush once essentially during process.
Brings this process from taking over 1 second per job on average on sqlite for cat1 on my laptop to around 400 ms on average.
Commit: 299fbe99d7e157b9c01bbf0cdfcb7057dd59791a
https://github.com/galaxyproject/galaxy/commit/299fbe99d7e157b9c01bbf0cdfcb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Micro optimization, only fetch tool validation once per multi-run.
Commit: 876c28f88d81a8599a3278d9deac730adbac10d9
https://github.com/galaxyproject/galaxy/commit/876c28f88d81a8599a3278d9deac…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/execute.py
Log Message:
-----------
Add more job timers.
Commit: 41d3dc62f7e967ea3b409be410310563d0737bc4
https://github.com/galaxyproject/galaxy/commit/41d3dc62f7e967ea3b409be41031…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/managers/collections.py
M lib/galaxy/model/__init__.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
Log Message:
-----------
Parallelize executing tool parameter combinations.
Should work when mapping over collections or for big muli-run tool submissions.
Because of database tension with sqlalchemy it is not strictly a linear increase, but the end user walltime experience for a 24 dataset collection being submitted using 4 threads instead 1 drops execution time from 68 seconds to 35.
Rebased with fixes thanks to @nsoranzo - https://github.com/jmchilton/galaxy/commit/7f6514a21222ea787a0676764e4a4fe8….
Commit: 64b7cc9fef21caac5f9d21a8d42b60262fd28162
https://github.com/galaxyproject/galaxy/commit/64b7cc9fef21caac5f9d21a8d42b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
A test/functional/tools/create_10.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Add sample tool that creates 10 outputs.
Commit: a190b69e33a41717ddcc9eaa82826a82cc3d69b1
https://github.com/galaxyproject/galaxy/commit/a190b69e33a41717ddcc9eaa8282…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Optimize tools that produce multiple outputs.
Fetch HIDs for these datasets all at once and flush once for all assignments. Creating jobs from 4 threads each job producing 10 outputs - this resulted in reducing the runtime of this portion of the code by 90% and saving around 20 seconds per job.
Before:
galaxy.tools.actions INFO 2015-11-30 15:53:46,235 Add outputs to history (22494.829 ms)
galaxy.tools.actions INFO 2015-11-30 15:53:47,295 Add outputs to history (22239.062 ms)
galaxy.tools.actions INFO 2015-11-30 15:53:48,320 Add outputs to history (23781.079 ms)
galaxy.tools.actions INFO 2015-11-30 15:53:51,490 Add outputs to history (21820.567 ms)
galaxy.tools.actions INFO 2015-11-30 15:54:24,506 Add outputs to history (25353.837 ms)
After:
galaxy.tools.actions INFO 2015-11-30 16:08:47,640 Add outputs to history (2781.675 ms)
galaxy.tools.actions INFO 2015-11-30 16:08:47,860 Add outputs to history (3177.738 ms)
galaxy.tools.actions INFO 2015-11-30 16:08:48,776 Add outputs to history (2425.528 ms)
galaxy.tools.actions INFO 2015-11-30 16:09:02,942 Add outputs to history (2579.022 ms)
Commit: ab2c7c2c079b51ffd4ed7ef00724ef3f8d2636ec
https://github.com/galaxyproject/galaxy/commit/ab2c7c2c079b51ffd4ed7ef00724…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool execution micro optimization...
... Don't create an extra list to reverse, just iterate over in reversed order.
Commit: 3de8579633c4294abb2a3235f90463108c35d324
https://github.com/galaxyproject/galaxy/commit/3de8579633c4294abb2a3235f904…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/jobs/output_checker.py
Log Message:
-----------
Add debug statement in output checker for why job is failing.
Should help tool testing and other Galaxy testing.
Commit: 59944046b7f16d13886928eb6928a7d67446c1e6
https://github.com/galaxyproject/galaxy/commit/59944046b7f16d13886928eb6928…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Fix for workflow progress unit testing.
Commit: bed421fbc98583fdc00db57d3bb787450766576b
https://github.com/galaxyproject/galaxy/commit/bed421fbc98583fdc00db57d3bb7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
Log Message:
-----------
Introduce model abstractions for dealing with workflow steps.
Three methods to provide higher-level access and reasoning about steps than just a flat array.
Commit: da6051922e51ecc43c2f5b973adf5ba2dbf7554b
https://github.com/galaxyproject/galaxy/commit/da6051922e51ecc43c2f5b973adf…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Unroll input connection logic.
Need to extend it downstream and the one-liner is fun but not easy to extend or particularily readable.
Commit: d97d8a203c7c09123f7298627ad394d6c96e5b1c
https://github.com/galaxyproject/galaxy/commit/d97d8a203c7c09123f7298627ad3…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/workflow/run.py
Log Message:
-----------
Better error messages in workflow running code.
Commit: 4fdea55f81756a27bff8ef66b3fe27d4bda36905
https://github.com/galaxyproject/galaxy/commit/4fdea55f81756a27bff8ef66b3fe…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/constructive_solid_geometry.py
Log Message:
-----------
Enhance the VTK datatypes to support cell data in addition to point
data.
Replaces https://github.com/galaxyproject/galaxy/pull/1189.
Commit: 69b8d83ba2b829621183361694f341bda66a77fe
https://github.com/galaxyproject/galaxy/commit/69b8d83ba2b829621183361694f3…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/deps/resolvers/modules.py
Log Message:
-----------
* Make default_indicator configurable
* Document classes
Commit: b87c22c73b9a3f6d31507d268e945a6ae8deef60
https://github.com/galaxyproject/galaxy/commit/b87c22c73b9a3f6d31507d268e94…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
A config/dependency_resolvers_conf.xml.sample
Log Message:
-----------
* Add sample dependency_resolvers_conf.xml that matches actual default
Commit: a443d99fddc14b58698618860076032cb9540dca
https://github.com/galaxyproject/galaxy/commit/a443d99fddc14b58698618860076…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/graph.py
Log Message:
-----------
Undo deprecated datatypes stuff, doesn't work with Galaxy well.
Commit: 20b96d883d9ef33b51d5a32d82ce2d1251daf572
https://github.com/galaxyproject/galaxy/commit/20b96d883d9ef33b51d5a32d82ce…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M test/api/test_workflows.py
M test/unit/test_galaxy_mapping.py
M test/unit/workflows/test_render.py
A test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Merge pull request #1202 from jmchilton/workflow_tool_refactoring
Small Tool and Workflow Refactoring and Fixes
Commit: c034dc3e33a4c4aeecefcea375ea179621be1af6
https://github.com/galaxyproject/galaxy/commit/c034dc3e33a4c4aeecefcea375ea…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/jobs/output_checker.py
Log Message:
-----------
Merge pull request #1213 from jmchilton/tool_logging_2
Add debug statement in output checker for why job is failing.
Commit: 1adff983f2509e6551f9000008d614a61d9b12a6
https://github.com/galaxyproject/galaxy/commit/1adff983f2509e6551f9000008d6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M test/api/helpers.py
M test/api/test_jobs.py
Log Message:
-----------
Wait on jobs and history in certain API test cases.
This strategy proved to work around certain race conditions in tool testing so hopefully it will solve the transiently failing job searching and filtering test cases.
Commit: 362a25e6e6b03dfada43ad1b9ab651966936c795
https://github.com/galaxyproject/galaxy/commit/362a25e6e6b03dfada43ad1b9ab6…
Author: Eric Enns <eric.enns(a)phac-aspc.gc.ca>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Updated tool input collection to only add items from a collection which are being used by the tool and not the entire collection. (Thanks to @markiskander for helping me find this).
Commit: 6c9a82e142c5bf70ae4612f094b8d0c89e3fd2f3
https://github.com/galaxyproject/galaxy/commit/6c9a82e142c5bf70ae4612f094b8…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Fix for Section upgrade messages.
Commit: 2c0ad432f8485cb40719adfa8ecbbf1a342afd03
https://github.com/galaxyproject/galaxy/commit/2c0ad432f8485cb40719adfa8ecb…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Use test param label instead of param label in conditional upgrade missing message.
Commit: a3e3bde6a2b5c2fc9433336526ec32badfc8ce9d
https://github.com/galaxyproject/galaxy/commit/a3e3bde6a2b5c2fc9433336526ec…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/login.js
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
Log Message:
-----------
Webpack: restore redirect for after login when require_login; remove allowed_paths for require_login: /index, /tool_menu, /masthead, library/browse, history/list, dataset/list
Commit: 56054c6d98519541b896a5145998b02688750bb6
https://github.com/galaxyproject/galaxy/commit/56054c6d98519541b896a5145998…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/deps/resolvers/modules.py
Log Message:
-----------
* Fix AvailModuleChecker() invocation and propogate default default_indicator
Commit: 9b085740dfddfcb67f6a2e21a51503cd2ac0741e
https://github.com/galaxyproject/galaxy/commit/9b085740dfddfcb67f6a2e21a515…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M test/api/test_workflows.py
M test/unit/test_galaxy_mapping.py
M test/unit/workflows/test_render.py
A test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: 65e6a1c3b6ca26e9f0d760cb39be7ec177d6c40f
https://github.com/galaxyproject/galaxy/commit/65e6a1c3b6ca26e9f0d760cb39be…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
A lib/galaxy/datatypes/test/test.idpDB
A lib/galaxy/datatypes/test/test.mz5
Log Message:
-----------
Merge pull request #1209 from chambm/feature/idpdb_hdf5_sniffers
Add idpDB and HDF5 sniffers and fix MzSQlite sniffer
Commit: 4c13c92540c7ed4f8305dcb0216c2a448f33c24d
https://github.com/galaxyproject/galaxy/commit/4c13c92540c7ed4f8305dcb0216c…
Author: Jesse <jesse.vandam(a)wur.nl>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/graph.py
Log Message:
-----------
Merge pull request #2 from jmchilton/triples_2
Remove deprecated datatype stuff
Commit: a57095661246fab1d9045e0cabb1845f662edb5d
https://github.com/galaxyproject/galaxy/commit/a57095661246fab1d9045e0cabb1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/datatypes_conf.xml.sample
M lib/galaxy/datatypes/graph.py
A lib/galaxy/datatypes/triples.py
Log Message:
-----------
Merge pull request #396 from jessevdam/dev
Added better support for formats that store triples.
Commit: 92a7b995b05f7966e2936b62f052d3a4b8ed0642
https://github.com/galaxyproject/galaxy/commit/92a7b995b05f7966e2936b62f052…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Merge pull request #1217 from ericenns/collection-tool-input-fixes
Collection tool input mapping performance fixes
Commit: bd0663f65062d60de810478566604b3ee33b109d
https://github.com/galaxyproject/galaxy/commit/bd0663f65062d60de81047856660…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/tools/deps/resolvers/modules.py
Log Message:
-----------
* Initialise default_indicator before using __modules
Commit: b72035c9fc4136af5f3db464fd5b2a9c5e330cca
https://github.com/galaxyproject/galaxy/commit/b72035c9fc4136af5f3db464fd5b…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/layout/masthead.js
M client/galaxy/scripts/mvc/history/history-model.js
M client/galaxy/scripts/mvc/history/history-view-edit-current.js
M static/maps/layout/masthead.js.map
M static/maps/mvc/history/history-model.js.map
M static/maps/mvc/history/history-view-edit-current.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/masthead.js
M static/scripts/mvc/history/history-model.js
M static/scripts/mvc/history/history-view-edit-current.js
Log Message:
-----------
Webpack: fix/re-work the pub-sub connection between the quotameter and the history panel so that the meter updates properly when a new dataset is added
Commit: 14ac3665ee37224aa5278ce7a3876fb204b1bf2d
https://github.com/galaxyproject/galaxy/commit/14ac3665ee37224aa5278ce7a387…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/api/repositories.py
M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
Log Message:
-----------
Merge pull request #598 from davebx/async_metadata_reset
Make bulk repository metadata resets asynchronous.
Commit: ba3e3da946b699a03ef9cab9095ea294d6df3b69
https://github.com/galaxyproject/galaxy/commit/ba3e3da946b699a03ef9cab9095e…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/dependency_resolvers_conf.xml.sample
Log Message:
-----------
* Add sample config for modules resolver
Commit: 9a1fc647a38007fef2a7a179648ea8f925ab5a8f
https://github.com/galaxyproject/galaxy/commit/9a1fc647a38007fef2a7a179648e…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/managers/collections.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
A test/functional/tools/create_10.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Merge pull request #1212 from jmchilton/tool_opts_6
Smaller Tool Optimization PR
Commit: 6f727962945481b75dd675e70eed78e8b785cb0a
https://github.com/galaxyproject/galaxy/commit/6f727962945481b75dd675e70eed…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M config/dependency_resolvers_conf.xml.sample
Log Message:
-----------
* Update sample config for modules resolver
Commit: 6735c9deceadba39c0a2b34b076f37440c087fc3
https://github.com/galaxyproject/galaxy/commit/6735c9deceadba39c0a2b34b076f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M README.rst
Log Message:
-----------
replace the readthedocs badge,
we cannot use it until https://github.com/rtfd/readthedocs.org/issues/1767 is resolved
Commit: e76933b55749c619c4debf4e62cd1f4d7e3cb7e1
https://github.com/galaxyproject/galaxy/commit/e76933b55749c619c4debf4e62cd…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M README.rst
Log Message:
-----------
Merge pull request #1229 from martenson/remove-readthecdocs-badge
replace the readthedocs badge,
Commit: d2ce6d4d2b03fc7ad0a40ac4b0194f8636350f52
https://github.com/galaxyproject/galaxy/commit/d2ce6d4d2b03fc7ad0a40ac4b019…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M README.rst
M config/datatypes_conf.xml.sample
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/graph.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
A lib/galaxy/datatypes/test/test.idpDB
A lib/galaxy/datatypes/test/test.mz5
A lib/galaxy/datatypes/triples.py
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/managers/collections.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
A test/functional/tools/create_10.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: 102eeef2d7045fa5b8706497f04817cb2f75813a
https://github.com/galaxyproject/galaxy/commit/102eeef2d7045fa5b8706497f048…
Author: Takao Nakaguchi <takao.nakaguchi(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/migrate/check.py
Log Message:
-----------
Replacement should be applied only to first occurrence.
Commit: a8a4480d5c7e92e0f121eefd66357f5504c4cb26
https://github.com/galaxyproject/galaxy/commit/a8a4480d5c7e92e0f121eefd6635…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-data.js
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
M client/galaxy/scripts/mvc/tool/tool-form-base.js
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M client/galaxy/style/less/ui.less
M config/plugins/visualizations/charts/static/build-app.js
M config/plugins/visualizations/charts/static/library/ui-table-form.js
M config/plugins/visualizations/charts/static/views/editor.js
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/dataset_matcher.py
M static/maps/mvc/form/form-data.js.map
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
M static/maps/mvc/tool/tool-form-base.js.map
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
M static/scripts/mvc/tool/tool-form-base.js
M static/scripts/mvc/tool/tool-form-composite.js
M static/style/blue/base.css
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Fix dataset matching
Commit: ac79cf191c0a0588cdaf45b5075a2494bf097f57
https://github.com/galaxyproject/galaxy/commit/ac79cf191c0a0588cdaf45b5075a…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/style/less/ui.less
M static/maps/mvc/form/form-input.js.map
M static/scripts/mvc/form/form-input.js
M static/style/blue/base.css
Log Message:
-----------
Fix style naming
Commit: 11c46f4f35f3c1cb579198d28402ebacd51e6ec8
https://github.com/galaxyproject/galaxy/commit/11c46f4f35f3c1cb579198d28402…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/interval.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M test/tool_shed/test_data/1440_files/complex_dependency/tool_dependencies.xml
Log Message:
-----------
Merge branch 'master' into dev
Commit: f969eabf268a2e07235083d37168ae9887f87876
https://github.com/galaxyproject/galaxy/commit/f969eabf268a2e07235083d37168…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/qunit/test-common.js
Log Message:
-----------
Fix qunit shim to match base_panels.mako shim.
QUnit tests of things with underscore require statements would not work without this change.
Commit: 0c8a738a35d8c28b18dba6da92ec702096c1554a
https://github.com/galaxyproject/galaxy/commit/0c8a738a35d8c28b18dba6da92ec…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Export GALAXY_TEST_DBURI as GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION before installing wheels. Fix #1205.
As test/docker/base/run_test_wrapper.sh does.
Commit: df781dcc188193ff044a625540dc02961a8c5640
https://github.com/galaxyproject/galaxy/commit/df781dcc188193ff044a625540dc…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/helpers.py
Log Message:
-----------
Fix missing assertion pointed out @nsoranzo.
Lots of other tests would fail if simple uploads aren't working, but it is better to be direct and very explicit about why this particular test is failing.
Commit: 296971c5ded17367d2a14a32a072678b727ddf05
https://github.com/galaxyproject/galaxy/commit/296971c5ded17367d2a14a32a072…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/workflow/run.py
Log Message:
-----------
Fix typo spotted by @nsoranzo.
Commit: fcabc5242ca8fc6b1e7533ade17e2a8e3d27fe82
https://github.com/galaxyproject/galaxy/commit/fcabc5242ca8fc6b1e7533ade17e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
Log Message:
-----------
Merge pull request #1160 from Christian-B/unlinked_dependencies
Allowed for capitalised package names such as R
Commit: 93bfa1992cc23a411e46437547581843c0e7b952
https://github.com/galaxyproject/galaxy/commit/93bfa1992cc23a411e4643754758…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
Log Message:
-----------
Make more workflow methods properties.
As suggested by @nsoranzo.
Commit: f40d4fc178cbf3a3266a56ce0108b87e21bd5be0
https://github.com/galaxyproject/galaxy/commit/f40d4fc178cbf3a3266a56ce0108…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M config/galaxy.ini.sample
R templates/webapps/galaxy/root/index.mako
Log Message:
-----------
Webpack: re-add show_welcome_with_login config option (lost due to merge/gitignore?); remove root/index.mako
Commit: 600338dac7b0dad7f514f1b9a3c7c123dd63c379
https://github.com/galaxyproject/galaxy/commit/600338dac7b0dad7f514f1b9a3c7…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Merge pull request #1231 from nsoranzo/dev_tests_conditional_wheels
Export GALAXY_TEST_DBURI as GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION before installing wheels.
Commit: bab7ae099845f4503a2e41c939abc2aca9dc7a66
https://github.com/galaxyproject/galaxy/commit/bab7ae099845f4503a2e41c939ab…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/base/twilltestcase.py
Log Message:
-----------
Improved logging related tool test timeouts.
There are transient failures of maxseconds.xml's tool test on Jenkins that I can't reproduce locally, hopefully improved logging will help.
https://jenkins.galaxyproject.org/job/docker-framework/1309/testReport/juni…
Commit: 74f7b900368030e425f79f835e2093102dbed5ba
https://github.com/galaxyproject/galaxy/commit/74f7b900368030e425f79f835e20…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/migrate/check.py
Log Message:
-----------
Merge pull request #1230 from openlangrid/dev
Replacement should be applied only to first occurrence.
Commit: 732b5722ae7c668634185209171fa55288e19985
https://github.com/galaxyproject/galaxy/commit/732b5722ae7c668634185209171f…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/migrate/check.py
Log Message:
-----------
Do not mess with galaxy_config_file, if provided.
Commit: 5c87d07e0f535ed3367bbd463fb16bc0d83d7cf9
https://github.com/galaxyproject/galaxy/commit/5c87d07e0f535ed3367bbd463fb1…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/qunit/test-common.js
Log Message:
-----------
Merge pull request #1233 from jmchilton/underscore_shim
Fix qunit shim to match base_panels.mako shim.
Commit: 905471e32fef02b9da38d2efe0cc463cd258cbff
https://github.com/galaxyproject/galaxy/commit/905471e32fef02b9da38d2efe0cc…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/helpers.py
M test/api/test_jobs.py
Log Message:
-----------
Merge pull request #1226 from jmchilton/jobs_api_test_fix
Wait on jobs and history in certain API test cases.
Commit: 0eb87f911c4523ecb268b26ad8c74a0252ce8453
https://github.com/galaxyproject/galaxy/commit/0eb87f911c4523ecb268b26ad8c7…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Minor docstring typo
Commit: 4289cf3ab2f92375e6e4d9751064325b55cceaae
https://github.com/galaxyproject/galaxy/commit/4289cf3ab2f92375e6e4d9751064…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Merge pull request #1235 from blankenberg/typo_dev
Minor docstring typo
Commit: 1cc57b1eb2c295dbd68837c864740b6ff079b83d
https://github.com/galaxyproject/galaxy/commit/1cc57b1eb2c295dbd68837c86474…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
M static/maps/mvc/history/options-menu.js.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Add icons and reorganise history menu
Commit: 564f12c50ffaed386f57e1fd2d4048840e5f8288
https://github.com/galaxyproject/galaxy/commit/564f12c50ffaed386f57e1fd2d40…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
M static/maps/mvc/history/options-menu.js.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Remove icons
Commit: 42b6da87554b78fddd5b592a82d46deb83cada15
https://github.com/galaxyproject/galaxy/commit/42b6da87554b78fddd5b592a82d4…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
Log Message:
-----------
Comment out debugging
Commit: 9bd2712c5d9aa260012ffdad267434758bf086c0
https://github.com/galaxyproject/galaxy/commit/9bd2712c5d9aa260012ffdad2674…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M static/maps/mvc/history/options-menu.js.map
M static/scripts/libs/jquery/jquery.dynatree.js
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Just going to clobber everything
Commit: 4d396a6945b3394cd529849076b1f6c9892962c5
https://github.com/galaxyproject/galaxy/commit/4d396a6945b3394cd529849076b1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
A config/dependency_resolvers_conf.xml.sample
M lib/galaxy/tools/deps/resolvers/modules.py
Log Message:
-----------
Merge pull request #1221 from pvanheus/env-modules-resolve
Add documentation and extra options to Environment Modules resolver
Commit: 198cb7c9a1534e7914ca76c4648fd750234ddb9f
https://github.com/galaxyproject/galaxy/commit/198cb7c9a1534e7914ca76c4648f…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M static/scripts/libs/jquery/jquery.dynatree.js
Log Message:
-----------
Fix rebase issue
Commit: 5675617178b6d103de88ff907d137974b908761e
https://github.com/galaxyproject/galaxy/commit/5675617178b6d103de88ff907d13…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
M static/maps/mvc/history/options-menu.js.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Merge pull request #985 from erasche/nicer-history-menu
Add icons and reorganise history menu
Commit: a0c7d87db35133c2a81d54766f0e718d7fe5f766
https://github.com/galaxyproject/galaxy/commit/a0c7d87db35133c2a81d54766f0e…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
A Makefile
A client/.docker-build.sh
A client/Dockerfile
M doc/source/dev/faq.rst
Log Message:
-----------
Ease the grunt uglify process
Commit: 3e8b58c5aa66da83206230d27aacba1eaa7faa00
https://github.com/galaxyproject/galaxy/commit/3e8b58c5aa66da83206230d27aac…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/jobs/runners/pulsar.py
Log Message:
-----------
Merge branch 'release_15.10' into dev
Commit: 9e8068f3671cdef499ed51aca3869f91e2e5b69d
https://github.com/galaxyproject/galaxy/commit/9e8068f3671cdef499ed51aca386…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M README.rst
M client/galaxy/scripts/mvc/history/options-menu.js
M config/datatypes_conf.xml.sample
A config/dependency_resolvers_conf.xml.sample
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/graph.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
A lib/galaxy/datatypes/test/test.idpDB
A lib/galaxy/datatypes/test/test.mz5
A lib/galaxy/datatypes/triples.py
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/managers/collections.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
M lib/galaxy/tools/execute.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M lib/tool_shed/galaxy_install/migrate/check.py
M run_tests.sh
M static/maps/mvc/history/options-menu.js.map
M static/scripts/mvc/history/options-menu.js
M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
M test/api/helpers.py
M test/api/test_jobs.py
M test/api/test_workflows.py
A test/functional/tools/create_10.xml
M test/functional/tools/samples_tool_conf.xml
M test/qunit/test-common.js
M test/tool_shed/test_data/1440_files/complex_dependency/tool_dependencies.xml
M test/unit/test_galaxy_mapping.py
M test/unit/workflows/test_render.py
A test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
(merge dev)
Commit: 7cf98d32d811fbf9c8b64f72334c4f4c1e502882
https://github.com/galaxyproject/galaxy/commit/7cf98d32d811fbf9c8b64f72334c…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M doc/source/dev/faq.rst
Log Message:
-----------
Align opinions with @jmchilton
Commit: 1295f985106a9440135e139368a708ef8dcc0538
https://github.com/galaxyproject/galaxy/commit/1295f985106a9440135e139368a7…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M Makefile
Log Message:
-----------
Rename docker image
Commit: 0fec39d3bd323b203d6221f087ccac8014c3fefc
https://github.com/galaxyproject/galaxy/commit/0fec39d3bd323b203d6221f087cc…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/Dockerfile
Log Message:
-----------
Less insane build recipe if it's included in the repo
Commit: 0924891e31f3f215323fe7030e0d6c167f596878
https://github.com/galaxyproject/galaxy/commit/0924891e31f3f215323fe7030e0d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/qunit/test-common.js
Log Message:
-----------
Fix up merge issue with double underscore shim.
Commit: 4a279ffb64576258f2f2755f182430e1ccbacbc2
https://github.com/galaxyproject/galaxy/commit/4a279ffb64576258f2f2755f1824…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Allow inputs section for Format 2 workflow definitions.
Arguably a more natural way to define inputs, regardless it allows more CWL-like input definitions for workflows.
Commit: b0b26e69019162e335ea5a331ab21009c882f0d1
https://github.com/galaxyproject/galaxy/commit/b0b26e69019162e335ea5a331ab2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/test_workflows.py
M test/api/workflows_format_2/converter.py
M test/api/workflows_format_2/main.py
Log Message:
-----------
Allow specifying Format 2 workflow by path.
This will allow importing workflow relative resources in subsequent passes at this.
Commit: 70a9f213932947758f9882776140727eb6c0e246
https://github.com/galaxyproject/galaxy/commit/70a9f213932947758f9882776140…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
M test/api/workflows_format_2/interface.py
Log Message:
-----------
Update workflow format 2 code with infrastructure for nesting runnables.
In downstream work this is used for subworkflows and nested tools. Not sure which of these would potentially hit main line Galaxy first so setting this all up in its own commit.
Commit: 1bd0a4e9703406223f0e9bfe31df4c801998f400
https://github.com/galaxyproject/galaxy/commit/1bd0a4e9703406223f0e9bfe31df…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Refactoring and more testing of format 2 workflow implementation code...
... toward more reusable design.
Commit: a597e0e8349f33d4d2c642d2e0a74e3da64b156b
https://github.com/galaxyproject/galaxy/commit/a597e0e8349f33d4d2c642d2e0a7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Implement workflow outputs for format 2 workflow definitions.
Copy CWL style of specifying a outputs specification block at the top-level of the workflow specification and within that use the "source" attribute to specify the output. Reuse the specification used by "$link"s to describe this output - namely <label_or_order_index>[#<output_name=output>].
Commit: 3d0723c812632a276102748ec6a754bbec0b9d9a
https://github.com/galaxyproject/galaxy/commit/3d0723c812632a276102748ec6a7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
JS Model abstractions for dealing workflow outputs.
Need to modify how these are represented so I want the logic centralized in the model... also the logic should be centralized in the model.
Commit: 7b3fa824b67c0c7f881a514ae5b6598ede62e14c
https://github.com/galaxyproject/galaxy/commit/7b3fa824b67c0c7f881a514ae5b6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M lib/galaxy/managers/workflows.py
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Update worklfow editor representation of workflow outputs.
Modified this for the workflow export representation but this needed to be updated for the workflow editor because they shared some code in the manager. This was going to be needed downstream when I add labels and uuids to workflow outputs anyway.
Commit: cee9d4d1b30633689d8dd5fde715aed528e578a1
https://github.com/galaxyproject/galaxy/commit/cee9d4d1b30633689d8dd5fde715…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-data.js
Log Message:
-----------
Grunt the workflow JS.
Commit: 40e6932a25f71c240e038e4e6dc9be6a19ff8459
https://github.com/galaxyproject/galaxy/commit/40e6932a25f71c240e038e4e6dc9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/api/test_workflows.py
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Fix workflow API tests for workflow output changes.
Commit: e9e73f4828f7926a1a36654ed48325828992bed3
https://github.com/galaxyproject/galaxy/commit/e9e73f4828f7926a1a36654ed483…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
Log Message:
-----------
Remove dated comment.
Commit: c91a2eb33947a64ed8c03115d1de9ccf746cc195
https://github.com/galaxyproject/galaxy/commit/c91a2eb33947a64ed8c03115d1de…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-select-content.js
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/wrapped.py
M lib/galaxy/tools/wrappers.py
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/scripts/mvc/form/form-select-content.js
M test/api/test_tools.py
M test/unit/tools/test_data_parameters.py
Log Message:
-----------
Multi data parameter improvements.
Allow multiple collections to be fed to a multi data parameter in one reduction step. Fixes #750 and will really simplify certain classes of tools.
Rebased original with fixes for rerun of such reductions.
Manually tested workflow execution and everything seems fine. The workflow editor already thought this was possible, so that is another bug corrected by this enhancement.
To run the associated API test, execute the following command:
./run_tests.sh -with_framework_test_tools -api test/api/test_tools.py:ToolsTestCase.test_reduce_multiple_lists_on_multi_data
Conflicts:
static/maps/mvc/dataset/dataset-choice.js.map
static/maps/mvc/form/form-select-content.js.map
static/scripts/mvc/form/form-select-content.js
Commit: 62a26516cd7a3a6d1ad6441dc8d63efafa25d8d0
https://github.com/galaxyproject/galaxy/commit/62a26516cd7a3a6d1ad6441dc8d6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Fix PR #805 for changes in PR #1153.
Commit: 17851ba0ea9572f1c387ff1fea1012b7af737855
https://github.com/galaxyproject/galaxy/commit/17851ba0ea9572f1c387ff1fea10…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M test/unit/tools/test_actions.py
Log Message:
-----------
And fix unit test for b036adcaa166153e544935c12123877c69a7450f.
Commit: 9f8eb465e718d4b643120e8554d119702c264135
https://github.com/galaxyproject/galaxy/commit/9f8eb465e718d4b643120e8554d1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M .gitignore
A client/galaxy/scripts/apps/analysis.js
A client/galaxy/scripts/apps/history-panel.js
A client/galaxy/scripts/apps/login.js
A client/galaxy/scripts/apps/tool-panel.js
R client/galaxy/scripts/base.js
R client/galaxy/scripts/galaxy-app-base.js
R client/galaxy/scripts/galaxy.autocom_tagging.js
R client/galaxy/scripts/galaxy.base.js
R client/galaxy/scripts/galaxy.frame.js
A client/galaxy/scripts/galaxy.js
M client/galaxy/scripts/galaxy.library.js
R client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/galaxy.pages.js
R client/galaxy/scripts/galaxy.panels.js
R client/galaxy/scripts/galaxy.tools.js
R client/galaxy/scripts/galaxy.ui.scrollPanel.js
A client/galaxy/scripts/layout/masthead.js
A client/galaxy/scripts/layout/menu.js
A client/galaxy/scripts/layout/modal.js
A client/galaxy/scripts/layout/page.js
A client/galaxy/scripts/layout/panel.js
A client/galaxy/scripts/layout/scratchbook.js
R client/galaxy/scripts/libs/IE/IE7.js
R client/galaxy/scripts/libs/IE/IE8.js
R client/galaxy/scripts/libs/IE/blank.gif
R client/galaxy/scripts/libs/IE/excanvas.js
R client/galaxy/scripts/libs/IE/ie7-recalc.js
A client/galaxy/scripts/libs/backbone.js
R client/galaxy/scripts/libs/backbone/backbone.js
M client/galaxy/scripts/libs/d3.js
A client/galaxy/scripts/mvc/annotation.js
R client/galaxy/scripts/mvc/annotations.js
R client/galaxy/scripts/mvc/app/app-analysis.js
R client/galaxy/scripts/mvc/app/app-login.js
R client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-model.js
R client/galaxy/scripts/mvc/collection/collection-panel-edit.js
R client/galaxy/scripts/mvc/collection/collection-panel.js
A client/galaxy/scripts/mvc/collection/collection-view-edit.js
A client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
R client/galaxy/scripts/mvc/data.js
A client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M client/galaxy/scripts/mvc/history/hda-model.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
R client/galaxy/scripts/mvc/history/history-panel-annotated.js
R client/galaxy/scripts/mvc/history/history-panel-edit-current.js
R client/galaxy/scripts/mvc/history/history-panel-edit.js
R client/galaxy/scripts/mvc/history/history-panel.js
A client/galaxy/scripts/mvc/history/history-view-annotated.js
A client/galaxy/scripts/mvc/history/history-view-edit-current.js
A client/galaxy/scripts/mvc/history/history-view-edit.js
A client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folder-view.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-library-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
R client/galaxy/scripts/mvc/list/list-panel.js
A client/galaxy/scripts/mvc/list/list-view.js
A client/galaxy/scripts/mvc/tag.js
R client/galaxy/scripts/mvc/tags.js
A client/galaxy/scripts/mvc/tool/tools-form-base.js
A client/galaxy/scripts/mvc/tool/tools-form-workflow.js
A client/galaxy/scripts/mvc/tool/tools-form.js
A client/galaxy/scripts/mvc/tool/tools-jobs.js
A client/galaxy/scripts/mvc/tool/tools-template.js
A client/galaxy/scripts/mvc/tool/tools.js
R client/galaxy/scripts/mvc/tools.js
R client/galaxy/scripts/mvc/tools/tools-form-base.js
R client/galaxy/scripts/mvc/tools/tools-form-workflow.js
R client/galaxy/scripts/mvc/tools/tools-form.js
R client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/tools/tools-template.js
M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
M client/galaxy/scripts/mvc/ui/ui-select-library.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-connector.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/nls/ja/locale.js
M client/galaxy/scripts/nls/locale.js
M client/galaxy/scripts/nls/zh/locale.js
A client/galaxy/scripts/onload.js
A client/galaxy/scripts/polyfills.js
R client/galaxy/scripts/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/rgenetics/helper_functions.js
R client/galaxy/scripts/rgenetics/timer.js
M client/galaxy/scripts/templates/compiled/panel_section.js
M client/galaxy/scripts/templates/compiled/tool_form.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/compiled/tool_search.js
R client/galaxy/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/tools/rgenetics/helper_functions.js
R client/galaxy/scripts/tools/rgenetics/timer.js
A client/galaxy/scripts/ui/autocom_tagging.js
A client/galaxy/scripts/ui/editable-text.js
A client/galaxy/scripts/ui/popupmenu.js
A client/galaxy/scripts/ui/scroll-panel.js
A client/galaxy/scripts/utils/async-save-text.js
M client/galaxy/scripts/utils/localization.js
M client/galaxy/scripts/utils/query-string-parsing.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/circster.js
M client/galaxy/scripts/viz/phyloviz.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/trackster/util.js
M client/galaxy/scripts/viz/visualization.js
M client/galaxy/style/less/base.less
M client/grunt-tasks/install-libs.js
M client/grunt-tasks/scripts.js
M client/grunt-tasks/templates.js
M client/package.json
A client/webpack.config.js
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/managers/users.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/root.py
A static/incompatible-browser.html
R static/maps/base.js.map
R static/maps/galaxy-app-base.js.map
R static/maps/galaxy.autocom_tagging.js.map
R static/maps/galaxy.base.js.map
R static/maps/galaxy.frame.js.map
A static/maps/galaxy.js.map
M static/maps/galaxy.library.js.map
R static/maps/galaxy.masthead.js.map
R static/maps/galaxy.menu.js.map
M static/maps/galaxy.pages.js.map
R static/maps/galaxy.panels.js.map
R static/maps/galaxy.tools.js.map
R static/maps/galaxy.ui.scrollPanel.js.map
R static/maps/galaxy.workflows.js.map
A static/maps/layout/masthead.js.map
A static/maps/layout/menu.js.map
A static/maps/layout/modal.js.map
A static/maps/layout/page.js.map
A static/maps/layout/panel.js.map
A static/maps/layout/scratchbook.js.map
R static/maps/libs/IE/IE7.js.map
R static/maps/libs/IE/IE8.js.map
R static/maps/libs/IE/excanvas.js.map
R static/maps/libs/IE/ie7-recalc.js.map
A static/maps/libs/backbone.js.map
A static/maps/libs/common-libs.js.map
A static/maps/mvc/annotation.js.map
R static/maps/mvc/annotations.js.map
R static/maps/mvc/app/app-analysis.js.map
R static/maps/mvc/app/app-login.js.map
R static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
R static/maps/mvc/collection/collection-panel-edit.js.map
R static/maps/mvc/collection/collection-panel.js.map
A static/maps/mvc/collection/collection-view-edit.js.map
A static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
R static/maps/mvc/data.js.map
A static/maps/mvc/dataset/data.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/grid/grid-view.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
R static/maps/mvc/history/history-panel-annotated.js.map
R static/maps/mvc/history/history-panel-edit-current.js.map
R static/maps/mvc/history/history-panel-edit.js.map
R static/maps/mvc/history/history-panel.js.map
A static/maps/mvc/history/history-view-annotated.js.map
A static/maps/mvc/history/history-view-edit-current.js.map
A static/maps/mvc/history/history-view-edit.js.map
A static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folder-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-library-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
A static/maps/mvc/list/list-view.js.map
A static/maps/mvc/tag.js.map
R static/maps/mvc/tags.js.map
A static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tool/tools-form-workflow.js.map
A static/maps/mvc/tool/tools-form.js.map
A static/maps/mvc/tool/tools-jobs.js.map
A static/maps/mvc/tool/tools-template.js.map
A static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools/tools-form-workflow.js.map
R static/maps/mvc/tools/tools-form.js.map
R static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/tools/tools-template.js.map
M static/maps/mvc/ui/ui-select-ftp.js.map
M static/maps/mvc/ui/ui-select-library.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-connector.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
A static/maps/onload.js.map
A static/maps/polyfills.js.map
R static/maps/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/rgenetics/helper_functions.js.map
R static/maps/rgenetics/timer.js.map
M static/maps/templates/compiled/panel_section.js.map
M static/maps/templates/compiled/tool_form.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/templates/compiled/tool_search.js.map
R static/maps/tools/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/tools/rgenetics/helper_functions.js.map
R static/maps/tools/rgenetics/timer.js.map
A static/maps/ui/autocom_tagging.js.map
A static/maps/ui/editable-text.js.map
A static/maps/ui/popupmenu.js.map
A static/maps/ui/scroll-panel.js.map
A static/maps/utils/async-save-text.js.map
M static/maps/utils/localization.js.map
M static/maps/utils/query-string-parsing.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/circster.js.map
M static/maps/viz/phyloviz.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/trackster/util.js.map
M static/maps/viz/visualization.js.map
R static/scripts/base.js
A static/scripts/bundled/analysis.bundled.js
A static/scripts/bundled/analysis.bundled.js.map
A static/scripts/bundled/libs.bundled.js
A static/scripts/bundled/libs.bundled.js.map
A static/scripts/bundled/login.bundled.js
A static/scripts/bundled/login.bundled.js.map
R static/scripts/galaxy-app-base.js
R static/scripts/galaxy.autocom_tagging.js
R static/scripts/galaxy.base.js
R static/scripts/galaxy.frame.js
A static/scripts/galaxy.js
M static/scripts/galaxy.library.js
R static/scripts/galaxy.masthead.js
R static/scripts/galaxy.menu.js
M static/scripts/galaxy.pages.js
R static/scripts/galaxy.panels.js
R static/scripts/galaxy.tools.js
R static/scripts/galaxy.ui.scrollPanel.js
R static/scripts/galaxy.workflows.js
A static/scripts/layout/masthead.js
A static/scripts/layout/menu.js
A static/scripts/layout/modal.js
A static/scripts/layout/page.js
A static/scripts/layout/panel.js
A static/scripts/layout/scratchbook.js
R static/scripts/libs/IE/IE7.js
R static/scripts/libs/IE/IE8.js
R static/scripts/libs/IE/blank.gif
R static/scripts/libs/IE/excanvas.js
R static/scripts/libs/IE/ie7-recalc.js
A static/scripts/libs/backbone.js
A static/scripts/libs/common-libs.js
A static/scripts/mvc/annotation.js
R static/scripts/mvc/annotations.js
R static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/app/app-login.js
R static/scripts/mvc/app/app-view.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
R static/scripts/mvc/collection/collection-panel-edit.js
R static/scripts/mvc/collection/collection-panel.js
A static/scripts/mvc/collection/collection-view-edit.js
A static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
R static/scripts/mvc/data.js
A static/scripts/mvc/dataset/data.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
R static/scripts/mvc/history/history-panel-annotated.js
R static/scripts/mvc/history/history-panel-edit-current.js
R static/scripts/mvc/history/history-panel-edit.js
A static/scripts/mvc/history/history-view-annotated.js
A static/scripts/mvc/history/history-view-edit-current.js
A static/scripts/mvc/history/history-view-edit.js
A static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folder-view.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-library-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-libraryrow-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
R static/scripts/mvc/list/list-panel.js
A static/scripts/mvc/list/list-view.js
A static/scripts/mvc/tag.js
R static/scripts/mvc/tags.js
A static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tool/tools-form-workflow.js
A static/scripts/mvc/tool/tools-form.js
A static/scripts/mvc/tool/tools-jobs.js
A static/scripts/mvc/tool/tools-template.js
A static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools/tools-form-workflow.js
R static/scripts/mvc/tools/tools-form.js
R static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/tools/tools-template.js
M static/scripts/mvc/ui/ui-select-ftp.js
M static/scripts/mvc/ui/ui-select-library.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/visualization/visualization-model.js
M static/scripts/mvc/workflow/workflow-connector.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
A static/scripts/onload.js
A static/scripts/polyfills.js
R static/scripts/rgenetics/checkbox_and_radiobutton.js
R static/scripts/rgenetics/helper_functions.js
R static/scripts/rgenetics/timer.js
M static/scripts/templates/compiled/panel_section.js
M static/scripts/templates/compiled/tool_form.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/templates/compiled/tool_search.js
R static/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R static/scripts/tools/rgenetics/helper_functions.js
R static/scripts/tools/rgenetics/timer.js
A static/scripts/ui/autocom_tagging.js
A static/scripts/ui/editable-text.js
A static/scripts/ui/popupmenu.js
A static/scripts/ui/scroll-panel.js
A static/scripts/utils/async-save-text.js
M static/scripts/utils/localization.js
M static/scripts/utils/query-string-parsing.js
M static/scripts/utils/utils.js
M static/scripts/viz/circster.js
M static/scripts/viz/phyloviz.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/trackster/util.js
M static/scripts/viz/visualization.js
M static/style/blue/base.css
R static/style/blue/galaxy.frame.masthead.css
M templates/base.mako
M templates/base/base_panels.mako
M templates/display_base.mako
M templates/galaxy_client_app.mako
M templates/grid_base.mako
A templates/js-app.mako
M templates/refresh_frames.mako
M templates/tagging_common.mako
M templates/user/logout.mako
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/edit_attributes.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M templates/webapps/galaxy/galaxy.panels.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
M templates/webapps/galaxy/library/common/ldda_edit_info.mako
M templates/webapps/galaxy/library/common/move_library_item.mako
M templates/webapps/galaxy/library/common/upload.mako
M templates/webapps/galaxy/page/editor.mako
M templates/webapps/galaxy/requests/common/create_request.mako
M templates/webapps/galaxy/requests/common/find_samples.mako
R templates/webapps/galaxy/root/index.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M templates/webapps/galaxy/visualization/sweepster.mako
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/galaxy/workflow/run.mako
M test/casperjs/api-history-permission-tests.js
M test/casperjs/spaceghost.js
M test/qunit/test-app.js
M test/qunit/test-common.js
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Merge pull request #1144 from carlfeberhard/webpack
Webpack
Commit: f7a2acdcabdfb0d2368e00c4959712bf7d5c98f2
https://github.com/galaxyproject/galaxy/commit/f7a2acdcabdfb0d2368e00c49597…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M test/qunit/test-common.js
Log Message:
-----------
Merge pull request #1246 from jmchilton/test-commons
Fix up merge issue with double underscore shim.
Commit: b0c1cd7460f13075c565750298f9d4c3cb89bb80
https://github.com/galaxyproject/galaxy/commit/b0c1cd7460f13075c565750298f9…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M test/base/twilltestcase.py
Log Message:
-----------
Merge pull request #1243 from jmchilton/maxseconds_debug
Improved logging related tool test timeouts.
Commit: d0a011675323ba7e8deba588ae0ae6ed9c23f0fe
https://github.com/galaxyproject/galaxy/commit/d0a011675323ba7e8deba588ae0a…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Enable lookup of tools from other tool sheds.
Commit: c040a18b4b164e58a45d1c4f6da65f1eacf18ed5
https://github.com/galaxyproject/galaxy/commit/c040a18b4b164e58a45d1c4f6da6…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Modify get_tool() directly instead of using decorator.
Commit: 2d168a2c07798ab736676a1eb865ae6976b48464
https://github.com/galaxyproject/galaxy/commit/2d168a2c07798ab736676a1eb865…
Author: mvdbeek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Remove whitespaces in blank line.
Commit: 1be4f85404c75be364cb20b3c460ea3f51c4dae2
https://github.com/galaxyproject/galaxy/commit/1be4f85404c75be364cb20b3c460…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/workflow/modules.py
M static/maps/mvc/tools/tools-form-base.js.map
M static/scripts/mvc/tools/tools-form-base.js
Log Message:
-----------
Add messages inform users of changes in the tool_id.
Commit: 4f1359a0a6d703c8a40b6bb015e89d991d97570e
https://github.com/galaxyproject/galaxy/commit/4f1359a0a6d703c8a40b6bb015e8…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M .gitignore
A client/galaxy/scripts/apps/analysis.js
A client/galaxy/scripts/apps/history-panel.js
A client/galaxy/scripts/apps/login.js
A client/galaxy/scripts/apps/tool-panel.js
R client/galaxy/scripts/base.js
R client/galaxy/scripts/galaxy-app-base.js
R client/galaxy/scripts/galaxy.autocom_tagging.js
R client/galaxy/scripts/galaxy.base.js
R client/galaxy/scripts/galaxy.frame.js
A client/galaxy/scripts/galaxy.js
M client/galaxy/scripts/galaxy.library.js
R client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/galaxy.pages.js
R client/galaxy/scripts/galaxy.panels.js
R client/galaxy/scripts/galaxy.tools.js
R client/galaxy/scripts/galaxy.ui.scrollPanel.js
A client/galaxy/scripts/layout/masthead.js
A client/galaxy/scripts/layout/menu.js
A client/galaxy/scripts/layout/modal.js
A client/galaxy/scripts/layout/page.js
A client/galaxy/scripts/layout/panel.js
A client/galaxy/scripts/layout/scratchbook.js
R client/galaxy/scripts/libs/IE/IE7.js
R client/galaxy/scripts/libs/IE/IE8.js
R client/galaxy/scripts/libs/IE/blank.gif
R client/galaxy/scripts/libs/IE/excanvas.js
R client/galaxy/scripts/libs/IE/ie7-recalc.js
A client/galaxy/scripts/libs/backbone.js
R client/galaxy/scripts/libs/backbone/backbone.js
M client/galaxy/scripts/libs/d3.js
A client/galaxy/scripts/mvc/annotation.js
R client/galaxy/scripts/mvc/annotations.js
R client/galaxy/scripts/mvc/app/app-analysis.js
R client/galaxy/scripts/mvc/app/app-login.js
R client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-model.js
R client/galaxy/scripts/mvc/collection/collection-panel-edit.js
R client/galaxy/scripts/mvc/collection/collection-panel.js
A client/galaxy/scripts/mvc/collection/collection-view-edit.js
A client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
R client/galaxy/scripts/mvc/data.js
A client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M client/galaxy/scripts/mvc/history/hda-model.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
R client/galaxy/scripts/mvc/history/history-panel-annotated.js
R client/galaxy/scripts/mvc/history/history-panel-edit-current.js
R client/galaxy/scripts/mvc/history/history-panel-edit.js
R client/galaxy/scripts/mvc/history/history-panel.js
A client/galaxy/scripts/mvc/history/history-view-annotated.js
A client/galaxy/scripts/mvc/history/history-view-edit-current.js
A client/galaxy/scripts/mvc/history/history-view-edit.js
A client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folder-view.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-library-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
R client/galaxy/scripts/mvc/list/list-panel.js
A client/galaxy/scripts/mvc/list/list-view.js
A client/galaxy/scripts/mvc/tag.js
R client/galaxy/scripts/mvc/tags.js
A client/galaxy/scripts/mvc/tool/tools-form-base.js
A client/galaxy/scripts/mvc/tool/tools-form-workflow.js
A client/galaxy/scripts/mvc/tool/tools-form.js
A client/galaxy/scripts/mvc/tool/tools-jobs.js
A client/galaxy/scripts/mvc/tool/tools-template.js
A client/galaxy/scripts/mvc/tool/tools.js
R client/galaxy/scripts/mvc/tools.js
R client/galaxy/scripts/mvc/tools/tools-form-base.js
R client/galaxy/scripts/mvc/tools/tools-form-workflow.js
R client/galaxy/scripts/mvc/tools/tools-form.js
R client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/tools/tools-template.js
M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
M client/galaxy/scripts/mvc/ui/ui-select-library.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-connector.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/nls/ja/locale.js
M client/galaxy/scripts/nls/locale.js
M client/galaxy/scripts/nls/zh/locale.js
A client/galaxy/scripts/onload.js
A client/galaxy/scripts/polyfills.js
R client/galaxy/scripts/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/rgenetics/helper_functions.js
R client/galaxy/scripts/rgenetics/timer.js
M client/galaxy/scripts/templates/compiled/panel_section.js
M client/galaxy/scripts/templates/compiled/tool_form.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/compiled/tool_search.js
R client/galaxy/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/tools/rgenetics/helper_functions.js
R client/galaxy/scripts/tools/rgenetics/timer.js
A client/galaxy/scripts/ui/autocom_tagging.js
A client/galaxy/scripts/ui/editable-text.js
A client/galaxy/scripts/ui/popupmenu.js
A client/galaxy/scripts/ui/scroll-panel.js
A client/galaxy/scripts/utils/async-save-text.js
M client/galaxy/scripts/utils/localization.js
M client/galaxy/scripts/utils/query-string-parsing.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/circster.js
M client/galaxy/scripts/viz/phyloviz.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/trackster/util.js
M client/galaxy/scripts/viz/visualization.js
M client/galaxy/style/less/base.less
M client/grunt-tasks/install-libs.js
M client/grunt-tasks/scripts.js
M client/grunt-tasks/templates.js
M client/package.json
A client/webpack.config.js
A config/dependency_resolvers_conf.xml.sample
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/managers/users.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/tool_shed/galaxy_install/migrate/check.py
M run_tests.sh
A static/incompatible-browser.html
R static/maps/base.js.map
R static/maps/galaxy-app-base.js.map
R static/maps/galaxy.autocom_tagging.js.map
R static/maps/galaxy.base.js.map
R static/maps/galaxy.frame.js.map
A static/maps/galaxy.js.map
M static/maps/galaxy.library.js.map
R static/maps/galaxy.masthead.js.map
R static/maps/galaxy.menu.js.map
M static/maps/galaxy.pages.js.map
R static/maps/galaxy.panels.js.map
R static/maps/galaxy.tools.js.map
R static/maps/galaxy.ui.scrollPanel.js.map
R static/maps/galaxy.workflows.js.map
A static/maps/layout/masthead.js.map
A static/maps/layout/menu.js.map
A static/maps/layout/modal.js.map
A static/maps/layout/page.js.map
A static/maps/layout/panel.js.map
A static/maps/layout/scratchbook.js.map
R static/maps/libs/IE/IE7.js.map
R static/maps/libs/IE/IE8.js.map
R static/maps/libs/IE/excanvas.js.map
R static/maps/libs/IE/ie7-recalc.js.map
A static/maps/libs/backbone.js.map
A static/maps/libs/common-libs.js.map
A static/maps/mvc/annotation.js.map
R static/maps/mvc/annotations.js.map
R static/maps/mvc/app/app-analysis.js.map
R static/maps/mvc/app/app-login.js.map
R static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
R static/maps/mvc/collection/collection-panel-edit.js.map
R static/maps/mvc/collection/collection-panel.js.map
A static/maps/mvc/collection/collection-view-edit.js.map
A static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
R static/maps/mvc/data.js.map
A static/maps/mvc/dataset/data.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/grid/grid-view.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
R static/maps/mvc/history/history-panel-annotated.js.map
R static/maps/mvc/history/history-panel-edit-current.js.map
R static/maps/mvc/history/history-panel-edit.js.map
R static/maps/mvc/history/history-panel.js.map
A static/maps/mvc/history/history-view-annotated.js.map
A static/maps/mvc/history/history-view-edit-current.js.map
A static/maps/mvc/history/history-view-edit.js.map
A static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folder-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-library-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
A static/maps/mvc/list/list-view.js.map
A static/maps/mvc/tag.js.map
R static/maps/mvc/tags.js.map
A static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tool/tools-form-workflow.js.map
A static/maps/mvc/tool/tools-form.js.map
A static/maps/mvc/tool/tools-jobs.js.map
A static/maps/mvc/tool/tools-template.js.map
A static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools/tools-form-workflow.js.map
R static/maps/mvc/tools/tools-form.js.map
R static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/tools/tools-template.js.map
M static/maps/mvc/ui/ui-select-ftp.js.map
M static/maps/mvc/ui/ui-select-library.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-connector.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
A static/maps/onload.js.map
A static/maps/polyfills.js.map
R static/maps/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/rgenetics/helper_functions.js.map
R static/maps/rgenetics/timer.js.map
M static/maps/templates/compiled/panel_section.js.map
M static/maps/templates/compiled/tool_form.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/templates/compiled/tool_search.js.map
R static/maps/tools/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/tools/rgenetics/helper_functions.js.map
R static/maps/tools/rgenetics/timer.js.map
A static/maps/ui/autocom_tagging.js.map
A static/maps/ui/editable-text.js.map
A static/maps/ui/popupmenu.js.map
A static/maps/ui/scroll-panel.js.map
A static/maps/utils/async-save-text.js.map
M static/maps/utils/localization.js.map
M static/maps/utils/query-string-parsing.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/circster.js.map
M static/maps/viz/phyloviz.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/trackster/util.js.map
M static/maps/viz/visualization.js.map
R static/scripts/base.js
A static/scripts/bundled/analysis.bundled.js
A static/scripts/bundled/analysis.bundled.js.map
A static/scripts/bundled/libs.bundled.js
A static/scripts/bundled/libs.bundled.js.map
A static/scripts/bundled/login.bundled.js
A static/scripts/bundled/login.bundled.js.map
R static/scripts/galaxy-app-base.js
R static/scripts/galaxy.autocom_tagging.js
R static/scripts/galaxy.base.js
R static/scripts/galaxy.frame.js
A static/scripts/galaxy.js
M static/scripts/galaxy.library.js
R static/scripts/galaxy.masthead.js
R static/scripts/galaxy.menu.js
M static/scripts/galaxy.pages.js
R static/scripts/galaxy.panels.js
R static/scripts/galaxy.tools.js
R static/scripts/galaxy.ui.scrollPanel.js
R static/scripts/galaxy.workflows.js
A static/scripts/layout/masthead.js
A static/scripts/layout/menu.js
A static/scripts/layout/modal.js
A static/scripts/layout/page.js
A static/scripts/layout/panel.js
A static/scripts/layout/scratchbook.js
R static/scripts/libs/IE/IE7.js
R static/scripts/libs/IE/IE8.js
R static/scripts/libs/IE/blank.gif
R static/scripts/libs/IE/excanvas.js
R static/scripts/libs/IE/ie7-recalc.js
A static/scripts/libs/backbone.js
A static/scripts/libs/common-libs.js
A static/scripts/mvc/annotation.js
R static/scripts/mvc/annotations.js
R static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/app/app-login.js
R static/scripts/mvc/app/app-view.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
R static/scripts/mvc/collection/collection-panel-edit.js
R static/scripts/mvc/collection/collection-panel.js
A static/scripts/mvc/collection/collection-view-edit.js
A static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
R static/scripts/mvc/data.js
A static/scripts/mvc/dataset/data.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
R static/scripts/mvc/history/history-panel-annotated.js
R static/scripts/mvc/history/history-panel-edit-current.js
R static/scripts/mvc/history/history-panel-edit.js
A static/scripts/mvc/history/history-view-annotated.js
A static/scripts/mvc/history/history-view-edit-current.js
A static/scripts/mvc/history/history-view-edit.js
A static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folder-view.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-library-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-libraryrow-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
R static/scripts/mvc/list/list-panel.js
A static/scripts/mvc/list/list-view.js
A static/scripts/mvc/tag.js
R static/scripts/mvc/tags.js
A static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tool/tools-form-workflow.js
A static/scripts/mvc/tool/tools-form.js
A static/scripts/mvc/tool/tools-jobs.js
A static/scripts/mvc/tool/tools-template.js
A static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools/tools-form-workflow.js
R static/scripts/mvc/tools/tools-form.js
R static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/tools/tools-template.js
M static/scripts/mvc/ui/ui-select-ftp.js
M static/scripts/mvc/ui/ui-select-library.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/visualization/visualization-model.js
M static/scripts/mvc/workflow/workflow-connector.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
A static/scripts/onload.js
A static/scripts/polyfills.js
R static/scripts/rgenetics/checkbox_and_radiobutton.js
R static/scripts/rgenetics/helper_functions.js
R static/scripts/rgenetics/timer.js
M static/scripts/templates/compiled/panel_section.js
M static/scripts/templates/compiled/tool_form.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/templates/compiled/tool_search.js
R static/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R static/scripts/tools/rgenetics/helper_functions.js
R static/scripts/tools/rgenetics/timer.js
A static/scripts/ui/autocom_tagging.js
A static/scripts/ui/editable-text.js
A static/scripts/ui/popupmenu.js
A static/scripts/ui/scroll-panel.js
A static/scripts/utils/async-save-text.js
M static/scripts/utils/localization.js
M static/scripts/utils/query-string-parsing.js
M static/scripts/utils/utils.js
M static/scripts/viz/circster.js
M static/scripts/viz/phyloviz.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/trackster/util.js
M static/scripts/viz/visualization.js
M static/style/blue/base.css
R static/style/blue/galaxy.frame.masthead.css
M templates/base.mako
M templates/base/base_panels.mako
M templates/display_base.mako
M templates/galaxy_client_app.mako
M templates/grid_base.mako
A templates/js-app.mako
M templates/refresh_frames.mako
M templates/tagging_common.mako
M templates/user/logout.mako
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/edit_attributes.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M templates/webapps/galaxy/galaxy.panels.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
M templates/webapps/galaxy/library/common/ldda_edit_info.mako
M templates/webapps/galaxy/library/common/move_library_item.mako
M templates/webapps/galaxy/library/common/upload.mako
M templates/webapps/galaxy/page/editor.mako
M templates/webapps/galaxy/requests/common/create_request.mako
M templates/webapps/galaxy/requests/common/find_samples.mako
R templates/webapps/galaxy/root/index.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M templates/webapps/galaxy/visualization/sweepster.mako
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/galaxy/workflow/run.mako
M test/api/helpers.py
M test/api/test_jobs.py
M test/base/twilltestcase.py
M test/casperjs/api-history-permission-tests.js
M test/casperjs/spaceghost.js
M test/qunit/test-app.js
M test/qunit/test-common.js
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/test_data/1440_files/complex_dependency/tool_dependencies.xml
Log Message:
-----------
Merge branch 'dev' of github.com:galaxyproject/galaxy into cross_toolshed_tool_fetching
Commit: 77f034019b93bdd539a495a89318bcb1e51b3993
https://github.com/galaxyproject/galaxy/commit/77f034019b93bdd539a495a89318…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Fix failing api test
Commit: 1fdde2cb4d3d685916dc82a8fc846079a8066cd5
https://github.com/galaxyproject/galaxy/commit/1fdde2cb4d3d685916dc82a8fc84…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Refactor generic side workflow editor panel toward backbone.
Commit: cae457d8c18ded2abf03a0a6c3fb027735e1b5ef
https://github.com/galaxyproject/galaxy/commit/cae457d8c18ded2abf03a0a6c3fb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M test/functional/tools/maxseconds.xml
Log Message:
-----------
Fail maxseconds test tool if sleep is interrupted.
Commit: d7f5dbe4ca1bc0943e3d3edbddd88d1c226ff5e5
https://github.com/galaxyproject/galaxy/commit/d7f5dbe4ca1bc0943e3d3edbddd8…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/wrapped.py
M lib/galaxy/tools/wrappers.py
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/scripts/mvc/form/form-select-content.js
M test/api/test_tools.py
M test/unit/tools/test_actions.py
M test/unit/tools/test_data_parameters.py
Log Message:
-----------
Merge pull request #805 from jmchilton/multi_data_param_enhance
Allow multiple collections to be supplied to a multiple data parameter.
Commit: 3069e12ca741245563b9e372bf581747861fce6e
https://github.com/galaxyproject/galaxy/commit/3069e12ca741245563b9e372bf58…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M .gitignore
A client/galaxy/scripts/apps/analysis.js
A client/galaxy/scripts/apps/history-panel.js
A client/galaxy/scripts/apps/login.js
A client/galaxy/scripts/apps/tool-panel.js
R client/galaxy/scripts/base.js
R client/galaxy/scripts/galaxy-app-base.js
R client/galaxy/scripts/galaxy.autocom_tagging.js
R client/galaxy/scripts/galaxy.base.js
R client/galaxy/scripts/galaxy.frame.js
A client/galaxy/scripts/galaxy.js
M client/galaxy/scripts/galaxy.library.js
R client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/galaxy.pages.js
R client/galaxy/scripts/galaxy.panels.js
R client/galaxy/scripts/galaxy.tools.js
R client/galaxy/scripts/galaxy.ui.scrollPanel.js
A client/galaxy/scripts/layout/masthead.js
A client/galaxy/scripts/layout/menu.js
A client/galaxy/scripts/layout/modal.js
A client/galaxy/scripts/layout/page.js
A client/galaxy/scripts/layout/panel.js
A client/galaxy/scripts/layout/scratchbook.js
R client/galaxy/scripts/libs/IE/IE7.js
R client/galaxy/scripts/libs/IE/IE8.js
R client/galaxy/scripts/libs/IE/blank.gif
R client/galaxy/scripts/libs/IE/excanvas.js
R client/galaxy/scripts/libs/IE/ie7-recalc.js
A client/galaxy/scripts/libs/backbone.js
R client/galaxy/scripts/libs/backbone/backbone.js
M client/galaxy/scripts/libs/d3.js
A client/galaxy/scripts/mvc/annotation.js
R client/galaxy/scripts/mvc/annotations.js
R client/galaxy/scripts/mvc/app/app-analysis.js
R client/galaxy/scripts/mvc/app/app-login.js
R client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-model.js
R client/galaxy/scripts/mvc/collection/collection-panel-edit.js
R client/galaxy/scripts/mvc/collection/collection-panel.js
A client/galaxy/scripts/mvc/collection/collection-view-edit.js
A client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
R client/galaxy/scripts/mvc/data.js
A client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M client/galaxy/scripts/mvc/history/hda-model.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
R client/galaxy/scripts/mvc/history/history-panel-annotated.js
R client/galaxy/scripts/mvc/history/history-panel-edit-current.js
R client/galaxy/scripts/mvc/history/history-panel-edit.js
R client/galaxy/scripts/mvc/history/history-panel.js
A client/galaxy/scripts/mvc/history/history-view-annotated.js
A client/galaxy/scripts/mvc/history/history-view-edit-current.js
A client/galaxy/scripts/mvc/history/history-view-edit.js
A client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folder-view.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-library-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
R client/galaxy/scripts/mvc/list/list-panel.js
A client/galaxy/scripts/mvc/list/list-view.js
A client/galaxy/scripts/mvc/tag.js
R client/galaxy/scripts/mvc/tags.js
A client/galaxy/scripts/mvc/tool/tools-form-base.js
A client/galaxy/scripts/mvc/tool/tools-form-workflow.js
A client/galaxy/scripts/mvc/tool/tools-form.js
A client/galaxy/scripts/mvc/tool/tools-jobs.js
A client/galaxy/scripts/mvc/tool/tools-template.js
A client/galaxy/scripts/mvc/tool/tools.js
R client/galaxy/scripts/mvc/tools.js
R client/galaxy/scripts/mvc/tools/tools-form-base.js
R client/galaxy/scripts/mvc/tools/tools-form-workflow.js
R client/galaxy/scripts/mvc/tools/tools-form.js
R client/galaxy/scripts/mvc/tools/tools-jobs.js
R client/galaxy/scripts/mvc/tools/tools-template.js
M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
M client/galaxy/scripts/mvc/ui/ui-select-library.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-connector.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/nls/ja/locale.js
M client/galaxy/scripts/nls/locale.js
M client/galaxy/scripts/nls/zh/locale.js
A client/galaxy/scripts/onload.js
A client/galaxy/scripts/polyfills.js
R client/galaxy/scripts/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/rgenetics/helper_functions.js
R client/galaxy/scripts/rgenetics/timer.js
M client/galaxy/scripts/templates/compiled/panel_section.js
M client/galaxy/scripts/templates/compiled/tool_form.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/compiled/tool_search.js
R client/galaxy/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/tools/rgenetics/helper_functions.js
R client/galaxy/scripts/tools/rgenetics/timer.js
A client/galaxy/scripts/ui/autocom_tagging.js
A client/galaxy/scripts/ui/editable-text.js
A client/galaxy/scripts/ui/popupmenu.js
A client/galaxy/scripts/ui/scroll-panel.js
A client/galaxy/scripts/utils/async-save-text.js
M client/galaxy/scripts/utils/localization.js
M client/galaxy/scripts/utils/query-string-parsing.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/circster.js
M client/galaxy/scripts/viz/phyloviz.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/trackster/util.js
M client/galaxy/scripts/viz/visualization.js
M client/galaxy/style/less/base.less
M client/grunt-tasks/install-libs.js
M client/grunt-tasks/scripts.js
M client/grunt-tasks/templates.js
M client/package.json
A client/webpack.config.js
A config/dependency_resolvers_conf.xml.sample
M config/galaxy.ini.sample
M lib/galaxy/config.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/managers/users.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/wrapped.py
M lib/galaxy/tools/wrappers.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/tool_shed/galaxy_install/migrate/check.py
M run_tests.sh
A static/incompatible-browser.html
R static/maps/base.js.map
R static/maps/galaxy-app-base.js.map
R static/maps/galaxy.autocom_tagging.js.map
R static/maps/galaxy.base.js.map
R static/maps/galaxy.frame.js.map
A static/maps/galaxy.js.map
M static/maps/galaxy.library.js.map
R static/maps/galaxy.masthead.js.map
R static/maps/galaxy.menu.js.map
M static/maps/galaxy.pages.js.map
R static/maps/galaxy.panels.js.map
R static/maps/galaxy.tools.js.map
R static/maps/galaxy.ui.scrollPanel.js.map
R static/maps/galaxy.workflows.js.map
A static/maps/layout/masthead.js.map
A static/maps/layout/menu.js.map
A static/maps/layout/modal.js.map
A static/maps/layout/page.js.map
A static/maps/layout/panel.js.map
A static/maps/layout/scratchbook.js.map
R static/maps/libs/IE/IE7.js.map
R static/maps/libs/IE/IE8.js.map
R static/maps/libs/IE/excanvas.js.map
R static/maps/libs/IE/ie7-recalc.js.map
A static/maps/libs/backbone.js.map
A static/maps/libs/common-libs.js.map
A static/maps/mvc/annotation.js.map
R static/maps/mvc/annotations.js.map
R static/maps/mvc/app/app-analysis.js.map
R static/maps/mvc/app/app-login.js.map
R static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
R static/maps/mvc/collection/collection-panel-edit.js.map
R static/maps/mvc/collection/collection-panel.js.map
A static/maps/mvc/collection/collection-view-edit.js.map
A static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
R static/maps/mvc/data.js.map
A static/maps/mvc/dataset/data.js.map
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/grid/grid-view.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
R static/maps/mvc/history/history-panel-annotated.js.map
R static/maps/mvc/history/history-panel-edit-current.js.map
R static/maps/mvc/history/history-panel-edit.js.map
R static/maps/mvc/history/history-panel.js.map
A static/maps/mvc/history/history-view-annotated.js.map
A static/maps/mvc/history/history-view-edit-current.js.map
A static/maps/mvc/history/history-view-edit.js.map
A static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folder-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-library-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
A static/maps/mvc/list/list-view.js.map
A static/maps/mvc/tag.js.map
R static/maps/mvc/tags.js.map
A static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tool/tools-form-workflow.js.map
A static/maps/mvc/tool/tools-form.js.map
A static/maps/mvc/tool/tools-jobs.js.map
A static/maps/mvc/tool/tools-template.js.map
A static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools/tools-form-workflow.js.map
R static/maps/mvc/tools/tools-form.js.map
R static/maps/mvc/tools/tools-jobs.js.map
R static/maps/mvc/tools/tools-template.js.map
M static/maps/mvc/ui/ui-select-ftp.js.map
M static/maps/mvc/ui/ui-select-library.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-connector.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
A static/maps/onload.js.map
A static/maps/polyfills.js.map
R static/maps/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/rgenetics/helper_functions.js.map
R static/maps/rgenetics/timer.js.map
M static/maps/templates/compiled/panel_section.js.map
M static/maps/templates/compiled/tool_form.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/templates/compiled/tool_search.js.map
R static/maps/tools/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/tools/rgenetics/helper_functions.js.map
R static/maps/tools/rgenetics/timer.js.map
A static/maps/ui/autocom_tagging.js.map
A static/maps/ui/editable-text.js.map
A static/maps/ui/popupmenu.js.map
A static/maps/ui/scroll-panel.js.map
A static/maps/utils/async-save-text.js.map
M static/maps/utils/localization.js.map
M static/maps/utils/query-string-parsing.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/circster.js.map
M static/maps/viz/phyloviz.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/trackster/util.js.map
M static/maps/viz/visualization.js.map
R static/scripts/base.js
A static/scripts/bundled/analysis.bundled.js
A static/scripts/bundled/analysis.bundled.js.map
A static/scripts/bundled/libs.bundled.js
A static/scripts/bundled/libs.bundled.js.map
A static/scripts/bundled/login.bundled.js
A static/scripts/bundled/login.bundled.js.map
R static/scripts/galaxy-app-base.js
R static/scripts/galaxy.autocom_tagging.js
R static/scripts/galaxy.base.js
R static/scripts/galaxy.frame.js
A static/scripts/galaxy.js
M static/scripts/galaxy.library.js
R static/scripts/galaxy.masthead.js
R static/scripts/galaxy.menu.js
M static/scripts/galaxy.pages.js
R static/scripts/galaxy.panels.js
R static/scripts/galaxy.tools.js
R static/scripts/galaxy.ui.scrollPanel.js
R static/scripts/galaxy.workflows.js
A static/scripts/layout/masthead.js
A static/scripts/layout/menu.js
A static/scripts/layout/modal.js
A static/scripts/layout/page.js
A static/scripts/layout/panel.js
A static/scripts/layout/scratchbook.js
R static/scripts/libs/IE/IE7.js
R static/scripts/libs/IE/IE8.js
R static/scripts/libs/IE/blank.gif
R static/scripts/libs/IE/excanvas.js
R static/scripts/libs/IE/ie7-recalc.js
A static/scripts/libs/backbone.js
A static/scripts/libs/common-libs.js
A static/scripts/mvc/annotation.js
R static/scripts/mvc/annotations.js
R static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/app/app-login.js
R static/scripts/mvc/app/app-view.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
R static/scripts/mvc/collection/collection-panel-edit.js
R static/scripts/mvc/collection/collection-panel.js
A static/scripts/mvc/collection/collection-view-edit.js
A static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
R static/scripts/mvc/data.js
A static/scripts/mvc/dataset/data.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
R static/scripts/mvc/history/history-panel-annotated.js
R static/scripts/mvc/history/history-panel-edit-current.js
R static/scripts/mvc/history/history-panel-edit.js
A static/scripts/mvc/history/history-view-annotated.js
A static/scripts/mvc/history/history-view-edit-current.js
A static/scripts/mvc/history/history-view-edit.js
A static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folder-view.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-library-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-libraryrow-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
R static/scripts/mvc/list/list-panel.js
A static/scripts/mvc/list/list-view.js
A static/scripts/mvc/tag.js
R static/scripts/mvc/tags.js
A static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tool/tools-form-workflow.js
A static/scripts/mvc/tool/tools-form.js
A static/scripts/mvc/tool/tools-jobs.js
A static/scripts/mvc/tool/tools-template.js
A static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools/tools-form-workflow.js
R static/scripts/mvc/tools/tools-form.js
R static/scripts/mvc/tools/tools-jobs.js
R static/scripts/mvc/tools/tools-template.js
M static/scripts/mvc/ui/ui-select-ftp.js
M static/scripts/mvc/ui/ui-select-library.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/visualization/visualization-model.js
M static/scripts/mvc/workflow/workflow-connector.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
A static/scripts/onload.js
A static/scripts/polyfills.js
R static/scripts/rgenetics/checkbox_and_radiobutton.js
R static/scripts/rgenetics/helper_functions.js
R static/scripts/rgenetics/timer.js
M static/scripts/templates/compiled/panel_section.js
M static/scripts/templates/compiled/tool_form.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/templates/compiled/tool_search.js
R static/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R static/scripts/tools/rgenetics/helper_functions.js
R static/scripts/tools/rgenetics/timer.js
A static/scripts/ui/autocom_tagging.js
A static/scripts/ui/editable-text.js
A static/scripts/ui/popupmenu.js
A static/scripts/ui/scroll-panel.js
A static/scripts/utils/async-save-text.js
M static/scripts/utils/localization.js
M static/scripts/utils/query-string-parsing.js
M static/scripts/utils/utils.js
M static/scripts/viz/circster.js
M static/scripts/viz/phyloviz.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/trackster/util.js
M static/scripts/viz/visualization.js
M static/style/blue/base.css
R static/style/blue/galaxy.frame.masthead.css
M templates/base.mako
M templates/base/base_panels.mako
M templates/display_base.mako
M templates/galaxy_client_app.mako
M templates/grid_base.mako
A templates/js-app.mako
M templates/refresh_frames.mako
M templates/tagging_common.mako
M templates/user/logout.mako
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/edit_attributes.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M templates/webapps/galaxy/galaxy.panels.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
M templates/webapps/galaxy/library/common/ldda_edit_info.mako
M templates/webapps/galaxy/library/common/move_library_item.mako
M templates/webapps/galaxy/library/common/upload.mako
M templates/webapps/galaxy/page/editor.mako
M templates/webapps/galaxy/requests/common/create_request.mako
M templates/webapps/galaxy/requests/common/find_samples.mako
R templates/webapps/galaxy/root/index.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M templates/webapps/galaxy/visualization/sweepster.mako
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/galaxy/workflow/run.mako
M test/api/helpers.py
M test/api/test_jobs.py
M test/api/test_tools.py
M test/base/twilltestcase.py
M test/casperjs/api-history-permission-tests.js
M test/casperjs/spaceghost.js
M test/qunit/test-app.js
M test/qunit/test-common.js
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/test_data/1440_files/complex_dependency/tool_dependencies.xml
M test/unit/tools/test_actions.py
M test/unit/tools/test_data_parameters.py
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: 6126bd0e93e17c2d9cd6512ec068f806cc9da72d
https://github.com/galaxyproject/galaxy/commit/6126bd0e93e17c2d9cd6512ec068…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/managers/workflows.py
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-data.js
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
M test/api/workflows_format_2/interface.py
M test/api/workflows_format_2/main.py
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Merge pull request #1214 from jmchilton/format_2_1
Small enhancements in workflow inputs and outputs
Commit: 4d252119fd0057b9b9433a4d874784c86f96d42e
https://github.com/galaxyproject/galaxy/commit/4d252119fd0057b9b9433a4d8747…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/workflow/run.py
M test/unit/workflows/test_workflow_progress.py
Log Message:
-----------
Merge pull request #1216 from jmchilton/workflow_tweaks_1
More small workflow tweaks.
Commit: 4dc134d43bfa415cf3d1b77475dc0d4a3efb05b1
https://github.com/galaxyproject/galaxy/commit/4dc134d43bfa415cf3d1b77475dc…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M .gitignore
M README.rst
M client/GruntFile.js
A client/galaxy/scripts/apps/analysis.js
A client/galaxy/scripts/apps/history-panel.js
A client/galaxy/scripts/apps/login.js
A client/galaxy/scripts/apps/tool-panel.js
R client/galaxy/scripts/base.js
R client/galaxy/scripts/galaxy-app-base.js
R client/galaxy/scripts/galaxy.autocom_tagging.js
R client/galaxy/scripts/galaxy.base.js
R client/galaxy/scripts/galaxy.frame.js
A client/galaxy/scripts/galaxy.js
M client/galaxy/scripts/galaxy.library.js
R client/galaxy/scripts/galaxy.masthead.js
R client/galaxy/scripts/galaxy.menu.js
M client/galaxy/scripts/galaxy.pages.js
R client/galaxy/scripts/galaxy.panels.js
R client/galaxy/scripts/galaxy.tools.js
R client/galaxy/scripts/galaxy.ui.scrollPanel.js
A client/galaxy/scripts/layout/masthead.js
A client/galaxy/scripts/layout/menu.js
A client/galaxy/scripts/layout/modal.js
A client/galaxy/scripts/layout/page.js
A client/galaxy/scripts/layout/panel.js
A client/galaxy/scripts/layout/scratchbook.js
R client/galaxy/scripts/libs/IE/IE7.js
R client/galaxy/scripts/libs/IE/IE8.js
R client/galaxy/scripts/libs/IE/blank.gif
R client/galaxy/scripts/libs/IE/excanvas.js
R client/galaxy/scripts/libs/IE/ie7-recalc.js
A client/galaxy/scripts/libs/backbone.js
R client/galaxy/scripts/libs/backbone/backbone.js
M client/galaxy/scripts/libs/d3.js
A client/galaxy/scripts/mvc/annotation.js
R client/galaxy/scripts/mvc/annotations.js
R client/galaxy/scripts/mvc/app/app-login.js
R client/galaxy/scripts/mvc/app/app-view.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/collection-model.js
R client/galaxy/scripts/mvc/collection/collection-panel-edit.js
R client/galaxy/scripts/mvc/collection/collection-panel.js
A client/galaxy/scripts/mvc/collection/collection-view-edit.js
A client/galaxy/scripts/mvc/collection/collection-view.js
M client/galaxy/scripts/mvc/collection/list-collection-creator.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/collection/pair-collection-creator.js
R client/galaxy/scripts/mvc/data.js
A client/galaxy/scripts/mvc/dataset/data.js
M client/galaxy/scripts/mvc/dataset/dataset-choice.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/dataset/dataset-li.js
M client/galaxy/scripts/mvc/dataset/dataset-list.js
M client/galaxy/scripts/mvc/dataset/dataset-model.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/grid/grid-view.js
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/hda-model.js
M client/galaxy/scripts/mvc/history/hdca-li-edit.js
M client/galaxy/scripts/mvc/history/hdca-li.js
M client/galaxy/scripts/mvc/history/history-content-model.js
M client/galaxy/scripts/mvc/history/history-contents.js
M client/galaxy/scripts/mvc/history/history-model.js
R client/galaxy/scripts/mvc/history/history-panel-annotated.js
R client/galaxy/scripts/mvc/history/history-panel-edit-current.js
R client/galaxy/scripts/mvc/history/history-panel-edit.js
R client/galaxy/scripts/mvc/history/history-panel.js
A client/galaxy/scripts/mvc/history/history-view-annotated.js
A client/galaxy/scripts/mvc/history/history-view-edit-current.js
A client/galaxy/scripts/mvc/history/history-view-edit.js
A client/galaxy/scripts/mvc/history/history-view.js
M client/galaxy/scripts/mvc/history/multi-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/job/job-li.js
M client/galaxy/scripts/mvc/job/job-model.js
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folder-view.js
M client/galaxy/scripts/mvc/library/library-folderlist-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M client/galaxy/scripts/mvc/library/library-library-view.js
M client/galaxy/scripts/mvc/library/library-librarylist-view.js
M client/galaxy/scripts/mvc/library/library-libraryrow-view.js
M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js
M client/galaxy/scripts/mvc/library/library-model.js
R client/galaxy/scripts/mvc/list/list-panel.js
A client/galaxy/scripts/mvc/list/list-view.js
A client/galaxy/scripts/mvc/tag.js
R client/galaxy/scripts/mvc/tags.js
A client/galaxy/scripts/mvc/tool/tools-form-base.js
A client/galaxy/scripts/mvc/tool/tools-form-workflow.js
A client/galaxy/scripts/mvc/tool/tools-form.js
A client/galaxy/scripts/mvc/tool/tools-jobs.js
A client/galaxy/scripts/mvc/tool/tools-template.js
A client/galaxy/scripts/mvc/tool/tools.js
R client/galaxy/scripts/mvc/tools.js
M client/galaxy/scripts/mvc/ui/ui-buttons.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/ui/ui-select-ftp.js
M client/galaxy/scripts/mvc/ui/ui-select-library.js
M client/galaxy/scripts/mvc/upload/upload-ftp.js
M client/galaxy/scripts/mvc/upload/upload-view.js
M client/galaxy/scripts/mvc/user/user-model.js
M client/galaxy/scripts/mvc/visualization/visualization-model.js
M client/galaxy/scripts/mvc/workflow/workflow-connector.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/nls/ja/locale.js
M client/galaxy/scripts/nls/locale.js
M client/galaxy/scripts/nls/zh/locale.js
A client/galaxy/scripts/onload.js
A client/galaxy/scripts/polyfills.js
R client/galaxy/scripts/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/rgenetics/helper_functions.js
R client/galaxy/scripts/rgenetics/timer.js
M client/galaxy/scripts/templates/compiled/panel_section.js
M client/galaxy/scripts/templates/compiled/tool_form.js
M client/galaxy/scripts/templates/compiled/tool_link.js
M client/galaxy/scripts/templates/compiled/tool_search.js
R client/galaxy/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R client/galaxy/scripts/tools/rgenetics/helper_functions.js
R client/galaxy/scripts/tools/rgenetics/timer.js
A client/galaxy/scripts/ui/autocom_tagging.js
A client/galaxy/scripts/ui/editable-text.js
A client/galaxy/scripts/ui/popupmenu.js
A client/galaxy/scripts/ui/scroll-panel.js
A client/galaxy/scripts/utils/async-save-text.js
M client/galaxy/scripts/utils/localization.js
M client/galaxy/scripts/utils/query-string-parsing.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/scripts/viz/circster.js
M client/galaxy/scripts/viz/phyloviz.js
M client/galaxy/scripts/viz/sweepster.js
M client/galaxy/scripts/viz/trackster.js
M client/galaxy/scripts/viz/trackster/tracks.js
M client/galaxy/scripts/viz/trackster/util.js
M client/galaxy/scripts/viz/visualization.js
M client/galaxy/style/less/base.less
M client/grunt-tasks/install-libs.js
M client/grunt-tasks/scripts.js
M client/grunt-tasks/style.js
M client/grunt-tasks/templates.js
M client/package.json
M client/toolshed/scripts/mvc/groups/group-detail-view.js
M client/toolshed/scripts/mvc/groups/group-listrow-view.js
A client/webpack.config.js
M config/datatypes_conf.xml.sample
A config/dependency_resolvers_conf.xml.sample
M config/galaxy.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample
A config/plugins/interactive_environments/bam_iobio/config/bam_iobio.xml
A config/plugins/interactive_environments/bam_iobio/static/js/bam_iobio.js
A config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
M config/plugins/interactive_environments/common/templates/ie.mako
M config/plugins/interactive_environments/ipython/config/ipython.ini.sample
M config/plugins/interactive_environments/ipython/static/js/ipython.js
M config/plugins/interactive_environments/rstudio/static/js/rstudio.js
M config/plugins/visualizations/charts/templates/charts.mako
A config/reports.ini.sample
R config/reports_wsgi.ini.sample
M config/tool_shed.ini.sample
M doc/source/admin/interactive_environments.rst
A doc/source/releases/15.10.rst
M doc/source/releases/15.10_announce.rst
A doc/source/releases/16.01_announce.rst
M lib/galaxy/config.py
M lib/galaxy/datatypes/binary.py
M lib/galaxy/datatypes/data.py
M lib/galaxy/datatypes/graph.py
M lib/galaxy/datatypes/interval.py
M lib/galaxy/datatypes/proteomics.py
M lib/galaxy/datatypes/registry.py
M lib/galaxy/datatypes/sniff.py
A lib/galaxy/datatypes/test/test.idpDB
A lib/galaxy/datatypes/test/test.mz5
M lib/galaxy/datatypes/text.py
A lib/galaxy/datatypes/triples.py
M lib/galaxy/dependencies/requirements.txt
M lib/galaxy/jobs/__init__.py
M lib/galaxy/jobs/output_checker.py
M lib/galaxy/jobs/runners/__init__.py
M lib/galaxy/jobs/runners/pulsar.py
M lib/galaxy/managers/collections.py
M lib/galaxy/managers/configuration.py
M lib/galaxy/managers/users.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/security/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.py
M lib/galaxy/tools/evaluation.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/wrapped.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/test.py
M lib/galaxy/tools/wrappers.py
M lib/galaxy/util/xml_macros.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/web/base/controllers/admin.py
M lib/galaxy/web/base/interactive_environments.py
M lib/galaxy/web/framework/webapp.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/buildapp.py
M lib/galaxy/webapps/galaxy/controllers/admin.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/dataset.py
M lib/galaxy/webapps/galaxy/controllers/external_service.py
M lib/galaxy/webapps/galaxy/controllers/forms.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M lib/galaxy/webapps/galaxy/controllers/library.py
M lib/galaxy/webapps/galaxy/controllers/library_admin.py
M lib/galaxy/webapps/galaxy/controllers/request_type.py
M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
M lib/galaxy/webapps/galaxy/controllers/requests_common.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/visualization.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/reports/controllers/jobs.py
M lib/galaxy/webapps/reports/controllers/sample_tracking.py
M lib/galaxy/webapps/reports/controllers/workflows.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/galaxy/workflow/extract.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M lib/tool_shed/galaxy_install/migrate/check.py
M lib/tool_shed/grids/admin_grids.py
M lib/tool_shed/grids/repository_grids.py
M lib/tool_shed/grids/repository_review_grids.py
M lib/tool_shed/util/common_util.py
M lib/tool_shed/util/hg_util.py
M lib/tool_shed/util/shed_util_common.py
M run_reports.sh
M run_tests.sh
M scripts/bootstrap_history.py
M scripts/functional_tests.py
M scripts/sync_reports_config.py
A static/incompatible-browser.html
R static/maps/base.js.map
R static/maps/galaxy.autocom_tagging.js.map
R static/maps/galaxy.base.js.map
R static/maps/galaxy.frame.js.map
A static/maps/galaxy.js.map
M static/maps/galaxy.library.js.map
R static/maps/galaxy.masthead.js.map
R static/maps/galaxy.menu.js.map
M static/maps/galaxy.pages.js.map
R static/maps/galaxy.panels.js.map
R static/maps/galaxy.tools.js.map
R static/maps/galaxy.ui.scrollPanel.js.map
R static/maps/galaxy.workflows.js.map
A static/maps/layout/masthead.js.map
A static/maps/layout/menu.js.map
A static/maps/layout/modal.js.map
A static/maps/layout/page.js.map
A static/maps/layout/panel.js.map
A static/maps/layout/scratchbook.js.map
R static/maps/libs/IE/IE7.js.map
R static/maps/libs/IE/IE8.js.map
R static/maps/libs/IE/excanvas.js.map
R static/maps/libs/IE/ie7-recalc.js.map
A static/maps/libs/backbone.js.map
A static/maps/libs/common-libs.js.map
A static/maps/mvc/annotation.js.map
R static/maps/mvc/annotations.js.map
R static/maps/mvc/app/app-login.js.map
R static/maps/mvc/app/app-view.js.map
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/collection-model.js.map
R static/maps/mvc/collection/collection-panel-edit.js.map
R static/maps/mvc/collection/collection-panel.js.map
A static/maps/mvc/collection/collection-view-edit.js.map
A static/maps/mvc/collection/collection-view.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
R static/maps/mvc/data.js.map
A static/maps/mvc/dataset/data.js.map
M static/maps/mvc/dataset/dataset-choice.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/dataset/dataset-li.js.map
M static/maps/mvc/dataset/dataset-list.js.map
M static/maps/mvc/dataset/dataset-model.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/grid/grid-view.js.map
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/hdca-li-edit.js.map
M static/maps/mvc/history/hdca-li.js.map
M static/maps/mvc/history/history-content-model.js.map
M static/maps/mvc/history/history-contents.js.map
M static/maps/mvc/history/history-model.js.map
R static/maps/mvc/history/history-panel-annotated.js.map
R static/maps/mvc/history/history-panel-edit-current.js.map
R static/maps/mvc/history/history-panel-edit.js.map
R static/maps/mvc/history/history-panel.js.map
A static/maps/mvc/history/history-view-annotated.js.map
A static/maps/mvc/history/history-view-edit-current.js.map
A static/maps/mvc/history/history-view-edit.js.map
A static/maps/mvc/history/history-view.js.map
M static/maps/mvc/history/multi-panel.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/job/job-model.js.map
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folder-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/maps/mvc/library/library-library-view.js.map
M static/maps/mvc/library/library-librarytoolbar-view.js.map
M static/maps/mvc/library/library-model.js.map
M static/maps/mvc/list/list-panel.js.map
A static/maps/mvc/list/list-view.js.map
A static/maps/mvc/tag.js.map
R static/maps/mvc/tags.js.map
A static/maps/mvc/tool/tools-form-base.js.map
A static/maps/mvc/tool/tools-form-workflow.js.map
A static/maps/mvc/tool/tools-form.js.map
A static/maps/mvc/tool/tools-jobs.js.map
A static/maps/mvc/tool/tools-template.js.map
A static/maps/mvc/tool/tools.js.map
A static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-buttons.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/ui/ui-select-ftp.js.map
M static/maps/mvc/ui/ui-select-library.js.map
M static/maps/mvc/upload/upload-ftp.js.map
M static/maps/mvc/upload/upload-view.js.map
M static/maps/mvc/user/user-model.js.map
M static/maps/mvc/visualization/visualization-model.js.map
M static/maps/mvc/workflow/workflow-connector.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
A static/maps/onload.js.map
A static/maps/polyfills.js.map
R static/maps/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/rgenetics/helper_functions.js.map
R static/maps/rgenetics/timer.js.map
M static/maps/templates/compiled/panel_section.js.map
M static/maps/templates/compiled/tool_form.js.map
M static/maps/templates/compiled/tool_link.js.map
M static/maps/templates/compiled/tool_search.js.map
R static/maps/tools/rgenetics/checkbox_and_radiobutton.js.map
R static/maps/tools/rgenetics/helper_functions.js.map
R static/maps/tools/rgenetics/timer.js.map
A static/maps/ui/autocom_tagging.js.map
A static/maps/ui/editable-text.js.map
A static/maps/ui/popupmenu.js.map
A static/maps/ui/scroll-panel.js.map
A static/maps/utils/async-save-text.js.map
M static/maps/utils/localization.js.map
M static/maps/utils/query-string-parsing.js.map
M static/maps/utils/utils.js.map
M static/maps/viz/circster.js.map
M static/maps/viz/phyloviz.js.map
M static/maps/viz/sweepster.js.map
M static/maps/viz/trackster.js.map
M static/maps/viz/trackster/tracks.js.map
M static/maps/viz/trackster/util.js.map
M static/maps/viz/visualization.js.map
R static/scripts/base.js
A static/scripts/bundled/analysis.bundled.js
A static/scripts/bundled/analysis.bundled.js.map
A static/scripts/bundled/libs.bundled.js
A static/scripts/bundled/libs.bundled.js.map
A static/scripts/bundled/login.bundled.js
A static/scripts/bundled/login.bundled.js.map
R static/scripts/galaxy-app-base.js
R static/scripts/galaxy.autocom_tagging.js
R static/scripts/galaxy.base.js
R static/scripts/galaxy.frame.js
A static/scripts/galaxy.js
M static/scripts/galaxy.library.js
R static/scripts/galaxy.masthead.js
R static/scripts/galaxy.menu.js
M static/scripts/galaxy.pages.js
R static/scripts/galaxy.panels.js
R static/scripts/galaxy.tools.js
R static/scripts/galaxy.ui.scrollPanel.js
R static/scripts/galaxy.workflows.js
A static/scripts/layout/masthead.js
A static/scripts/layout/menu.js
A static/scripts/layout/modal.js
A static/scripts/layout/page.js
A static/scripts/layout/panel.js
A static/scripts/layout/scratchbook.js
R static/scripts/libs/IE/IE7.js
R static/scripts/libs/IE/IE8.js
R static/scripts/libs/IE/blank.gif
R static/scripts/libs/IE/excanvas.js
R static/scripts/libs/IE/ie7-recalc.js
A static/scripts/libs/backbone.js
A static/scripts/libs/common-libs.js
A static/scripts/mvc/annotation.js
R static/scripts/mvc/annotations.js
R static/scripts/mvc/app/app-login.js
R static/scripts/mvc/app/app-view.js
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/collection-model.js
R static/scripts/mvc/collection/collection-panel-edit.js
R static/scripts/mvc/collection/collection-panel.js
A static/scripts/mvc/collection/collection-view-edit.js
A static/scripts/mvc/collection/collection-view.js
M static/scripts/mvc/collection/list-collection-creator.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/collection/pair-collection-creator.js
R static/scripts/mvc/data.js
A static/scripts/mvc/dataset/data.js
M static/scripts/mvc/dataset/dataset-choice.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/dataset/dataset-li.js
M static/scripts/mvc/dataset/dataset-list.js
M static/scripts/mvc/dataset/dataset-model.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/hdca-li-edit.js
M static/scripts/mvc/history/hdca-li.js
M static/scripts/mvc/history/history-content-model.js
M static/scripts/mvc/history/history-contents.js
M static/scripts/mvc/history/history-model.js
R static/scripts/mvc/history/history-panel-annotated.js
R static/scripts/mvc/history/history-panel-edit-current.js
R static/scripts/mvc/history/history-panel-edit.js
M static/scripts/mvc/history/history-panel.js
A static/scripts/mvc/history/history-view-annotated.js
A static/scripts/mvc/history/history-view-edit-current.js
A static/scripts/mvc/history/history-view-edit.js
A static/scripts/mvc/history/history-view.js
M static/scripts/mvc/history/multi-panel.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/job/job-li.js
M static/scripts/mvc/job/job-model.js
M static/scripts/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folder-view.js
M static/scripts/mvc/library/library-folderlist-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M static/scripts/mvc/library/library-library-view.js
M static/scripts/mvc/library/library-librarylist-view.js
M static/scripts/mvc/library/library-libraryrow-view.js
M static/scripts/mvc/library/library-librarytoolbar-view.js
M static/scripts/mvc/library/library-model.js
R static/scripts/mvc/list/list-panel.js
A static/scripts/mvc/list/list-view.js
A static/scripts/mvc/tag.js
R static/scripts/mvc/tags.js
A static/scripts/mvc/tool/tools-form-base.js
A static/scripts/mvc/tool/tools-form-workflow.js
A static/scripts/mvc/tool/tools-form.js
A static/scripts/mvc/tool/tools-jobs.js
A static/scripts/mvc/tool/tools-template.js
A static/scripts/mvc/tool/tools.js
A static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-buttons.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/ui/ui-select-ftp.js
M static/scripts/mvc/ui/ui-select-library.js
M static/scripts/mvc/upload/upload-ftp.js
M static/scripts/mvc/upload/upload-view.js
M static/scripts/mvc/user/user-model.js
M static/scripts/mvc/visualization/visualization-model.js
M static/scripts/mvc/workflow/workflow-connector.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
A static/scripts/onload.js
A static/scripts/polyfills.js
R static/scripts/rgenetics/checkbox_and_radiobutton.js
R static/scripts/rgenetics/helper_functions.js
R static/scripts/rgenetics/timer.js
M static/scripts/templates/compiled/panel_section.js
M static/scripts/templates/compiled/tool_form.js
M static/scripts/templates/compiled/tool_link.js
M static/scripts/templates/compiled/tool_search.js
R static/scripts/tools/rgenetics/checkbox_and_radiobutton.js
R static/scripts/tools/rgenetics/helper_functions.js
R static/scripts/tools/rgenetics/timer.js
A static/scripts/ui/autocom_tagging.js
A static/scripts/ui/editable-text.js
A static/scripts/ui/popupmenu.js
A static/scripts/ui/scroll-panel.js
A static/scripts/utils/async-save-text.js
M static/scripts/utils/localization.js
M static/scripts/utils/query-string-parsing.js
M static/scripts/utils/utils.js
M static/scripts/viz/circster.js
M static/scripts/viz/phyloviz.js
M static/scripts/viz/sweepster.js
M static/scripts/viz/trackster.js
M static/scripts/viz/trackster/tracks.js
M static/scripts/viz/trackster/util.js
M static/scripts/viz/visualization.js
M static/style/blue/autocomplete_tagging.css
M static/style/blue/base.css
M static/style/blue/embed_item.css
R static/style/blue/galaxy.frame.masthead.css
M static/style/blue/iphone.css
M static/style/blue/library.css
M static/style/blue/trackster.css
M templates/base.mako
M templates/base/base_panels.mako
M templates/display_base.mako
M templates/galaxy_client_app.mako
M templates/grid_base.mako
A templates/js-app.mako
M templates/refresh_frames.mako
M templates/tagging_common.mako
M templates/user/logout.mako
M templates/webapps/galaxy/dataset/display.mako
M templates/webapps/galaxy/dataset/edit_attributes.mako
M templates/webapps/galaxy/dataset/tabular_chunked.mako
M templates/webapps/galaxy/galaxy.masthead.mako
M templates/webapps/galaxy/galaxy.panels.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/history/view_multiple.mako
M templates/webapps/galaxy/library/common/ldda_edit_info.mako
M templates/webapps/galaxy/library/common/move_library_item.mako
M templates/webapps/galaxy/library/common/upload.mako
M templates/webapps/galaxy/page/editor.mako
M templates/webapps/galaxy/requests/common/create_request.mako
M templates/webapps/galaxy/requests/common/find_samples.mako
R templates/webapps/galaxy/root/index.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M templates/webapps/galaxy/visualization/sweepster.mako
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/galaxy/workflow/run.mako
M templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
M test/api/helpers.py
M test/api/test_jobs.py
M test/api/test_tools.py
M test/api/test_workflow_extraction.py
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
A test/api/workflows_format_2/README.txt
A test/api/workflows_format_2/__init__.py
A test/api/workflows_format_2/converter.py
A test/api/workflows_format_2/interface.py
A test/api/workflows_format_2/main.py
R test/api/yaml_to_workflow.py
M test/base/twilltestcase.py
M test/casperjs/api-history-permission-tests.js
M test/casperjs/spaceghost.js
A test/functional/tools/cheetah_problem_syntax_error.xml
A test/functional/tools/cheetah_problem_unbound_var.xml
A test/functional/tools/cheetah_problem_unbound_var_input.xml
A test/functional/tools/collection_type_source.xml
A test/functional/tools/create_10.xml
A test/functional/tools/maxseconds.xml
A test/functional/tools/output_format_collection.xml
M test/functional/tools/samples_tool_conf.xml
M test/functional/tools/simple_constructs.yml
M test/qunit/package.json
M test/qunit/test-app.js
M test/qunit/test-common.js
M test/qunit/test-data/bootstrapped.js
M test/qunit/tests/galaxy-app-base.js
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/test_data/1440_files/complex_dependency/tool_dependencies.xml
M test/unit/test_galaxy_mapping.py
M test/unit/tools/test_actions.py
M test/unit/tools/test_data_parameters.py
M test/unit/tools/test_parsing.py
M test/unit/tools/test_tool_loader.py
M test/unit/workflows/test_render.py
A test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004
Commit: 8e5b8016c6684e2364ba14b9061b0d5a2d218eb1
https://github.com/galaxyproject/galaxy/commit/8e5b8016c6684e2364ba14b9061b…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
R client/galaxy/scripts/mvc/app/app-analysis.js
R static/maps/mvc/app/app-analysis.js.map
Log Message:
-----------
Remove files
Commit: 7e5069baff533ba61fef3f8f6fc46ecab565a9c6
https://github.com/galaxyproject/galaxy/commit/7e5069baff533ba61fef3f8f6fc4…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
R client/galaxy/scripts/mvc/tool/tools-form-base.js
R client/galaxy/scripts/mvc/tool/tools-form-workflow.js
R client/galaxy/scripts/mvc/tool/tools-form.js
R client/galaxy/scripts/mvc/tool/tools-jobs.js
R client/galaxy/scripts/mvc/tool/tools-template.js
R static/maps/mvc/tool/tools-form-base.js.map
R static/maps/mvc/tool/tools-form-workflow.js.map
R static/maps/mvc/tool/tools-form.js.map
R static/maps/mvc/tool/tools-jobs.js.map
R static/maps/mvc/tool/tools-template.js.map
R static/maps/mvc/tools/tools-form-base.js.map
R static/scripts/mvc/tool/tools-form-base.js
R static/scripts/mvc/tool/tools-form-workflow.js
R static/scripts/mvc/tool/tools-form.js
R static/scripts/mvc/tool/tools-jobs.js
R static/scripts/mvc/tool/tools-template.js
R static/scripts/mvc/tools/tools-form-base.js
Log Message:
-----------
Remove files
Commit: 0f9cb1478f81d512d4232b42cf490b8022b3a420
https://github.com/galaxyproject/galaxy/commit/0f9cb1478f81d512d4232b42cf49…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M static/style/blue/base.css
Log Message:
-----------
Repack files
Commit: df6470654411bfa8ce997f932e92b4c2d644c685
https://github.com/galaxyproject/galaxy/commit/df6470654411bfa8ce997f932e92…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M test/api/helpers.py
Log Message:
-----------
Merge pull request #1237 from jmchilton/test_jobs_fix
Fix missing assertion pointed out @nsoranzo.
Commit: fef8ce2a762b82480d5f7304c345cc3168e10036
https://github.com/galaxyproject/galaxy/commit/fef8ce2a762b82480d5f7304c345…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M test/functional/tools/maxseconds.xml
Log Message:
-----------
Merge pull request #1248 from jmchilton/maxseconds_debug_2
Attempt to fix transiently failing tool test on Jenkins
Commit: e12179b0160d242be870b15b8da5a46e294063bf
https://github.com/galaxyproject/galaxy/commit/e12179b0160d242be870b15b8da5…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/constructive_solid_geometry.py
Log Message:
-----------
Merge pull request #1211 from gregvonkuster/dev
Enhance the VTK datatypes to support cell data in addition to point
Commit: 91d348a73fd49453c9cde5fb6116c3b230a2f162
https://github.com/galaxyproject/galaxy/commit/91d348a73fd49453c9cde5fb6116…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Merge pull request #1247 from jmchilton/editor_refactor
Refactor generic side workflow editor panel toward backbone.
Commit: e29f7155c479365ede4a69513e729fa1bc67c369
https://github.com/galaxyproject/galaxy/commit/e29f7155c479365ede4a69513e72…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
R static/maps/mvc/tools.js.map
R static/scripts/mvc/app/app-analysis.js
R static/scripts/mvc/tools.js
Log Message:
-----------
Remove files
Commit: 6820b29d3b867b452205c275f274449fb55c8119
https://github.com/galaxyproject/galaxy/commit/6820b29d3b867b452205c275f274…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-05 (Sat, 05 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/datatypes/constructive_solid_geometry.py
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
M test/api/helpers.py
M test/functional/tools/maxseconds.xml
Log Message:
-----------
Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004
Commit: b11002bef32d83b058e3495f96695c8dc12cb91b
https://github.com/galaxyproject/galaxy/commit/b11002bef32d83b058e3495f9669…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Don't iterate over unused key.
Thanks to @bgruening.
Commit: 2aa7f04364e10e46c655de636925883a43698694
https://github.com/galaxyproject/galaxy/commit/2aa7f04364e10e46c655de636925…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Replace __rip_value with dict.pop.
Thanks @bgruening.
Commit: 98249058e85d8133748519ac59ebed96a28a77ac
https://github.com/galaxyproject/galaxy/commit/98249058e85d8133748519ac59eb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/workflow/run.py
Log Message:
-----------
Cleanup error message.
Thanks @bgruening.
Commit: f17a6c996a060f68bc8a250effa23f60b96b44a7
https://github.com/galaxyproject/galaxy/commit/f17a6c996a060f68bc8a250effa2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/managers/base.py
M lib/galaxy/web/base/controller.py
Log Message:
-----------
Synchronize decoding ids across base controller and manager base.
To ensure we have the same kind of exception thrown in both cases.
Commit: f6d26c9ee6f148fd033d1b070c2dbe8c69b08fa8
https://github.com/galaxyproject/galaxy/commit/f6d26c9ee6f148fd033d1b070c2d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/workflow/modules.py
M test/unit/workflows/test_modules.py
Log Message:
-----------
Small refactor making workflow views and modules tad more generic.
- Reduce duplication between initializing generic modules and tool modules.
- Switch tool_id to content_id as variable names throughout the client.
- Rename get_tool_id to get_content_id on workflow modules.
- Add some minimal documentation to the workflow module about get_content_id.
Downstream in the subworkflow commit I switch the over-the-wire communication to use content_id instead of tool_id also and use content_ids to refer to workflow ids in subworkflow moduls.
Commit: 73bfbf016347f764a0747ad7c6d138c74b6f519d
https://github.com/galaxyproject/galaxy/commit/73bfbf016347f764a0747ad7c6d1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/webapps/galaxy/api/workflows.py
Log Message:
-----------
Refactor some workflow API code into workflows manager.
This allows for reuse outside of the API controller, such as loading subworkflows downstream.
Commit: f92220a74f216d937dc5b147472261d154779512
https://github.com/galaxyproject/galaxy/commit/f92220a74f216d937dc5b1474722…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Allow workflow outputs on non-tool steps.
Commit: d18c75ceb875632f9e68a74ebeb88389262d6fa8
https://github.com/galaxyproject/galaxy/commit/d18c75ceb875632f9e68a74ebeb8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor_generic_form.mako
Log Message:
-----------
Bring gneric and tool module styles into alignment in workflow editor.
Commit: d7ac52f6bb61fe360198f91310a3e22076183d7b
https://github.com/galaxyproject/galaxy/commit/d7ac52f6bb61fe360198f91310a3…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Add icons to existing workflow steps in workflow editor.
Tools have an icon there.
Commit: e3161b4671e9fb19a47c7f341e3fb46617111a9e
https://github.com/galaxyproject/galaxy/commit/e3161b4671e9fb19a47c7f341e3f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/workflow/modules.py
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor_generic_form.mako
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Add support for workflow step labels in editor.
- If a step has a label, display it in the step editor side panel title.
- Allow clicking the title to change the label.
- Display the label (if set) as the workflow node box title.
- Add icon to workflow node since the title might not be related to type anymore.
- Enforce unique labels accross the workflow in the editor.
- Qunit test cases for some of this behavior and other recent changes.
Commit: 563e363478258cb1d08802e16586c42efe511e6a
https://github.com/galaxyproject/galaxy/commit/563e363478258cb1d08802e16586…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/managers/histories.py
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool optimization - don't set state to queued twice.
Just keep the dataset in the correct NEW state until it has actually been queued. Addresses FIXME comment added by James 7 years ago in https://github.com/galaxyproject/galaxy/commit/4c3db1af95fb0520960046ae5494….
This behavior feels correct to me, but it does have ramifications in the GUI. I had previously never actually seen a dataset in the "NEW" state.
Saves an extra flush per dataset, on sqlite this translates to 50ms per dataset for me.
Commit: 0ac7c33522cfeb51b89ec8d14fbb2d716f956450
https://github.com/galaxyproject/galaxy/commit/0ac7c33522cfeb51b89ec8d14fbb…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool optimization and comment improvement.
Commit: 2b8a1423f7e9ae6bdf09571b8992493dc30e035c
https://github.com/galaxyproject/galaxy/commit/2b8a1423f7e9ae6bdf09571b8992…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool optimization - remove another seemingly needless flush.
Saves around a teenth of a second per job.
Before:
- galaxy.tools.execute DEBUG 2015-12-01 13:00:56,984 Tool [cat1] created job [24] (435.468 ms)
- galaxy.tools.execute DEBUG 2015-12-01 13:01:17,296 Tool [cat1] created job [25] (341.687 ms)
- galaxy.tools.execute DEBUG 2015-12-01 13:01:32,896 Tool [cat1] created job [26] (354.138 ms)
After -
- galaxy.tools.execute DEBUG 2015-12-01 12:58:51,154 Tool [cat1] created job [21] (261.932 ms)
- galaxy.tools.execute DEBUG 2015-12-01 12:59:11,354 Tool [cat1] created job [22] (278.699 ms)
- galaxy.tools.execute DEBUG 2015-12-01 12:59:43,105 Tool [cat1] created job [23] (296.438 ms)
Commit: 81799bd3a72b3e704be6c12e89b85eb5bd077428
https://github.com/galaxyproject/galaxy/commit/81799bd3a72b3e704be6c12e89b8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
Log Message:
-----------
Micro-optimizations for adding many datasets to history...
... during tool execution. Build method once instead of in each function call, use imap instead of map since we don't need a list, remove some duplicated checks. Frankly this is all stuff Python is probably doing anyway - but in case it doesn't and just so the eye doesn't jump to these optimizations again.
Timings before and after for a section of tool action execute that includes this additon show that this might have a small effect.
Before:
- galaxy.tools.actions INFO 2015-12-01 13:11:39,446 Add outputs to history (127.379 ms)
- galaxy.tools.actions INFO 2015-12-01 13:12:06,598 Add outputs to history (137.029 ms)
- galaxy.tools.actions INFO 2015-12-01 13:12:23,931 Add outputs to history (118.489 ms)
After:
- galaxy.tools.actions INFO 2015-12-01 13:13:09,999 Add outputs to history (99.456 ms)
- galaxy.tools.actions INFO 2015-12-01 13:13:38,573 Add outputs to history (126.131 ms)
- galaxy.tools.actions INFO 2015-12-01 13:13:54,538 Add outputs to history (137.643 ms)
- galaxy.tools.actions INFO 2015-12-01 13:14:12,516 Add outputs to history (101.451 ms)
Commit: bd6a34e279f8d612185fe9d8aa27084efe246e2d
https://github.com/galaxyproject/galaxy/commit/bd6a34e279f8d612185fe9d8aa27…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool optimization comments for future reference.
Including replacing a log statement with a comment.
Commit: 59c3acfbf56e14c8f691946932be71b81774de0e
https://github.com/galaxyproject/galaxy/commit/59c3acfbf56e14c8f691946932be…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool execution optimization - remove another unneeded flush.
Flush the job and its output datasets all at the same time in one transaction.
Inuitively it makes sense that this should work and the timings seem to improve, triming another quater or third of the submission time per job.
Before:
- galaxy.tools.execute DEBUG 2015-12-01 12:58:51,154 Tool [cat1] created job [21] (261.932 ms)
- galaxy.tools.execute DEBUG 2015-12-01 12:59:11,354 Tool [cat1] created job [22] (278.699 ms)
- galaxy.tools.execute DEBUG 2015-12-01 12:59:43,105 Tool [cat1] created job [23] (296.438 ms)
After:
- galaxy.tools.execute DEBUG 2015-12-01 13:22:00,649 Tool [cat1] created job [39] (265.547 ms)
- galaxy.tools.execute DEBUG 2015-12-01 13:22:27,720 Tool [cat1] created job [40] (214.905 ms)
- galaxy.tools.execute DEBUG 2015-12-01 13:21:40,225 Tool [cat1] created job [38] (198.936 ms)
- galaxy.tools.execute DEBUG 2015-12-01 13:22:44,076 Tool [cat1] created job [41] (213.096 ms)
Commit: 3bf466c8f5d554f583dfc2fe8f7b95397278b2d9
https://github.com/galaxyproject/galaxy/commit/3bf466c8f5d554f583dfc2fe8f7b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Micro optimization in tool execute - eliminate repeated trans.app fetch.
Commit: e72604be7c0c0a88c6267140b6433fcde88f1d01
https://github.com/galaxyproject/galaxy/commit/e72604be7c0c0a88c6267140b643…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/upload.py
Log Message:
-----------
Instrument upload action for timing.
- Checked and cleanup datasets ~500ms
- Create job ~200ms
- Persisting ~20 ms
Commit: 2c6819cd87520fb43f4ebea96eea5fb151787edb
https://github.com/galaxyproject/galaxy/commit/2c6819cd87520fb43f4ebea96eea…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Tool optimization - eliminate repeated role generation.
For cat1 with 5 inputs - this shaves about 100 ms off of job execution time.
Before:
galaxy.tools.execute DEBUG 2015-12-01 15:08:56,745 Tool [cat1] created job [171] (545.776 ms)
galaxy.tools.execute DEBUG 2015-12-01 15:08:31,871 Tool [cat1] created job [170] (478.813 ms)
After :
galaxy.tools.execute DEBUG 2015-12-01 15:07:11,401 Tool [cat1] created job [168] (371.722 ms)
galaxy.tools.execute DEBUG 2015-12-01 15:07:42,060 Tool [cat1] created job [169] (333.296 ms)
Commit: 836b0dfc1504357b738375b109b22243dd58efe7
https://github.com/galaxyproject/galaxy/commit/836b0dfc1504357b738375b109b2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/execute.py
Log Message:
-----------
Fix location of timer generation for fairer comparison in next commit.
Commit: c14c45be46a4a3b08b3cb0b5132cbbdf151d5100
https://github.com/galaxyproject/galaxy/commit/c14c45be46a4a3b08b3cb0b5132c…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
M test/unit/tools/test_execution.py
Log Message:
-----------
Further cache user roles across batched tool executions.
Commit: 53354c7e361cc769f42c7eae42de0eca1769e9a4
https://github.com/galaxyproject/galaxy/commit/53354c7e361cc769f42c7eae42de…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Fix collection output for less flushing in tool action handle_output.
Commit: ab651fa89c0e24d637daa8bd5716b3932532c6a3
https://github.com/galaxyproject/galaxy/commit/ab651fa89c0e24d637daa8bd5716…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M client/galaxy/scripts/mvc/tool/tool-form.js
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/maps/mvc/tool/tool-form.js.map
M static/maps/utils/utils.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/tool/tool-form-workflow.js
M static/scripts/mvc/tool/tool-form.js
M static/scripts/utils/utils.js
Log Message:
-----------
Fix url, lint and packing
Catch missing history, fix failing api test
Commit: b55635f71b7fd3bba8393a3c267408d6dd248f99
https://github.com/galaxyproject/galaxy/commit/b55635f71b7fd3bba8393a3c2674…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M lib/galaxy/managers/configuration.py
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Client, upload: fix passing of nginx_upload_path and ftp_upload_site to upload-view, fix default nginx_upload_path in configuration serializer
Commit: 00452e1b8aecd3ed2fc4c06262f451c9efafa1c6
https://github.com/galaxyproject/galaxy/commit/00452e1b8aecd3ed2fc4c06262f4…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Add more specific error message for workflow parameters
Commit: beb4a67fb0a4b879b732fd05b35d03019481ea90
https://github.com/galaxyproject/galaxy/commit/beb4a67fb0a4b879b732fd05b35d…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M lib/galaxy/managers/configuration.py
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Merge pull request #1250 from carlfeberhard/fix.upload
Client, upload: fix passing of nginx_upload_path and ftp_upload_site …
Commit: a951d34c703a239ac00c780025a9657bc7101b0b
https://github.com/galaxyproject/galaxy/commit/a951d34c703a239ac00c780025a9…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M lib/galaxy/managers/configuration.py
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004
Commit: 4fe36f8d6a151536267e3aeace2414cc148e18e8
https://github.com/galaxyproject/galaxy/commit/4fe36f8d6a151536267e3aeace24…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/managers/histories.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/actions/upload.py
M lib/galaxy/tools/execute.py
M test/unit/tools/test_execution.py
Log Message:
-----------
Merge pull request #1199 from jmchilton/tool_opts_4
Yet More Tool Execution Optimizations
Commit: 3a023f4cae6b9b6b25c1d389b9ba2ad7223cb24a
https://github.com/galaxyproject/galaxy/commit/3a023f4cae6b9b6b25c1d389b9ba…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tools-form-base.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/workflow/modules.py
M static/maps/mvc/tools/tools-form-base.js.map
M static/scripts/mvc/tools/tools-form-base.js
Log Message:
-----------
Merge pull request #818 from mvdbeek/cross_toolshed_tool_fetching
Look up installed tools from different toolshed(s)
Commit: 371125bc870a29371fba8656d3c93538a50a63ab
https://github.com/galaxyproject/galaxy/commit/371125bc870a29371fba8656d3c9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/users.py
M templates/ind_share_base.mako
M templates/webapps/galaxy/history/share.mako
Log Message:
-----------
Merge pull request #1111 from erasche/user-search-name
Add search on username/any for API calls to user, use Select2 for sharing workflows/pages/histories
Commit: 8c6d530a661842a56fbb8800856237582701fc56
https://github.com/galaxyproject/galaxy/commit/8c6d530a661842a56fbb88008562…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-base.js
M lib/galaxy/managers/histories.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/actions/upload.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/webapps/galaxy/api/users.py
M lib/galaxy/workflow/modules.py
M static/maps/mvc/tool/tool-form-base.js.map
M static/scripts/mvc/tool/tool-form-base.js
M templates/ind_share_base.mako
M templates/webapps/galaxy/history/share.mako
M test/unit/tools/test_execution.py
Log Message:
-----------
Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004
Commit: 48064cc20352d3e38f985769ba5b2eeb66f051a8
https://github.com/galaxyproject/galaxy/commit/48064cc20352d3e38f985769ba5b…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M config/dependency_resolvers_conf.xml.sample
Log Message:
-----------
* Clarify comment in XML
Commit: 01a919ce6a7cc29556e257fd0af46f5071310748
https://github.com/galaxyproject/galaxy/commit/01a919ce6a7cc29556e257fd0af4…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/migrate/check.py
Log Message:
-----------
Merge pull request #1253 from nsoranzo/dev_verify_tools
Tool migration: do not mess with galaxy_config_file, if provided.
Commit: bcf8ddfbd0a966fd3d6fad157f8ca87702e9c61a
https://github.com/galaxyproject/galaxy/commit/bcf8ddfbd0a966fd3d6fad157f8c…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M lib/galaxy/model/tool_shed_install/__init__.py
Log Message:
-----------
Merge branch 'master' into dev
Conflicts:
lib/galaxy/jobs/runners/__init__.py
Commit: e505a4f6123f119577955459cda1846b5f67f0b8
https://github.com/galaxyproject/galaxy/commit/e505a4f6123f119577955459cda1…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
A config/plugins/visualizations/csg/config/csg.xml
A config/plugins/visualizations/csg/static/Detector.js
A config/plugins/visualizations/csg/static/OrbitControls.js
A config/plugins/visualizations/csg/static/PLYLoader.js
A config/plugins/visualizations/csg/static/VTKLoader.js
A config/plugins/visualizations/csg/static/dat.gui.min.js
A config/plugins/visualizations/csg/static/three.min.js
A config/plugins/visualizations/csg/templates/csg.mako
Log Message:
-----------
Add the CSG Viewer visualization plugin
based on conversations here:
https://github.com/galaxyproject/galaxy/issues/1191#issuecomment-162553926
Commit: ef0b6cc459a40227db2e63ee709e9dd5d8fd37c6
https://github.com/galaxyproject/galaxy/commit/ef0b6cc459a40227db2e63ee709e…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
show notifications as Toasts and not like JS alerts (bleh)
Commit: 4a9dad9f14b94df14b52f41466c9e66dbbfb0556
https://github.com/galaxyproject/galaxy/commit/4a9dad9f14b94df14b52f41466c9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Merge pull request #12 from martenson/labels_toastr
show notifications as Toasts and not like JS alerts (bleh)
Commit: 485e8ef8f22330bce5a402c5b4bb0182ce5b180c
https://github.com/galaxyproject/galaxy/commit/485e8ef8f22330bce5a402c5b4bb…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/form/form-section.js
M static/maps/mvc/form/form-section.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/form/form-section.js
Log Message:
-----------
Add fallback for missing section and repeat title
Commit: 3924a5a0e3d2c7d787e81fabc4e2908f30ff0168
https://github.com/galaxyproject/galaxy/commit/3924a5a0e3d2c7d787e81fabc4e2…
Author: Mark Iskander <motiontracker(a)gmail.com>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M templates/webapps/reports/jobs_errors_per_tool.mako
M templates/webapps/reports/jobs_per_month_all.mako
M templates/webapps/reports/jobs_per_month_in_error.mako
M templates/webapps/reports/jobs_per_tool.mako
M templates/webapps/reports/jobs_per_user.mako
M templates/webapps/reports/jobs_specified_month_all.mako
M templates/webapps/reports/jobs_specified_month_in_error.mako
M templates/webapps/reports/jobs_tool_per_month.mako
M templates/webapps/reports/jobs_user_per_month.mako
M templates/webapps/reports/registered_users_per_month.mako
M templates/webapps/reports/requests_user_per_month.mako
M templates/webapps/reports/users_last_access_date.mako
M templates/webapps/reports/users_user_disk_usage.mako
M templates/webapps/reports/workflows_per_month_all.mako
M templates/webapps/reports/workflows_per_user.mako
M templates/webapps/reports/workflows_per_workflow.mako
M templates/webapps/reports/workflows_user_per_month.mako
Log Message:
-----------
Fixed indentation errors
Commit: 3f8950628c3e31d9e2abe0b4f4a360c035133b8e
https://github.com/galaxyproject/galaxy/commit/3f8950628c3e31d9e2abe0b4f4a3…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor_generic_form.mako
Log Message:
-----------
Workflow label UI refinement.
- Escape workflow labels in mako.
- Handle unlabelling steps properly (restore original node name to node and editor form titles).
Commit: 5ff09896f7d4ee5208f2f39ca16a7846690af229
https://github.com/galaxyproject/galaxy/commit/5ff09896f7d4ee5208f2f39ca16a…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
Log Message:
-----------
UI, Citations: fix require of bibtex parser
Commit: 6ba86d89bc9d2b6b45dddb13d8dc79a4e2c395a0
https://github.com/galaxyproject/galaxy/commit/6ba86d89bc9d2b6b45dddb13d8dc…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
Log Message:
-----------
UI, Citations: don't create new BibtexParser, remove debugging
Commit: 0e5d42f3d67e5f75dea4abe78909539df3716f1e
https://github.com/galaxyproject/galaxy/commit/0e5d42f3d67e5f75dea4abe78909…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
Log Message:
-----------
Merge pull request #1261 from carlfeberhard/fix.citations
UI, Citations: fix require of bibtex parser
Commit: 52078baf99ed2aadae4b30f6b71ae00aecba521a
https://github.com/galaxyproject/galaxy/commit/52078baf99ed2aadae4b30f6b71a…
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/model/custom_types.py
Log Message:
-----------
don't load or overwrite a value with a not-yet-loaded value (i.e. None)
Commit: 7f4c3fcfc88914cb91e325fe95f08c90c034ef3e
https://github.com/galaxyproject/galaxy/commit/7f4c3fcfc88914cb91e325fe95f0…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/managers/users.py
Log Message:
-----------
Managers, users: properly return a boolean from has_requests
Commit: 38a9aa6a5c3b006867e16877999545e1e0e7ddea
https://github.com/galaxyproject/galaxy/commit/38a9aa6a5c3b006867e168779995…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/managers/users.py
M test/unit/managers/test_UserManager.py
Log Message:
-----------
Managers, users: update serialized key 'requests' to 'has_requests', update test
Commit: a22c09b11f5a16b4c429cf88ebd74faa433da97c
https://github.com/galaxyproject/galaxy/commit/a22c09b11f5a16b4c429cf88ebd7…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M test/docker/base/Dockerfile
M test/tool_shed/functional/test_1460_data_managers.py
Log Message:
-----------
Fix typos.
Commit: f974b0f740d4ed8c44ebafde74908cdea1748a1a
https://github.com/galaxyproject/galaxy/commit/f974b0f740d4ed8c44ebafde7490…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/util/tool_dependency_util.py
Log Message:
-----------
Extend the logging of tool dependency status changes.
Also merge handle_tool_dependency_installation_error() in
set_tool_dependency_attributes() and consolidate its use.
Commit: fe1c9dd2931fb8efccb98fb1646c3e1063b0ab52
https://github.com/galaxyproject/galaxy/commit/fe1c9dd2931fb8efccb98fb1646c…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/managers/base.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor_generic_form.mako
M test/api/workflows_format_2/converter.py
M test/qunit/tests/workflow_editor_tests.js
M test/unit/workflows/test_modules.py
Log Message:
-----------
Merge pull request #1251 from jmchilton/workflow_labels_2
Workflow Editor UI for Step Labels
Commit: 6d16549a46a330d50eccfa73684e0090a397b3c6
https://github.com/galaxyproject/galaxy/commit/6d16549a46a330d50eccfa73684e…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/managers/users.py
M test/unit/managers/test_UserManager.py
Log Message:
-----------
Merge pull request #1262 from carlfeberhard/fix.js-app-mako
Managers, users: properly return a boolean from has_requests
Commit: b273e3b0c51c13f7e46ccc2977925d9247033289
https://github.com/galaxyproject/galaxy/commit/b273e3b0c51c13f7e46ccc297792…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
Log Message:
-----------
Improve logging during package installation
Commit: 864472870f7e1af14a5807effe1fc5685f16e92f
https://github.com/galaxyproject/galaxy/commit/864472870f7e1af14a5807effe1f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
Log Message:
-----------
Merge pull request #1267 from erasche/install-logging
Log command executed during package installation
Commit: a033d798de1c36484a1a16d135860a3b5fb5af33
https://github.com/galaxyproject/galaxy/commit/a033d798de1c36484a1a16d13586…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/root.py
R templates/webapps/galaxy/history/options.mako
Log Message:
-----------
Remove: history_options and options.mako (history options as a page)
Commit: 2b63427e965837eb29df54e5918cf8f84004f534
https://github.com/galaxyproject/galaxy/commit/2b63427e965837eb29df54e5918c…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/dynamic_options.py
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Handle late validated dataset references
Commit: 7dbbac31b3581d43445a8030e2cba990c90e1b2e
https://github.com/galaxyproject/galaxy/commit/7dbbac31b3581d43445a8030e2cb…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/root.py
R templates/webapps/galaxy/history/options.mako
Log Message:
-----------
Merge pull request #1271 from carlfeberhard/jettison.history-options
Remove: history_options and options.mako (history options as a page)
Commit: 37931505d4c967d70e495467fd615f9540202e4b
https://github.com/galaxyproject/galaxy/commit/37931505d4c967d70e495467fd61…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/tool_shed/util/workflow_util.py
Log Message:
-----------
Fix tool shed tests for recent workflow changes.
Thanks for bug report by @nsoranzo on https://github.com/galaxyproject/galaxy/pull/1263.
Commit: 78427438adcb794af630ebb3b9b77b3628c2c5bb
https://github.com/galaxyproject/galaxy/commit/78427438adcb794af630ebb3b9b7…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/ui/ui-modal.js
M lib/galaxy/model/__init__.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/ui/ui-modal.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/ui/ui-modal.js
M test/unit/managers/test_HistoryManager.py
Log Message:
-----------
UI, History: refactor the history copy dialog, use it from the options menu (instead of history/copy), pass ui-modal closing_callback a flag whether it was a cancellation or not
Commit: bd1349eb9b62dfac0b1affbd1a4ea8e1fe109c2c
https://github.com/galaxyproject/galaxy/commit/bd1349eb9b62dfac0b1affbd1a4e…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/tool_shed/util/workflow_util.py
Log Message:
-----------
Merge pull request #1274 from jmchilton/workflow_fix_3
Fix tool shed tests for recent workflow changes.
Commit: c3e4ae11b06d0e10f1fd5a3c2df0433b90f527b7
https://github.com/galaxyproject/galaxy/commit/c3e4ae11b06d0e10f1fd5a3c2df0…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M test/docker/base/run_test_wrapper.sh
Log Message:
-----------
set client_encoding for TS dockerized test db
Commit: e391fa4975800fd1d21e1e7d03183d146728f1c8
https://github.com/galaxyproject/galaxy/commit/e391fa4975800fd1d21e1e7d0318…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/options-menu.js
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/options-menu.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/options-menu.js
M templates/webapps/galaxy/history/display.mako
Log Message:
-----------
UI, History: allow copy dialog to have default of copy-all-datasets passed in as option; Replace import link with copy dialog in published histories
Commit: d41ea8d315be735ab506d2643cf2dcb67e030c9c
https://github.com/galaxyproject/galaxy/commit/d41ea8d315be735ab506d2643cf2…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M test/docker/base/run_test_wrapper.sh
Log Message:
-----------
Merge pull request #1276 from martenson/fix-ts-dbconnection-tag
set client_encoding for TS dockerized test db
Commit: 7187eddd2fdec95093c765b838814435c9f6b92d
https://github.com/galaxyproject/galaxy/commit/7187eddd2fdec95093c765b83881…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M templates/display_base.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
Log Message:
-----------
UI, published items: fix css bleeding of trackster.css into other published item displays
Commit: f0fc8d6d4cc59afaacccb8a7ae036b15f5b7f681
https://github.com/galaxyproject/galaxy/commit/f0fc8d6d4cc59afaacccb8a7ae03…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
update used galaxy/testing-base to 15.10.3
Commit: c39544807565d4e345963d1d280deb28b85d281a
https://github.com/galaxyproject/galaxy/commit/c39544807565d4e345963d1d280d…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M run_tests.sh
Log Message:
-----------
Merge pull request #1277 from martenson/update-docker-image-v
update used galaxy/testing-base to 15.10.3
Commit: d72dd3735c0dfd652fb45a117fe1942f10ff726d
https://github.com/galaxyproject/galaxy/commit/d72dd3735c0dfd652fb45a117fe1…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/polyfills.js
M static/maps/mvc/base-mvc.js.map
M static/maps/polyfills.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/polyfills.js
Log Message:
-----------
Client, polyfills: check for sessionStorage using a more cross-browser (apparently) way
Commit: 183c3c11b60aa5a36747dbe7b0ac069dc3bac6fc
https://github.com/galaxyproject/galaxy/commit/183c3c11b60aa5a36747dbe7b0ac…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/polyfills.js
M static/maps/mvc/base-mvc.js.map
M static/maps/polyfills.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/polyfills.js
Log Message:
-----------
Merge pull request #1279 from carlfeberhard/fix.casper
Client, polyfills: check for sessionStorage using a more cross-browse…
Commit: 133e5f2e24eed9650a0862ced42092d35f8a6566
https://github.com/galaxyproject/galaxy/commit/133e5f2e24eed9650a0862ced420…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M test/api/test_tools.py
M test/api/test_workflows.py
M test/base/interactor.py
Log Message:
-----------
Various small API testing fixes/improvements.
Commit: 09a68adb1e2a837f4ae01ca9ec25b4d6d0fab446
https://github.com/galaxyproject/galaxy/commit/09a68adb1e2a837f4ae01ca9ec25…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M test/api/test_workflows.py
Log Message:
-----------
Add another API test verifying validation of workflow substitions.
A little different because it targets a different tool, validation, and is inside a repeat.
Commit: 941109dda860325938960b93f66e50d314b67e4a
https://github.com/galaxyproject/galaxy/commit/941109dda860325938960b93f66e…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/options-menu.js
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/options-menu.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/options-menu.js
M templates/grid_base.mako
M templates/webapps/galaxy/history/display.mako
Log Message:
-----------
UI, History: use copy dialog as import dialog in published history pages, refactor copy-dialog
Commit: 1959288637bf8c4f11da70df5cd5558c1bc1099a
https://github.com/galaxyproject/galaxy/commit/1959288637bf8c4f11da70df5cd5…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Include link to toolshed repository, and make sure upgrade message is not overwritten by tool_version changes.
Commit: 928ff581efa3ace63a57e97db80e7a9c21c09841
https://github.com/galaxyproject/galaxy/commit/928ff581efa3ace63a57e97db80e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M test/base/interactor.py
Log Message:
-----------
Fix typo spotted by @nsoranzo.
Commit: c143748e62e976fa3a43a721ed49bdbdc78ea980
https://github.com/galaxyproject/galaxy/commit/c143748e62e976fa3a43a721ed49…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Better formatting of workflow warning message.
Commit: 80bd59dd90722afb837c01a26b78eebe04dd277b
https://github.com/galaxyproject/galaxy/commit/80bd59dd90722afb837c01a26b78…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/polyfills.js
M lib/galaxy/managers/base.py
M lib/galaxy/managers/users.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/tool_shed_install/__init__.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/util/workflow_util.py
M run_tests.sh
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/polyfills.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/polyfills.js
R templates/webapps/galaxy/history/options.mako
M templates/webapps/galaxy/workflow/editor_generic_form.mako
M test/api/workflows_format_2/converter.py
M test/docker/base/run_test_wrapper.sh
M test/qunit/tests/workflow_editor_tests.js
M test/unit/managers/test_UserManager.py
M test/unit/workflows/test_modules.py
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: cd61cdc51b387d6cfb7905307c669e17111ab96d
https://github.com/galaxyproject/galaxy/commit/cd61cdc51b387d6cfb7905307c66…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Add back tool id to pass unit tests.
Commit: ce6cd03f6c7f020a8127025c49224f1bb920bc18
https://github.com/galaxyproject/galaxy/commit/ce6cd03f6c7f020a8127025c4922…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
A .ci/check_controller.sh
A .ci/check_mako.sh
M tox.ini
Log Message:
-----------
Enforce metrics related to moving toward modern client infrastructure.
Having a CI enforced blacklist and then a whitelist of files failing to meet style guidelines (as well as expanding list of rules enforced) may have helped create incentive to rework Galaxy toward a more compliant and uniform Python styling.
We briefly discussed the possibility of doing this with other team code base objectives on a conference call - in particular to help the transition toward replacing all of the web controllers with API controllers and eliminating the use of Python mako files for rendering web content and replacing it with client side templates.
To do this I have created two rough metrics - the number of lines of web controller code in the Galaxy app and the number of mako files in the templates directory. The hope is that people feel ... compelled to lower these numbers. While these metrics are admittedly rough, they do also encourage de-duplication of mako templates and transition of API code into managers (in addition to elimination of functions) both of these secondary incentives are also good things and should be project objectives.
Commit: 253ca7ec4940188d11157448d73be09e762e65f8
https://github.com/galaxyproject/galaxy/commit/253ca7ec4940188d11157448d73b…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/ui/popup-menu.js
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/ui/popup-menu.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/ui/popup-menu.js
M templates/webapps/galaxy/history/grid.mako
Log Message:
-----------
UI, History: insert/use copy dialog in the 'Saved Histories' grid
Commit: 636e9900ba5e82c37a26fee84f56872c9413bd1b
https://github.com/galaxyproject/galaxy/commit/636e9900ba5e82c37a26fee84f56…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-composite.js
M static/maps/mvc/tool/tool-form-composite.js.map
M static/scripts/mvc/tool/tool-form-composite.js
Log Message:
-----------
Improve handling of unspecified workflow editor values
Commit: 09cb673a9b13f6f9faae21b48c317e485afb8eb1
https://github.com/galaxyproject/galaxy/commit/09cb673a9b13f6f9faae21b48c31…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M lib/galaxy/webapps/galaxy/controllers/history.py
M static/maps/mvc/history/copy-dialog.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M templates/webapps/galaxy/history/grid.mako
A templates/webapps/galaxy/history/grid_js.mako
A templates/webapps/galaxy/history/shared_grid.mako
Log Message:
-----------
UI, History: use copy dialog for shared history popupmenus, use custom templates for both saved and shared history lists/grids. refactor custom grid code for insertion of copy dialog
Commit: 9a4c8343701c676ccf996cbbaa864f12135bac5b
https://github.com/galaxyproject/galaxy/commit/9a4c8343701c676ccf996cbbaa86…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/ui/ui-drilldown.js
M client/galaxy/style/less/ui.less
M static/maps/mvc/ui/ui-drilldown.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/ui/ui-drilldown.js
M static/style/blue/base.css
Log Message:
-----------
Use fa icons for drill down expansion
Commit: cb23e010d7750b533be7690e72c92500ddc8e2f1
https://github.com/galaxyproject/galaxy/commit/cb23e010d7750b533be7690e72c9…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M static/maps/mvc/history/copy-dialog.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/view.mako
Log Message:
-----------
UI, History: use copy dialog in history/view for import, minor fixes
Commit: 1ebc0ea9e719bf7557f0e190a7dd4883629257f5
https://github.com/galaxyproject/galaxy/commit/1ebc0ea9e719bf7557f0e190a7dd…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
UI, Quotameter: correctly update the quotameter for anon users
Commit: bce8140bd9f9c3e069c83f765ae892d0fd1656b7
https://github.com/galaxyproject/galaxy/commit/bce8140bd9f9c3e069c83f765ae8…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M test/api/test_tools.py
M test/api/test_workflows.py
M test/base/interactor.py
Log Message:
-----------
Merge pull request #1285 from jmchilton/test_improvemnts_1
Small API Test Improvements
Commit: 25f420fc8f47865e2cee2da15dc283e2cf130b91
https://github.com/galaxyproject/galaxy/commit/25f420fc8f47865e2cee2da15dc2…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Merge pull request #1289 from carlfeberhard/fix.anon-user-quotameter
UI, Quotameter: correctly update the quotameter for anon users
Commit: d72b913c1d25bf9e2ee2c9e7320bff4f52b366e3
https://github.com/galaxyproject/galaxy/commit/d72b913c1d25bf9e2ee2c9e7320b…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M client/galaxy/scripts/utils/ajax-queue.js
M static/maps/utils/ajax-queue.js.map
M static/scripts/utils/ajax-queue.js
M templates/webapps/galaxy/history/shared_grid.mako
Log Message:
-----------
UI, History: hack multiple copy by API into the 'histories shared with me' mako grid
Commit: 7a3aa044fbf968c120832402091cb3b1d70afd7b
https://github.com/galaxyproject/galaxy/commit/7a3aa044fbf968c120832402091c…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
A Makefile
A client/.docker-build.sh
A client/Dockerfile
M doc/source/dev/faq.rst
Log Message:
-----------
Merge pull request #1238 from erasche/client-builder
Ease the grunt uglify process
Commit: b455157bd6f3f23ce2de81d5145b6268e4da77f3
https://github.com/galaxyproject/galaxy/commit/b455157bd6f3f23ce2de81d5145b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/text.py
Log Message:
-----------
Merge pull request #1198 from blankenberg/dt-biom
BIOM1 Datatype enhancements
Commit: f8d95abf061608e2dc544e56fc5b83ad3d54d1bd
https://github.com/galaxyproject/galaxy/commit/f8d95abf061608e2dc544e56fc5b…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/util/tool_dependency_util.py
M test/docker/base/Dockerfile
M test/tool_shed/functional/test_1460_data_managers.py
Log Message:
-----------
Merge pull request #1263 from nsoranzo/dev_tool_shed_fixes
Extend the logging of tool dependency status changes.
Commit: e40fbe5374f906139f8be7a3ceb001f049a6b244
https://github.com/galaxyproject/galaxy/commit/e40fbe5374f906139f8be7a3ceb0…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M config/dependency_resolvers_conf.xml.sample
A doc/source/admin/dependency_resolvers.rst
M doc/source/admin/index.rst
Log Message:
-----------
* Add comment about base_path in sample config
* Add documentation on dependency resolvers
Commit: 952f3f9b7a04a6e7d3185da76d84dea0fa9bca8d
https://github.com/galaxyproject/galaxy/commit/952f3f9b7a04a6e7d3185da76d84…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/style/less/ui.less
M static/maps/mvc/ui/ui-select-default.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/ui/ui-select-default.js
M static/style/blue/base.css
Log Message:
-----------
Open select2 dropdown on click
Commit: bca004eff8607e347d440ce5fc5d086d7acb45f9
https://github.com/galaxyproject/galaxy/commit/bca004eff8607e347d440ce5fc5d…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/style/less/ui.less
M static/maps/mvc/ui/ui-select-default.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/ui/ui-select-default.js
M static/style/blue/base.css
Log Message:
-----------
Merge pull request #1298 from guerler/fix_select2_open_000
Open select2 drop down on caret click
Commit: 1aafc489356d4ad62a00b82f1b0679d66f037be4
https://github.com/galaxyproject/galaxy/commit/1aafc489356d4ad62a00b82f1b06…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M config/reports.ini.sample
M config/tool_shed.ini.sample
M lib/galaxy/webapps/reports/config.py
M lib/galaxy/webapps/tool_shed/config.py
Log Message:
-----------
Dead sendmail_path vars, this is unused in favor of smtp (as of a long time ago)
Commit: 9e512f52465c158855c2a0750d8a7d794316940e
https://github.com/galaxyproject/galaxy/commit/9e512f52465c158855c2a0750d8a…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M lib/galaxy/model/__init__.py
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/tool/tools-form-base.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/tool/tools-form-base.js
M static/scripts/utils/ajax-queue.js
M templates/webapps/galaxy/history/embed.mako
Log Message:
-----------
UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog
Commit: c0b349306f17ed924a5673fab465d105d2cfdaf2
https://github.com/galaxyproject/galaxy/commit/c0b349306f17ed924a5673fab465…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M config/tool_shed.ini.sample
M lib/galaxy/webapps/tool_shed/config.py
Log Message:
-----------
Add smtp_ssl option to toolshed mailing capabilities, update .sample to include the smtp auth/ssl.
Commit: 324af9caeda230bfe35ce79cf3e6f84a3ca27ee5
https://github.com/galaxyproject/galaxy/commit/324af9caeda230bfe35ce79cf3e6…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/history.py
R templates/webapps/galaxy/history/copy.mako
M templates/webapps/galaxy/history/embed.mako
Log Message:
-----------
UI, History: remove copy and imp methods from controllers/history.py, remove history copy template
Commit: 27e43e8907a5fb529cdf36175a6ffe04de762379
https://github.com/galaxyproject/galaxy/commit/27e43e8907a5fb529cdf36175a6f…
Author: Anthony Bretaudeau <anthony.bretaudeau(a)inria.fr>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/metadata.py
Log Message:
-----------
Load deferred column before pickling dataset instance
Commit: 32be886f0f51103a648003997c7d06cd12ba08d9
https://github.com/galaxyproject/galaxy/commit/32be886f0f51103a648003997c7d…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M lib/galaxy/model/__init__.py
M lib/galaxy/webapps/galaxy/api/histories.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M static/maps/mvc/history/copy-dialog.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
Log Message:
-----------
API, Histories: allow api/histories/create to be used as anon user; UI, Histories: minor fixes
Commit: 584d886b5ee68257921dff24c4dbe0a2dbb0c00c
https://github.com/galaxyproject/galaxy/commit/584d886b5ee68257921dff24c4db…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M doc/source/admin/dependency_resolvers.rst
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
Log Message:
-----------
* Mention modulepath attribute in dependency resolver docs
* Use modulepath in both environment modules resolvers
* Export MODULEPATH in generated shell command
* Add logging for operation of dependency resolvers
Commit: 035f1b5d663841fa61d32ba79e1b43553dab4fab
https://github.com/galaxyproject/galaxy/commit/035f1b5d663841fa61d32ba79e1b…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M doc/source/admin/dependency_resolvers.rst
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M test/unit/tools/test_tool_deps.py
Log Message:
-----------
* Incorporate documentation fixes from nsoranzo
* Replace {} and .format with %s and % to preserve Python 2.6 compatibility
* Add a modulepath= paranter to the fake resolver (Bunch object) used to test the modules dependency resolver
Commit: 84f3b72e1ad829e6f2f46049ff4af42f27429a5b
https://github.com/galaxyproject/galaxy/commit/84f3b72e1ad829e6f2f46049ff4a…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
A Makefile
A client/.docker-build.sh
A client/Dockerfile
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/polyfills.js
M client/galaxy/style/less/ui.less
M doc/source/dev/faq.rst
M lib/galaxy/datatypes/text.py
M lib/galaxy/managers/base.py
M lib/galaxy/managers/users.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/util/tool_dependency_util.py
M lib/tool_shed/util/workflow_util.py
M run_tests.sh
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/polyfills.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/polyfills.js
M static/style/blue/base.css
R templates/webapps/galaxy/history/options.mako
M templates/webapps/galaxy/workflow/editor_generic_form.mako
M test/api/test_tools.py
M test/api/test_workflows.py
M test/api/workflows_format_2/converter.py
M test/base/interactor.py
M test/casperjs/api-anon-history-permission-tests.js
M test/casperjs/api-anon-history-tests.js
M test/docker/base/Dockerfile
M test/docker/base/run_test_wrapper.sh
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/functional/test_1460_data_managers.py
M test/unit/managers/test_UserManager.py
M test/unit/workflows/test_modules.py
Log Message:
-----------
(merge dev); Testing, histories: update tests to reflect allowing anon to create/copy histories via the API
Commit: 2b90ca9b0e23715bd7a03614fa989bcf540f73e9
https://github.com/galaxyproject/galaxy/commit/2b90ca9b0e23715bd7a03614fa98…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/tools/deps/__init__.py
Log Message:
-----------
* Replaced incorrect %b with %s
Commit: 73b6fb23db300501c9124c61c90d73d2c28dc7a4
https://github.com/galaxyproject/galaxy/commit/73b6fb23db300501c9124c61c90d…
Author: Peter van Heusden <pvh(a)sanbi.ac.za>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M doc/source/admin/dependency_resolvers.rst
Log Message:
-----------
* Replaced all references to "version number" with "version string"
Commit: 760c2b56bee664f2f874e2cc26d2129858da1bb1
https://github.com/galaxyproject/galaxy/commit/760c2b56bee664f2f874e2cc26d2…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Properly show and label hidden datasets on rerurn
Commit: 6580d5129386ab5b8634583c5378dfc340ed2800
https://github.com/galaxyproject/galaxy/commit/6580d5129386ab5b8634583c5378…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M config/dependency_resolvers_conf.xml.sample
A doc/source/admin/dependency_resolvers.rst
M doc/source/admin/index.rst
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M test/unit/tools/test_tool_deps.py
Log Message:
-----------
Merge pull request #1296 from pvanheus/env-modules-resolve
Documentation for dependency resolvers
Commit: eb4b8e716d26897e58c78c08e9a2d62a770604f5
https://github.com/galaxyproject/galaxy/commit/eb4b8e716d26897e58c78c08e9a2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M config/reports.ini.sample
M config/tool_shed.ini.sample
M lib/galaxy/webapps/reports/config.py
M lib/galaxy/webapps/tool_shed/config.py
Log Message:
-----------
Merge pull request #1299 from dannon/mail_fixes
Minor mail config cleanup
Commit: 66146ad5d0e17e35b6eee50699b0261422835000
https://github.com/galaxyproject/galaxy/commit/66146ad5d0e17e35b6eee50699b0…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Merge pull request #1305 from guerler/fix_workflow_rerun_001
[15.10] Properly show and label hidden datasets on workflow reruns
Commit: a7e60eae2c2721e7d4377112b7aaceb8424fd3da
https://github.com/galaxyproject/galaxy/commit/a7e60eae2c2721e7d4377112b7aa…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
A .ci/check_controller.sh
A .ci/check_mako.sh
M tox.ini
Log Message:
-----------
Merge pull request #1292 from jmchilton/client_incentives
Enforce metrics related to moving toward modern client infrastructure.
Commit: 989f961fb6351d1f63374b4fc40429c1e897b1e2
https://github.com/galaxyproject/galaxy/commit/989f961fb6351d1f63374b4fc404…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
Log Message:
-----------
Merge pull request #1218 from blankenberg/rerunfix_15.10
[15.10] Fix for Section and conditional upgrade messages.
Commit: 65bd907e08168daecabd984465b735f50ff0da56
https://github.com/galaxyproject/galaxy/commit/65bd907e08168daecabd984465b7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-12 (Sat, 12 Dec 2015)
Changed paths:
M lib/galaxy/app.py
M lib/galaxy/tools/imp_exp/__init__.py
A lib/galaxy/tools/special_tools.py
Log Message:
-----------
Refactor imp_exp toolbox toward more generic entry point.
Commit: 0180c0525d5f545f67d99c79677a94382ae73ff1
https://github.com/galaxyproject/galaxy/commit/0180c0525d5f545f67d99c79677a…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-12 (Sat, 12 Dec 2015)
Changed paths:
M lib/galaxy/jobs/command_factory.py
Log Message:
-----------
Improve error log warning for tools with empty commands.
Commit: a208961cd3145f90a04e58ac1bb23ed2d91365a4
https://github.com/galaxyproject/galaxy/commit/a208961cd3145f90a04e58ac1bb2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-12 (Sat, 12 Dec 2015)
Changed paths:
M lib/galaxy/tools/actions/__init__.py
Log Message:
-----------
Refactor tool actions for reuse of pieces in downstream actions.
Commit: 8af5671953df12e5207a8b3e5e70c742cea9f158
https://github.com/galaxyproject/galaxy/commit/8af5671953df12e5207a8b3e5e70…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-terminals.js
M lib/galaxy/dataset_collections/type_description.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/history_query.py
M lib/galaxy/workflow/modules.py
M static/maps/mvc/workflow/workflow-terminals.js.map
M static/scripts/mvc/workflow/workflow-terminals.js
M test/qunit/tests/workflow_editor_tests.js
M test/unit/tools/test_parameter_parsing.py
M test/unit/workflows/test_modules.py
Log Message:
-----------
Allow input collections to specify mutiple collection types.
Parallelling format specifier which can take multiple formats.
Commit: b633c949c875788d5bba9ae0126882b3439d7f7e
https://github.com/galaxyproject/galaxy/commit/b633c949c875788d5bba9ae01268…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Mention tool id as hover text on version changes.
Commit: 812343d8ccc10a77bab58287178cceb64ad9cb39
https://github.com/galaxyproject/galaxy/commit/812343d8ccc10a77bab58287178c…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/workflow/modules.py
Log Message:
-----------
Merge pull request #1286 from mvdbeek/cross_toolshed_tool_fetching
Include link to old and new toolshed repository, and make sure upgrade message is…
Commit: f14b38124bc08c228bfce30f27d1815d7dd27c0b
https://github.com/galaxyproject/galaxy/commit/f14b38124bc08c228bfce30f27d1…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Log Message:
-----------
UI, list of pairs collection creator: prevent vice-versa pair duplication by removing paired dataset from both temp lists during auto pairing
Commit: 58911edbfb5aa6e858addd9452e90d6ed389b0d2
https://github.com/galaxyproject/galaxy/commit/58911edbfb5aa6e858addd9452e9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
R test/casperjs/api-workflow-tests.js
M test/casperjs/casperjs_runner.py
Log Message:
-----------
Remove worklfow casperjs API test.
It has good and more updated coverage in the Python API testing framework.
Commit: c1ce8ef0ce074271c9ba7a9a1718258482cca69f
https://github.com/galaxyproject/galaxy/commit/c1ce8ef0ce074271c9ba7a9a1718…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Log Message:
-----------
UI, list of pairs collection creator: improve auto-pair error message to be more beginner friendly(?)
Commit: dd429b640ffeb656a1fd61b49e88db890e7743cf
https://github.com/galaxyproject/galaxy/commit/dd429b640ffeb656a1fd61b49e88…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
Log Message:
-----------
Merge pull request #1310 from carlfeberhard/fix.lop-creator
UI, list of pairs creator: properly remove datasets from the filtered lists when pairing
Commit: 886f6d2d707a9b4e2a80b0aaa89157e1137415ad
https://github.com/galaxyproject/galaxy/commit/886f6d2d707a9b4e2a80b0aaa891…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/execute.py
M test/api/test_workflows.py
Log Message:
-----------
Improved validation of tools during workflow execution.
Do a more complete validation of everything after workflow parameters have been replaced and inputs connected up.
Attempt 2 at the idea in https://github.com/galaxyproject/galaxy/pull/1284.
Commit: cdd9ca16f0a38ffab5fe54d559fc4bb4e4a7a37d
https://github.com/galaxyproject/galaxy/commit/cdd9ca16f0a38ffab5fe54d559fc…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/execute.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
Log Message:
-----------
Don't silently swallow job creation problems when running workflows.
Commit: ce787adff93dafb950341243f3951221cadfc813
https://github.com/galaxyproject/galaxy/commit/ce787adff93dafb950341243f395…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Fix bug related to collection reductions state.
Commit: c61a5529b4c788580d2c3615c7dab2386a9b8e4e
https://github.com/galaxyproject/galaxy/commit/c61a5529b4c788580d2c3615c7da…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
A .ci/check_controller.sh
A .ci/check_mako.sh
A Makefile
A client/.docker-build.sh
A client/Dockerfile
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/mvc/base-mvc.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/polyfills.js
M client/galaxy/style/less/ui.less
M config/dependency_resolvers_conf.xml.sample
M config/reports.ini.sample
M config/tool_shed.ini.sample
A doc/source/admin/dependency_resolvers.rst
M doc/source/admin/index.rst
M doc/source/dev/faq.rst
M lib/galaxy/datatypes/text.py
M lib/galaxy/managers/base.py
M lib/galaxy/managers/users.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/tool_shed_install/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/galaxy/controllers/root.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/webapps/reports/config.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/migrate/check.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/util/tool_dependency_util.py
M lib/tool_shed/util/workflow_util.py
M run_tests.sh
M static/maps/mvc/base-mvc.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/polyfills.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/base-mvc.js
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/polyfills.js
M static/style/blue/base.css
R templates/webapps/galaxy/history/options.mako
M templates/webapps/galaxy/workflow/editor_generic_form.mako
M test/api/test_tools.py
M test/api/test_workflows.py
M test/api/workflows_format_2/converter.py
M test/base/interactor.py
M test/docker/base/Dockerfile
M test/docker/base/run_test_wrapper.sh
M test/qunit/tests/workflow_editor_tests.js
M test/tool_shed/functional/test_1460_data_managers.py
M test/unit/managers/test_UserManager.py
M test/unit/tools/test_tool_deps.py
M test/unit/workflows/test_modules.py
M tox.ini
Log Message:
-----------
Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004
Commit: b8d7cf035df49f2fda9291b91eadf59fd48bfdd0
https://github.com/galaxyproject/galaxy/commit/b8d7cf035df49f2fda9291b91ead…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M config/galaxy.ini.sample
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Add config setting, disable by default
Commit: 42edfca679f204aa7e69a6c3df6dc14c8118e22c
https://github.com/galaxyproject/galaxy/commit/42edfca679f204aa7e69a6c3df6d…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/tools/__init__.py
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Repack, refix section validation
Commit: 148c11f403674d133bb0301ce2fc01ef108c38bd
https://github.com/galaxyproject/galaxy/commit/148c11f403674d133bb0301ce2fc…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Adjust interface to basic.py.
Commit: 10fff14ce5ba6952f21da10c81a31ceda397a666
https://github.com/galaxyproject/galaxy/commit/10fff14ce5ba6952f21da10c81a3…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Fix missing wf parameter issue in classic form
Commit: 9f68003438cac76a223e84756b0584d7530df239
https://github.com/galaxyproject/galaxy/commit/9f68003438cac76a223e84756b05…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Revise checking for workflow parameters in tooling code.
- Use verbose and higher level abstractions.
- Tighten up checks (use re.match instead of search when appropriate, replace startwith.("$") with more robust regex matches).
Commit: 7687ed7fad52ef69002a2f985fcf682999068f00
https://github.com/galaxyproject/galaxy/commit/7687ed7fad52ef69002a2f985fcf…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/__init__.py
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Tighten workflow parameter check.
a440813e37941d050ac503a0898dcf00c5f1b4fe always skipped validation of text/int/float values if they looked like they were workflow parameters. This restricts that check to just occurring when coming from the workflow editor tool form.
Commit: fafa72dde200b05954d038902e317c8fe0d302bd
https://github.com/galaxyproject/galaxy/commit/fafa72dde200b05954d038902e31…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Slightly tighten up relaxed validation of workflow paramters.
Don't allow mid-parameter placement of values for integers, floats, etc... (e.g. 10${param}). This is enforced other places as well.
Commit: 57bc4660cf4e21ebe8b73035095e021e4f298680
https://github.com/galaxyproject/galaxy/commit/57bc4660cf4e21ebe8b73035095e…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Fix workflow parameter validation
Commit: 9b30b134d6ab93c2a84a856352f32a6713dd49cd
https://github.com/galaxyproject/galaxy/commit/9b30b134d6ab93c2a84a856352f3…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Reduce code duplication by reusing get_installed_repository() function.
Commit: 11eca70db129173ea20aac0040c9645049af189c
https://github.com/galaxyproject/galaxy/commit/11eca70db129173ea20aac0040c9…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
When loading a tool from Tool Shed, check that the <installed_changeset_revision> element matches the tool path.
Workaround for issue #1283, which causes the loaded tool to have a
StockLineage instead of a ToolShedLineage, thus creating multiple entries
for the tool in the panel.
Commit: 3108ba5c01ded7b0209685f57ab231c2cfe92938
https://github.com/galaxyproject/galaxy/commit/3108ba5c01ded7b0209685f57ab2…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/ui/ui-misc.js
M static/maps/mvc/ui/ui-misc.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/ui/ui-misc.js
Log Message:
-----------
Ensure that text fields only display text
Commit: 7f7010dbd96b4b9ce494ba320b853e6441162f5e
https://github.com/galaxyproject/galaxy/commit/7f7010dbd96b4b9ce494ba320b85…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
R static/scripts/mvc/collection/paired-collection-creator.js
R static/scripts/mvc/history/history-panel.js
R static/scripts/mvc/upload/upload-row.js
R static/scripts/mvc/workflow/workflow.js
Log Message:
-----------
Remove left over packed scripts.
The source files have been deleted.
Commit: 0fce226b96f98bf3393935602e0b5e9a8762bc4e
https://github.com/galaxyproject/galaxy/commit/0fce226b96f98bf3393935602e0b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/metadata.py
M lib/galaxy/model/custom_types.py
M lib/galaxy/model/mapping.py
Log Message:
-----------
Merge pull request #1179 from abretaud/defer_metadata
Lazy load HDA/LDDA metadata to speed up history loading
Commit: a440813e37941d050ac503a0898dcf00c5f1b4fe
https://github.com/galaxyproject/galaxy/commit/a440813e37941d050ac503a0898d…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Add workflow_mode flag to validation
Commit: e838b03300964615bc2144ceeb9ba785cf5f7a7d
https://github.com/galaxyproject/galaxy/commit/e838b03300964615bc2144ceeb9b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/form/form-data.js
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
A client/galaxy/scripts/mvc/tool/tool-form-base.js
A client/galaxy/scripts/mvc/tool/tool-form-composite.js
A client/galaxy/scripts/mvc/tool/tool-form-workflow.js
A client/galaxy/scripts/mvc/tool/tool-form.js
A client/galaxy/scripts/mvc/tool/tool-template.js
R client/galaxy/scripts/mvc/tool/tools-form-base.js
R client/galaxy/scripts/mvc/tool/tools-form-workflow.js
R client/galaxy/scripts/mvc/tool/tools-form.js
R client/galaxy/scripts/mvc/tool/tools-jobs.js
R client/galaxy/scripts/mvc/tool/tools-template.js
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/mvc/ui/ui-drilldown.js
M client/galaxy/scripts/mvc/ui/ui-misc.js
M client/galaxy/scripts/mvc/ui/ui-portlet.js
M client/galaxy/scripts/mvc/ui/ui-slider.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/style/less/ui.less
M config/galaxy.ini.sample
M config/plugins/visualizations/charts/static/build-app.js
M config/plugins/visualizations/charts/static/library/ui-table-form.js
M config/plugins/visualizations/charts/static/views/editor.js
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/dataset_matcher.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/webapps/galaxy/api/workflows.py
A static/maps/galaxy-app-base.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/form/form-data.js.map
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
A static/maps/mvc/tool/tool-form-base.js.map
A static/maps/mvc/tool/tool-form-composite.js.map
A static/maps/mvc/tool/tool-form-workflow.js.map
A static/maps/mvc/tool/tool-form.js.map
A static/maps/mvc/tool/tool-template.js.map
R static/maps/mvc/tool/tools-form-base.js.map
R static/maps/mvc/tool/tools-form-workflow.js.map
R static/maps/mvc/tool/tools-form.js.map
R static/maps/mvc/tool/tools-jobs.js.map
R static/maps/mvc/tool/tools-template.js.map
M static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools.js.map
R static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-drilldown.js.map
M static/maps/mvc/ui/ui-misc.js.map
M static/maps/mvc/ui/ui-portlet.js.map
M static/maps/mvc/ui/ui-slider.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/utils/utils.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/form/form-data.js
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
A static/scripts/mvc/tool/tool-form-base.js
A static/scripts/mvc/tool/tool-form-composite.js
A static/scripts/mvc/tool/tool-form-workflow.js
A static/scripts/mvc/tool/tool-form.js
A static/scripts/mvc/tool/tool-template.js
R static/scripts/mvc/tool/tools-form-base.js
R static/scripts/mvc/tool/tools-form-workflow.js
R static/scripts/mvc/tool/tools-form.js
R static/scripts/mvc/tool/tools-jobs.js
R static/scripts/mvc/tool/tools-template.js
M static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools.js
R static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-drilldown.js
M static/scripts/mvc/ui/ui-misc.js
M static/scripts/mvc/ui/ui-portlet.js
M static/scripts/mvc/ui/ui-slider.js
M static/scripts/mvc/workflow/workflow-view.js
M static/scripts/utils/utils.js
M static/style/blue/base.css
M templates/webapps/galaxy/workflow/editor_tool_form.mako
M templates/webapps/galaxy/workflow/run.mako
Log Message:
-----------
Merge pull request #1249 from guerler/run_workflow_form_004
Run workflow form
Commit: 5bf926bf3ec19933c0ef82e51c919c0595bfc741
https://github.com/galaxyproject/galaxy/commit/5bf926bf3ec19933c0ef82e51c91…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M test/api/test_workflows.py
Log Message:
-----------
Merge pull request #1302 from jmchilton/workflow_validation_1
Improved validation of tools during workflow execution.
Commit: ce57930342c2a4f7eb672f95dc0b19c93c2322f8
https://github.com/galaxyproject/galaxy/commit/ce57930342c2a4f7eb672f95dc0b…
Author: shane <shane(a)shanedowling.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/config.py
Log Message:
-----------
Show a more user-friendly error when the webserver port is blocked
Commit: a42328f0002955295cfb70bc6e16fcf83e42ad82
https://github.com/galaxyproject/galaxy/commit/a42328f0002955295cfb70bc6e16…
Author: shane <shane(a)shanedowling.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/config.py
Log Message:
-----------
Removing unnecessary line
Commit: c14bb93a60dba72db34996cadcf20ee0e19a7f19
https://github.com/galaxyproject/galaxy/commit/c14bb93a60dba72db34996cadcf2…
Author: shane <shane(a)shanedowling.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/config.py
Log Message:
-----------
Tidying code for linter
Commit: 2acdbe54f76312cb748693e018d2d505cf95c3a2
https://github.com/galaxyproject/galaxy/commit/2acdbe54f76312cb748693e018d2…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
M templates/webapps/galaxy/workflow/editor.mako
Log Message:
-----------
UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global
Commit: 8e2db2944cbd546fa0f6f6cb46bf78d470ab31c8
https://github.com/galaxyproject/galaxy/commit/8e2db2944cbd546fa0f6f6cb46bf…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Fix workflow output step entries
Commit: 541231bb1723b2aac3fede7f45ca0455ca954894
https://github.com/galaxyproject/galaxy/commit/541231bb1723b2aac3fede7f45ca…
Author: shane <shane(a)shanedowling.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/config.py
M lib/galaxy/util/pastescript/serve.py
Log Message:
-----------
Config-based port checker has been removed and adding in an exception checker for paste response
Commit: 4c3dfc7cd471181edc406724ca8f039e6b2a83d1
https://github.com/galaxyproject/galaxy/commit/4c3dfc7cd471181edc406724ca8f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/citation/citation-model.js
M static/maps/mvc/citation/citation-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
M templates/webapps/galaxy/workflow/editor.mako
Log Message:
-----------
Merge pull request #1321 from carlfeberhard/fix.citations
UI, Citations: fix citation-model's import of bibtex to use *either* …
Commit: 19cb62660a3779a6333696ec645f7fcee3db5bc5
https://github.com/galaxyproject/galaxy/commit/19cb62660a3779a6333696ec645f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/util/pastescript/serve.py
Log Message:
-----------
Merge pull request #1320 from shano/dev
Show a more user-friendly error when the webserver port is blocked
Commit: cc67557df8483899e7058f2047607d0e5339c4eb
https://github.com/galaxyproject/galaxy/commit/cc67557df8483899e7058f204760…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Merge pull request #1322 from guerler/fix_workflow_outputs
Fix workflow output step entries
Commit: b2a3684f03e42d3743d02f4d4f039d429bf5e235
https://github.com/galaxyproject/galaxy/commit/b2a3684f03e42d3743d02f4d4f03…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
R static/scripts/mvc/collection/paired-collection-creator.js
R static/scripts/mvc/history/history-panel.js
R static/scripts/mvc/upload/upload-row.js
R static/scripts/mvc/workflow/workflow.js
Log Message:
-----------
Merge pull request #1323 from jmchilton/fix_deleted_static
Remove left over packed scripts.
Commit: 946438ceba25151706ba2ca62e5c488e358c4f55
https://github.com/galaxyproject/galaxy/commit/946438ceba25151706ba2ca62e5c…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
A .ci/check_controller.sh
A .ci/check_mako.sh
A Makefile
A client/.docker-build.sh
A client/Dockerfile
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/mvc/citation/citation-model.js
M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
M client/galaxy/scripts/mvc/form/form-data.js
M client/galaxy/scripts/mvc/form/form-input.js
M client/galaxy/scripts/mvc/form/form-parameters.js
M client/galaxy/scripts/mvc/form/form-repeat.js
M client/galaxy/scripts/mvc/form/form-section.js
M client/galaxy/scripts/mvc/form/form-select-content.js
M client/galaxy/scripts/mvc/form/form-view.js
A client/galaxy/scripts/mvc/tool/tool-form-base.js
A client/galaxy/scripts/mvc/tool/tool-form-composite.js
A client/galaxy/scripts/mvc/tool/tool-form-workflow.js
A client/galaxy/scripts/mvc/tool/tool-form.js
A client/galaxy/scripts/mvc/tool/tool-template.js
R client/galaxy/scripts/mvc/tool/tools-form-base.js
R client/galaxy/scripts/mvc/tool/tools-form-workflow.js
R client/galaxy/scripts/mvc/tool/tools-form.js
R client/galaxy/scripts/mvc/tool/tools-jobs.js
R client/galaxy/scripts/mvc/tool/tools-template.js
M client/galaxy/scripts/mvc/tool/tools.js
M client/galaxy/scripts/mvc/ui/ui-drilldown.js
M client/galaxy/scripts/mvc/ui/ui-misc.js
M client/galaxy/scripts/mvc/ui/ui-portlet.js
M client/galaxy/scripts/mvc/ui/ui-select-default.js
M client/galaxy/scripts/mvc/ui/ui-slider.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M client/galaxy/scripts/utils/utils.js
M client/galaxy/style/less/ui.less
M config/dependency_resolvers_conf.xml.sample
M config/galaxy.ini.sample
M config/plugins/visualizations/charts/static/build-app.js
M config/plugins/visualizations/charts/static/library/ui-table-form.js
M config/plugins/visualizations/charts/static/views/editor.js
M config/reports.ini.sample
M config/tool_shed.ini.sample
A doc/source/admin/dependency_resolvers.rst
M doc/source/admin/index.rst
M doc/source/dev/faq.rst
M lib/galaxy/datatypes/metadata.py
M lib/galaxy/datatypes/text.py
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/custom_types.py
M lib/galaxy/model/mapping.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/deps/__init__.py
M lib/galaxy/tools/deps/resolvers/modules.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/dataset_matcher.py
M lib/galaxy/tools/parameters/dynamic_options.py
M lib/galaxy/util/pastescript/serve.py
M lib/galaxy/webapps/galaxy/api/workflows.py
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/reports/config.py
M lib/galaxy/webapps/tool_shed/config.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/tool_shed/galaxy_install/install_manager.py
M lib/tool_shed/galaxy_install/repair_repository_manager.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/install_environment.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py
M lib/tool_shed/util/tool_dependency_util.py
A static/maps/galaxy-app-base.js.map
M static/maps/mvc/citation/citation-model.js.map
M static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
M static/maps/mvc/dataset/dataset-li-edit.js.map
M static/maps/mvc/form/form-data.js.map
M static/maps/mvc/form/form-input.js.map
M static/maps/mvc/form/form-parameters.js.map
M static/maps/mvc/form/form-repeat.js.map
M static/maps/mvc/form/form-section.js.map
M static/maps/mvc/form/form-select-content.js.map
M static/maps/mvc/form/form-view.js.map
A static/maps/mvc/tool/tool-form-base.js.map
A static/maps/mvc/tool/tool-form-composite.js.map
A static/maps/mvc/tool/tool-form-workflow.js.map
A static/maps/mvc/tool/tool-form.js.map
A static/maps/mvc/tool/tool-template.js.map
R static/maps/mvc/tool/tools-form-base.js.map
R static/maps/mvc/tool/tools-form-workflow.js.map
R static/maps/mvc/tool/tools-form.js.map
R static/maps/mvc/tool/tools-jobs.js.map
R static/maps/mvc/tool/tools-template.js.map
M static/maps/mvc/tool/tools.js.map
R static/maps/mvc/tools.js.map
R static/maps/mvc/tools/tools-form-base.js.map
M static/maps/mvc/ui/ui-drilldown.js.map
M static/maps/mvc/ui/ui-misc.js.map
M static/maps/mvc/ui/ui-portlet.js.map
M static/maps/mvc/ui/ui-select-default.js.map
M static/maps/mvc/ui/ui-slider.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/maps/utils/utils.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/bundled/login.bundled.js
M static/scripts/bundled/login.bundled.js.map
M static/scripts/mvc/citation/citation-model.js
M static/scripts/mvc/collection/list-of-pairs-collection-creator.js
R static/scripts/mvc/collection/paired-collection-creator.js
M static/scripts/mvc/dataset/dataset-li-edit.js
M static/scripts/mvc/form/form-data.js
M static/scripts/mvc/form/form-input.js
M static/scripts/mvc/form/form-parameters.js
M static/scripts/mvc/form/form-repeat.js
M static/scripts/mvc/form/form-section.js
M static/scripts/mvc/form/form-select-content.js
M static/scripts/mvc/form/form-view.js
R static/scripts/mvc/history/history-panel.js
A static/scripts/mvc/tool/tool-form-base.js
A static/scripts/mvc/tool/tool-form-composite.js
A static/scripts/mvc/tool/tool-form-workflow.js
A static/scripts/mvc/tool/tool-form.js
A static/scripts/mvc/tool/tool-template.js
R static/scripts/mvc/tool/tools-form-base.js
R static/scripts/mvc/tool/tools-form-workflow.js
R static/scripts/mvc/tool/tools-form.js
R static/scripts/mvc/tool/tools-jobs.js
R static/scripts/mvc/tool/tools-template.js
M static/scripts/mvc/tool/tools.js
R static/scripts/mvc/tools.js
R static/scripts/mvc/tools/tools-form-base.js
M static/scripts/mvc/ui/ui-drilldown.js
M static/scripts/mvc/ui/ui-misc.js
M static/scripts/mvc/ui/ui-portlet.js
M static/scripts/mvc/ui/ui-select-default.js
M static/scripts/mvc/ui/ui-slider.js
R static/scripts/mvc/upload/upload-row.js
M static/scripts/mvc/workflow/workflow-view.js
R static/scripts/mvc/workflow/workflow.js
M static/scripts/utils/utils.js
M static/style/blue/base.css
M templates/webapps/galaxy/workflow/editor.mako
M templates/webapps/galaxy/workflow/editor_tool_form.mako
M templates/webapps/galaxy/workflow/run.mako
M test/api/test_tools.py
M test/api/test_workflows.py
M test/base/interactor.py
M test/docker/base/Dockerfile
M test/tool_shed/functional/test_1460_data_managers.py
M test/unit/tools/test_tool_deps.py
M tox.ini
Log Message:
-----------
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
Commit: 74be6f54cd1868f663dc89609c90a28c0db8214f
https://github.com/galaxyproject/galaxy/commit/74be6f54cd1868f663dc89609c90…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Fix for creating workflow outputs on initial workflow upload.
Commit: 86632afdd3b7f2dbfed47671779818835a075496
https://github.com/galaxyproject/galaxy/commit/86632afdd3b7f2dbfed476717798…
Author: carlfeberhard <carlfeberhard(a)users.noreply.github.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
R test/casperjs/api-workflow-tests.js
M test/casperjs/casperjs_runner.py
Log Message:
-----------
Merge pull request #1316 from jmchilton/remove_casper_api_tests
Remove worklfow casperjs API test.
Commit: f953005f72310279fe69a0deb0b9adef973bf6da
https://github.com/galaxyproject/galaxy/commit/f953005f72310279fe69a0deb0b9…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/lda_datasets.py
Log Message:
-----------
Fix typo causing the option "Link files instead of copying" to be ignored.
When uploading folders with the new data library interface.
Commit: 54b54b1f11a30bad0b2e15802c44b30e745ca4a6
https://github.com/galaxyproject/galaxy/commit/54b54b1f11a30bad0b2e15802c44…
Author: carlfeberhard <carlfeberhard(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/managers/users.py
Log Message:
-----------
UI, Users: when an first logging out, anon users may not have a history when they're serialized, return 0 usage from the user serilializer when this is the case
Commit: b3e3b359aec1bce3d7ee4a23289d96318f5b0af3
https://github.com/galaxyproject/galaxy/commit/b3e3b359aec1bce3d7ee4a23289d…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
Log Message:
-----------
Update Kombu and AMQP wheels to fix problems with El Capitan's System
Integrity Protection
Commit: c48965ffcc5d35877f00dcf1941317cf23c3d4f4
https://github.com/galaxyproject/galaxy/commit/c48965ffcc5d35877f00dcf19413…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/api/lda_datasets.py
Log Message:
-----------
Merge pull request #1326 from nsoranzo/release_15.10_link_data_only
[15.10] Fix typo causing the option "Link files instead of copying" to be ignored.
Commit: 31f174a4254e5cc4c85747a76c3908b0170cf358
https://github.com/galaxyproject/galaxy/commit/31f174a4254e5cc4c85747a76c39…
Author: Greg Von Kuster <ghv2(a)psu.edu>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Add enhancements to the Galaxy repository install process
to cleanly handle the case described here:
https://github.com/galaxyproject/galaxy/issues/667. Specifically, the
following scenario is now cleanly handled:
Example use case: In a toolshed I have a repository of a tool, say
package_new_gene_db_1_2_3, and in revision 1 it depends on
package_sqlite_1_0_0:
package_new_gene_db_1_2_3
package_sqlite_1_0_0
At some point in time I discover that postgres is a better solution for
my gene database, and I upload revision 2:
package_new_gene_db_1_2_3
package_postgres__2_0_0
And I remove the dependecy of sqlite. If I go to my galaxy instance and
I remove revision 1 and install revision 2, the installation is cleanly
handled with theis PR.
It should be noted that this enhancement could adversely impact
reproducibility if best practices are not followed with regard to
defining package dependencies. Since it is now cleanly possible to
eliminate dependencies over time, best practices must be followed to
ensure that elimination of a dependency does not affect the output of a
tool that uses the underlying hierarchy of packages.
Commit: a23e644a9cd7ab64f0fa56314ae5ec2b5a768f7a
https://github.com/galaxyproject/galaxy/commit/a23e644a9cd7ab64f0fa56314ae5…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
M lib/galaxy/webapps/tool_shed/controllers/repository.py
M lib/tool_shed/util/shed_util_common.py
Log Message:
-----------
Merge pull request #1329 from martenson/release_15.10
[15.10] Add enhancements to the Galaxy repository install process
Commit: bb0c1366f723b8236872d05da4c553a53d1aedc7
https://github.com/galaxyproject/galaxy/commit/bb0c1366f723b8236872d05da4c5…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
Log Message:
-----------
Merge pull request #1327 from natefoo/kombu-el-cap-wheels
Update Kombu and AMQP wheels to fix problems with El Capitan's System Integrity Protection
Commit: d5cddaf7cc4fa734cb738521167e854393e5d380
https://github.com/galaxyproject/galaxy/commit/d5cddaf7cc4fa734cb738521167e…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Merge pull request #1330 from jmchilton/failing_test
Fix for creating workflow outputs on initial workflow upload.
Commit: 9dad7f76c41845e23d07a8583950d41e4b60b3cf
https://github.com/galaxyproject/galaxy/commit/9dad7f76c41845e23d07a8583950…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Fix another instance of using _allow_workflow_parameters_in_context.
As recommended by @nsoranzo.
Commit: 7b11ebc52e30e6613e1b94c6db0db6bda70a5255
https://github.com/galaxyproject/galaxy/commit/7b11ebc52e30e6613e1b94c6db0d…
Author: Nicola Soranzo <nsoranzo(a)tiscali.it>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/__init__.py
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Merge pull request #1319 from jmchilton/workflow_validation_2
More tightening up of parameter validation during workflow stuff.
Commit: d1fd23a2f4e5c5408f469ee5560f526833f5f682
https://github.com/galaxyproject/galaxy/commit/d1fd23a2f4e5c5408f469ee5560f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
A config/plugins/visualizations/csg/config/csg.xml
A config/plugins/visualizations/csg/static/Detector.js
A config/plugins/visualizations/csg/static/OrbitControls.js
A config/plugins/visualizations/csg/static/PLYLoader.js
A config/plugins/visualizations/csg/static/VTKLoader.js
A config/plugins/visualizations/csg/static/dat.gui.min.js
A config/plugins/visualizations/csg/static/three.min.js
A config/plugins/visualizations/csg/templates/csg.mako
Log Message:
-----------
Merge pull request #1254 from gregvonkuster/dev
Add the CSG Viewer visualization plugin
Commit: cf5d209e0f01b7fb13e06f013f2a3693f194ebb4
https://github.com/galaxyproject/galaxy/commit/cf5d209e0f01b7fb13e06f013f2a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/history/copy-dialog.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/ui/popup-menu.js
M client/galaxy/scripts/mvc/ui/ui-modal.js
M client/galaxy/scripts/utils/ajax-queue.js
M lib/galaxy/model/__init__.py
M lib/galaxy/webapps/galaxy/api/histories.py
M lib/galaxy/webapps/galaxy/controllers/history.py
M static/maps/mvc/history/copy-dialog.js.map
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/ui/popup-menu.js.map
M static/maps/mvc/ui/ui-modal.js.map
M static/maps/utils/ajax-queue.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/history/copy-dialog.js
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/ui/popup-menu.js
M static/scripts/mvc/ui/ui-modal.js
M static/scripts/utils/ajax-queue.js
M templates/display_base.mako
M templates/grid_base.mako
R templates/webapps/galaxy/history/copy.mako
M templates/webapps/galaxy/history/display.mako
M templates/webapps/galaxy/history/embed.mako
M templates/webapps/galaxy/history/grid.mako
A templates/webapps/galaxy/history/grid_js.mako
A templates/webapps/galaxy/history/shared_grid.mako
M templates/webapps/galaxy/history/view.mako
M templates/webapps/galaxy/visualization/display.mako
M templates/webapps/galaxy/visualization/display_in_frame.mako
M test/casperjs/api-anon-history-permission-tests.js
M test/casperjs/api-anon-history-tests.js
M test/unit/managers/test_HistoryManager.py
Log Message:
-----------
Manual merge of #1303 to resolve build artifact conflicts.
Commit: 99f9d7724c53326330a41fa6a1b1c36624fef02d
https://github.com/galaxyproject/galaxy/commit/99f9d7724c53326330a41fa6a1b1…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/managers/libraries.py
Log Message:
-----------
Use the datetime object instead of a string for pretty interval formatting.
Commit: 0c8df84685c587322f6c3b83ea45c0b20819d3ab
https://github.com/galaxyproject/galaxy/commit/0c8df84685c587322f6c3b83ea45…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/managers/users.py
Log Message:
-----------
Merge pull request #1328 from carlfeberhard/fix.quotameter
UI, Users: when an first logging out, anon users may not have a histo…
Commit: f1c36485c1ecef33667f3c35bad44899233d04f5
https://github.com/galaxyproject/galaxy/commit/f1c36485c1ecef33667f3c35bad4…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/dataset.py
Log Message:
-----------
Don't bother querying on unencoded IDs
Commit: ea785ea598371f7aef0b37df59996e892d82f281
https://github.com/galaxyproject/galaxy/commit/ea785ea598371f7aef0b37df5999…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/managers/libraries.py
Log Message:
-----------
Merge pull request #1339 from dannon/library_datetime_tweak
Use the datetime object instead of a string for pretty interval formatting.
Commit: 41b77d0c1352e569d861ed327fd523dd12efffae
https://github.com/galaxyproject/galaxy/commit/41b77d0c1352e569d861ed327fd5…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M Makefile
M client/README.md
Log Message:
-----------
Use local versions of node modules instead of system-installed, add a 'build-it-all' target for building the whole client.
Fix two old typos.
Commit: 8cc10c98ec4569ccfe1226d4c28a8526abbf3f44
https://github.com/galaxyproject/galaxy/commit/8cc10c98ec4569ccfe1226d4c28a…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/webapps/galaxy/controllers/dataset.py
Log Message:
-----------
Merge pull request #1340 from erasche/id_decoding
Don't bother querying on unencoded IDs for error form
Commit: b9cba364982a9fa77fc2952fb803da75ee8d26e2
https://github.com/galaxyproject/galaxy/commit/b9cba364982a9fa77fc2952fb803…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M Makefile
M client/README.md
Log Message:
-----------
Merge pull request #1337 from dannon/makefile_singletarget
Simpler build-it-all rule in Makefile
Commit: d41caa53cf24aca29bb90e32b420558558461d9c
https://github.com/galaxyproject/galaxy/commit/d41caa53cf24aca29bb90e32b420…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py
Log Message:
-----------
Database migration enabling subworkflow and input parameter modules.
Commit: 45962f32344a00162f5d04b94096c8a570f2adf1
https://github.com/galaxyproject/galaxy/commit/45962f32344a00162f5d04b94096…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/tools/parameters/__init__.py
M lib/galaxy/web/framework/formbuilder.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M test/api/test_workflows.py
M test/api/workflows_format_2/converter.py
Log Message:
-----------
Input parameter workflow module (experimental).
- Implement a input parameter module that mirrors data and collection input modules but has a type that can currently be one of text, integer, float, color, and boolean.
- Allow connections between these and tool step inputs.
- Extend model to support this.
- Add new input types for format 2 workflow definitions for various types that all map to this kind of step. Typed inputs such as this match well with CWL workflow inputs.
Someday I imagine these will be superior to just marking a tool input "Specify at Runtime" for all the same reasons input steps are superior to leaving inputs unattached.
Commit: 157939aa8f46b7599f48011d9f1e2c40c9f6cd47
https://github.com/galaxyproject/galaxy/commit/157939aa8f46b7599f48011d9f1e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/tool/tool-form-workflow.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor.mako
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
M test/unit/test_galaxy_mapping.py
M test/unit/workflows/test_modules.py
M test/unit/workflows/test_run_parameters.py
M test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Implement nested workflows.
Details:
- Add a new workflow module describing subworkflows.
- Add workflow list to editor side panel - with options to link in a subworkflow module or copy the target workflow into the workflow being editted node for node.
- Update workflow, workflow step, and workflow invocation models to track subworkflow connections and execution.
- Extend workflow outputs with concepts of labels (and UUIDs while I'm there) to match workflow inputs. This allow us to have something to label outputs with in the workflow editor and to reference in the format 2 workflow description language.
- Extend workflow editor UI to allow labeling workflow outputs (and enforce that these are unique across a workflow).
- Extend workflow invocation and progress tracking to allow invoking a subworkflow as part of another workflow invocation.
- Extend workflow import and export code to allow a nested representation of workflows.
- Update format 2 workflow description to allow testing nested workflows.
Most relevant new and modified test cases can be run using the following commands:
```
./run_tests.sh -api test/api/test_workflows.py:WorkflowsApiTestCase.test_run_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_subworkflow_simple
./run_tests.sh -api test/api/test_workflows_from_yaml.py:WorkflowsFromYamlApiTestCase.test_outputs
nosetests test/unit/test_galaxy_mapping.py
nosetests test/unit/workflows/test_workflow_progress.py
```
Commit: f88ad8d4e35b51a5f88b0d29b71755f576fc1f7a
https://github.com/galaxyproject/galaxy/commit/f88ad8d4e35b51a5f88b0d29b717…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-workflow.js
Log Message:
-----------
Fix Change type label in editor form
Commit: 48eec81f48f92d7b5e7a42a9cf4be453f9f14fa5
https://github.com/galaxyproject/galaxy/commit/48eec81f48f92d7b5e7a42a9cf4b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Allow specifying workflow outputs on subworkflow nodes.
Commit: 1b3ee81dbae9375443ea396280c1e418cae84876
https://github.com/galaxyproject/galaxy/commit/1b3ee81dbae9375443ea396280c1…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Merge pull request #1314 from nsoranzo/release_15.10_tool_load_fixes
[15.10] When loading a tool from Tool Shed, check that the <installed_changeset_revision> element matches the tool path.
Commit: f10b968075e37b650f46811f6f83286c6aaefccd
https://github.com/galaxyproject/galaxy/commit/f10b968075e37b650f46811f6f83…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor.mako
Log Message:
-----------
Build section dom in js
Commit: b4bfde4089a5f1893ddd839fa4a2c34c71378ae2
https://github.com/galaxyproject/galaxy/commit/b4bfde4089a5f1893ddd839fa4a2…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Fix attribute
Commit: 530ceb13befdc0850efb9db47c5389c3218338b3
https://github.com/galaxyproject/galaxy/commit/530ceb13befdc0850efb9db47c53…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M test/qunit/tests/workflow_editor_tests.js
Log Message:
-----------
Fix for failing qunit test.
Commit: 952eb34f447772918f8af7f66779c5dfa734424a
https://github.com/galaxyproject/galaxy/commit/952eb34f447772918f8af7f66779…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
Log Message:
-----------
Upgrade Paste to 2.0.2
Commit: f54138237dcba721d61af5f692b3195e812a6939
https://github.com/galaxyproject/galaxy/commit/f54138237dcba721d61af5f692b3…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Fix optional parameters
Commit: fc85857a71a270172e8390c1846daad86f547b14
https://github.com/galaxyproject/galaxy/commit/fc85857a71a270172e8390c1846d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/output_collect.py
A lib/galaxy/tools/parser/output_collection_def.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M test/unit/tools/test_collect_primary_datasets.py
Log Message:
-----------
Separate abstractions for parsing discovered datasets and discovering.
This is part of a long effort to build a galaxy.tools.parser module that has no dependencies outside of say galaxy.util - so I can add it to the code shared with planemo and pulsar. This would allow planemo (and by extension Tool Shed 2.0) to reason about tools in an abstract way without the billion dependencies of galxaxy.tools.Tool.
Commit: 586ab24970856f12112714759f1ead088bc48a04
https://github.com/galaxyproject/galaxy/commit/586ab24970856f12112714759f1e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
R lib/galaxy/tools/parameters/output.py
M lib/galaxy/tools/parser/interface.py
A lib/galaxy/tools/parser/output_actions.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
Log Message:
-----------
Move galaxy.tools.parameters.outputs into galaxy.tools.paraser.output_actions.
This module has not external dependencies so it is prefect for the parser module. There still remains work to be done to separate it from XML.
Commit: 8480f9187e8cae34fc4822ae1d2d8971f3504f5a
https://github.com/galaxyproject/galaxy/commit/8480f9187e8cae34fc4822ae1d2d…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/dependencies/requirements.txt
Log Message:
-----------
Merge pull request #1344 from natefoo/paste2
Upgrade Paste to 2.0.2
Commit: 191f75407ed955b3b0836b7503616f664f0d0a73
https://github.com/galaxyproject/galaxy/commit/191f75407ed955b3b0836b750361…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/parameters/basic.py
Log Message:
-----------
Merge pull request #1343 from guerler/fix_validation_000
Fix optional parameters
Commit: e38e4449cddc0a6b31ca6f19d849cae1796e22df
https://github.com/galaxyproject/galaxy/commit/e38e4449cddc0a6b31ca6f19d849…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/jobs/runners/local.py
Log Message:
-----------
If GALAXY_SLOTS is defined in the environment, use it for the local runner when job destinations haven't been configured.
Commit: 984ceb104d91cdd23daf8a1b6c2382d1eacd1e90
https://github.com/galaxyproject/galaxy/commit/984ceb104d91cdd23daf8a1b6c23…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/model/item_attrs.py
M lib/galaxy/model/tool_shed_install/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/grouping.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/panel.py
A lib/galaxy/util/dictifiable.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
Log Message:
-----------
Move Dictifiable out of model package into util.
Many objects that aren't model objects are Dictifiable at this point so there is no reason to have this in model. This changes eliminates Dictifiable's dependency on sqlalchemy (by using a more pythonic type check). Now that Dictifiable has no external dependencies, it is much easier to reuse it (and more important objects that extend it) in other projects such as planemo.
Commit: d24bc3df1e627a0586860600a89352f6bddf49b1
https://github.com/galaxyproject/galaxy/commit/d24bc3df1e627a0586860600a893…
Author: Lance Parsons <lparsons(a)genomics.princeton.edu>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
Log Message:
-----------
Use both SLURM_NTASKS and SLURM_CPUS_PER_TASK to set GALAXY_SLOTS
Commit: f51ee306b1e88001f76fd818e495cdbd9db2e10c
https://github.com/galaxyproject/galaxy/commit/f51ee306b1e88001f76fd818e495…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/jobs/runners/local.py
Log Message:
-----------
Merge pull request #1346 from dannon/local_slots
If GALAXY_SLOTS is defined in the environment, use it for the local r…
Commit: c8e61140e7b297356f1830d46761660a85d7b79d
https://github.com/galaxyproject/galaxy/commit/c8e61140e7b297356f1830d46761…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
R lib/galaxy/util/lrucache.py
Log Message:
-----------
Remove unused lrucache.py file in galaxy.util.
Added without context in https://github.com/galaxyproject/galaxy/commit/88164c123d3faafe04bf38193e60….
Commit: 869b1a4ef0ec647cca1420e6c0f82023c5ffbad0
https://github.com/galaxyproject/galaxy/commit/869b1a4ef0ec647cca1420e6c0f8…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/util/hash_util.py
Log Message:
-----------
Remove Python 2.4- from hash_util.py.
Commit: 73dce68376df898d01cc8fcf843d363914a39adf
https://github.com/galaxyproject/galaxy/commit/73dce68376df898d01cc8fcf843d…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
R lib/galaxy/util/debugging.py
Log Message:
-----------
Remove seemingly unused debugging.py.
Add in https://github.com/galaxyproject/galaxy/commit/017a3c356b8742dd09e65f1c6ce8….
Commit: 87ce6c778ffc9087d589914a5eec640da067c231
https://github.com/galaxyproject/galaxy/commit/87ce6c778ffc9087d589914a5eec…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Fix for loading workflows that have tool verions / step upgrade messages.
Commit: 14d25e9d426ef6fb329c0a04f0c0fdf0beabe9bf
https://github.com/galaxyproject/galaxy/commit/14d25e9d426ef6fb329c0a04f0c0…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/managers/workflows.py
Log Message:
-----------
Merge pull request #1348 from blankenberg/workflow_fix
Fix for loading workflows that have tool version / step upgrade messages.
Commit: 83f57c56c183f38b6a8915d506dbf6d00c634c65
https://github.com/galaxyproject/galaxy/commit/83f57c56c183f38b6a8915d506db…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/model/__init__.py
M lib/galaxy/util/__init__.py
A lib/galaxy/util/multi_byte.py
M tools/data_source/upload.py
Log Message:
-----------
Refactor is_multi_byte out of galaxy.util.
It introduces a fairly esoteric dependency in galaxy.util for just a couple uses in Galaxy. Separating it out like this will allow reuse of the entire galaxy.util with only one external dependency (docutils, which planemo for instance already depends on).
Commit: 61f64e828530c54bae6a090580a6e4278b32a699
https://github.com/galaxyproject/galaxy/commit/61f64e828530c54bae6a090580a6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parser/__init__.py
M lib/galaxy/tools/parser/output_actions.py
A lib/galaxy/tools/parser/output_objects.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/workflow/extract.py
M test/unit/tools/test_actions.py
M test/unit/tools/test_evaluation.py
Log Message:
-----------
Refactor tool output classes out of galaxy.tools and into parser module.
This makes the galaxy.tool.parser much more portable, it no longer has a dependency on anything in galaxy.tools or submodules except galaxy.tools.loader (which in turn has no dependencies on galaxy.tools or submodules).
Commit: 12014cc2252d710b617953dbfcc804fc9b3f0a67
https://github.com/galaxyproject/galaxy/commit/12014cc2252d710b617953dbfcc8…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/workflow/modules.py
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Show correct subworkflow name
Commit: 2ff3bf0c0c66946557f21f0bafa55768b7a8cd63
https://github.com/galaxyproject/galaxy/commit/2ff3bf0c0c66946557f21f0bafa5…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Fix label change handling
Commit: c9016f9553784b3a83f448c787fa8b90e11a2599
https://github.com/galaxyproject/galaxy/commit/c9016f9553784b3a83f448c787fa…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/workflow/modules.py
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/mvc/workflow/workflow-view.js
Log Message:
-----------
Merge pull request #15 from guerler/fix_subworkflows_005
Fix subworkflows 005
Commit: e52cc6614769c0b332c32a1068db816917a5708c
https://github.com/galaxyproject/galaxy/commit/e52cc6614769c0b332c32a1068db…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/parameters/basic.py
R lib/galaxy/tools/parameters/output.py
M lib/galaxy/tools/parameters/output_collect.py
M lib/galaxy/tools/parser/interface.py
A lib/galaxy/tools/parser/output_actions.py
A lib/galaxy/tools/parser/output_collection_def.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M test/unit/tools/test_collect_primary_datasets.py
Log Message:
-----------
Merge pull request #1349 from jmchilton/planemo_refactor_0
Refactor tool parsing handling toward reuse outside Galaxy
Commit: 58ce52a0bae5971670a99bf41502867b02ebb1f3
https://github.com/galaxyproject/galaxy/commit/58ce52a0bae5971670a99bf41502…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/model/__init__.py
M lib/galaxy/model/item_attrs.py
M lib/galaxy/model/tool_shed_install/__init__.py
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/data/__init__.py
M lib/galaxy/tools/parameters/basic.py
M lib/galaxy/tools/parameters/grouping.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/panel.py
A lib/galaxy/util/dictifiable.py
M lib/galaxy/web/base/controller.py
M lib/galaxy/webapps/tool_shed/model/__init__.py
Log Message:
-----------
Merge pull request #1350 from jmchilton/dictifiable_refactor
Move Dictifiable out of model package into util.
Commit: 8e0b6af87658cd2a014a16cdf35349db6e61a84d
https://github.com/galaxyproject/galaxy/commit/8e0b6af87658cd2a014a16cdf353…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
R lib/galaxy/util/debugging.py
M lib/galaxy/util/hash_util.py
R lib/galaxy/util/lrucache.py
Log Message:
-----------
Merge pull request #1351 from jmchilton/util_clean_0
Remove some unused stuff from galaxy.util.
Commit: 1ec67c864b3af590c337d86c2f2a6b52ae96fd0e
https://github.com/galaxyproject/galaxy/commit/1ec67c864b3af590c337d86c2f2a…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/model/__init__.py
M lib/galaxy/util/__init__.py
A lib/galaxy/util/multi_byte.py
M tools/data_source/upload.py
Log Message:
-----------
Merge pull request #1352 from jmchilton/multibyte_refactor
Refactor is_multi_byte out of top-level galaxy.util.
Commit: 66944ba7de178cc45ffa7a4aa9253ec4512cb6fd
https://github.com/galaxyproject/galaxy/commit/66944ba7de178cc45ffa7a4aa925…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
A .ci/flake8_py3_wrapper.sh
A .ci/py3_sources.txt
M lib/galaxy/jobs/metrics/collectl/processes.py
M lib/galaxy/jobs/metrics/instrumenters/meminfo.py
M lib/galaxy/objectstore/s3_multipart_upload.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/integrated_panel.py
M lib/galaxy/util/__init__.py
M lib/galaxy/util/backports/importlib/__init__.py
M lib/galaxy/util/biostar.py
M lib/galaxy/util/dictobj.py
M lib/galaxy/util/inflection.py
M lib/galaxy/util/json.py
M lib/galaxy/util/multi_byte.py
M lib/galaxy/util/object_wrapper.py
M lib/galaxy/util/pastescript/loadwsgi.py
M lib/galaxy/util/pastescript/serve.py
M lib/galaxy/util/sanitize_html.py
M lib/galaxy/util/validation.py
M tox.ini
Log Message:
-----------
Lint with Python 3 serveral modules.
Namely the modules I'd like to be shared with planemo, pulsar, etc....
Commit: cdf9380735878d44fee863c86b69a686ab0fd76f
https://github.com/galaxyproject/galaxy/commit/cdf9380735878d44fee863c86b69…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/util/__init__.py
Log Message:
-----------
PY3 fixes for galaxy.util.
Commit: 7a36b141bd72b7fc2c675254c10779dace9be6e1
https://github.com/galaxyproject/galaxy/commit/7a36b141bd72b7fc2c675254c107…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/util/aliaspickler.py
M lib/galaxy/util/expressions.py
M lib/galaxy/util/object_wrapper.py
M lib/galaxy/util/odict.py
Log Message:
-----------
PY3 fixes for galaxy.util submodules.
Commit: 41da9b0f88727759d1d2453a90b548858d10ffa7
https://github.com/galaxyproject/galaxy/commit/41da9b0f88727759d1d2453a90b5…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/tool/tool-form-workflow.js
M client/galaxy/scripts/mvc/workflow/workflow-manager.js
M client/galaxy/scripts/mvc/workflow/workflow-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view-data.js
M client/galaxy/scripts/mvc/workflow/workflow-view-node.js
M client/galaxy/scripts/mvc/workflow/workflow-view.js
M lib/galaxy/managers/workflows.py
M lib/galaxy/model/__init__.py
M lib/galaxy/model/mapping.py
A lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py
M lib/galaxy/tools/parameters/__init__.py
M lib/galaxy/web/framework/formbuilder.py
M lib/galaxy/webapps/galaxy/controllers/workflow.py
M lib/galaxy/workflow/modules.py
M lib/galaxy/workflow/run.py
M lib/galaxy/workflow/run_request.py
M static/maps/mvc/tool/tool-form-workflow.js.map
M static/maps/mvc/workflow/workflow-manager.js.map
M static/maps/mvc/workflow/workflow-node.js.map
M static/maps/mvc/workflow/workflow-view-data.js.map
M static/maps/mvc/workflow/workflow-view-node.js.map
M static/maps/mvc/workflow/workflow-view.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/tool/tool-form-workflow.js
M static/scripts/mvc/workflow/workflow-manager.js
M static/scripts/mvc/workflow/workflow-node.js
M static/scripts/mvc/workflow/workflow-view-data.js
M static/scripts/mvc/workflow/workflow-view-node.js
M static/scripts/mvc/workflow/workflow-view.js
M templates/webapps/galaxy/workflow/editor.mako
M test/api/test_workflows.py
M test/api/test_workflows_from_yaml.py
M test/api/workflows_format_2/converter.py
M test/qunit/tests/workflow_editor_tests.js
M test/unit/test_galaxy_mapping.py
M test/unit/workflows/test_modules.py
M test/unit/workflows/test_run_parameters.py
M test/unit/workflows/test_workflow_progress.py
M test/unit/workflows/workflow_support.py
Log Message:
-----------
Merge pull request #1306 from common-workflow-language/subworkflows
New Workflow Modules - Input Parameters and Subworkflows
Commit: 50e531aa5971bee6f727ad0013b45c4a5d052fc9
https://github.com/galaxyproject/galaxy/commit/50e531aa5971bee6f727ad0013b4…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
R lib/galaxy/datatypes/checkers.py
M lib/galaxy/datatypes/converters/fastq_to_fqtoc.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/datatypes/tabular.py
A lib/galaxy/util/checkers.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/webapps/tool_shed/controllers/upload.py
M lib/tool_shed/metadata/metadata_generator.py
M lib/tool_shed/util/commit_util.py
M lib/tool_shed/util/shed_util_common.py
M lib/tool_shed/util/tool_util.py
M tools/data_source/upload.py
Log Message:
-----------
Refactor galaxy.datatypes.checkers into galaxy.util.checkers.
- Primary reason is because it is used all over the place in contexts that have nothing to do with Galaxy datatype classes or datatype registery or sniffing, most importantly by the code in the tool shed for determining if something is a tool or not.
- This code has no dependencies on the datatypes module or any hard dependencies on things not in the Python standard library.
Commit: b0deead9c3260598f83d1ab2ec74b3c3e8974456
https://github.com/galaxyproject/galaxy/commit/b0deead9c3260598f83d1ab2ec74…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/utils/uploadbox.js
M static/maps/utils/uploadbox.js.map
M static/scripts/utils/uploadbox.js
Log Message:
-----------
Fix change handler association
Commit: 1562c74b2b93aaea78c3fed62ed1de9a76ebe3e2
https://github.com/galaxyproject/galaxy/commit/1562c74b2b93aaea78c3fed62ed1…
Author: Eric Rasche <rasche.eric(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
A .ci/flake8_py3_wrapper.sh
A .ci/py3_sources.txt
M lib/galaxy/jobs/metrics/collectl/processes.py
M lib/galaxy/jobs/metrics/instrumenters/meminfo.py
M lib/galaxy/objectstore/s3_multipart_upload.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/integrated_panel.py
M lib/galaxy/util/__init__.py
M lib/galaxy/util/backports/importlib/__init__.py
M lib/galaxy/util/biostar.py
M lib/galaxy/util/dictobj.py
M lib/galaxy/util/inflection.py
M lib/galaxy/util/json.py
M lib/galaxy/util/multi_byte.py
M lib/galaxy/util/object_wrapper.py
M lib/galaxy/util/pastescript/loadwsgi.py
M lib/galaxy/util/pastescript/serve.py
M lib/galaxy/util/sanitize_html.py
M lib/galaxy/util/validation.py
M tox.ini
Log Message:
-----------
Merge pull request #1354 from jmchilton/py3_0
Lint with Python 3 several modules.
Commit: b4683fbce4cf7c133fdd8af6c6fef58a5bf3c76d
https://github.com/galaxyproject/galaxy/commit/b4683fbce4cf7c133fdd8af6c6fe…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M lib/galaxy/webapps/galaxy/api/remote_files.py
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/mvc/library/library-foldertoolbar-view.js
Log Message:
-----------
raise and show specific exception and warning when no files detected
Commit: 6f3852188e35612800c6a5ab47b0dc800263778b
https://github.com/galaxyproject/galaxy/commit/6f3852188e35612800c6a5ab47b0…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py
Log Message:
-----------
Update documentation in migration 131 to not be copypasta.
Commit: f6557964b6b88b1752ea70e1132610596f6fa103
https://github.com/galaxyproject/galaxy/commit/f6557964b6b88b1752ea70e11326…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/model/migrate/versions/0131_subworkflow_and_input_paramter_modules.py
Log Message:
-----------
Merge pull request #1361 from dannon/oops_copypasta
Update documentation in migration 131
Commit: 2d7c2019fba1b3de89a5a5183c7bd147a309f958
https://github.com/galaxyproject/galaxy/commit/2d7c2019fba1b3de89a5a5183c7b…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M lib/galaxy/webapps/galaxy/api/remote_files.py
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/mvc/library/library-foldertoolbar-view.js
Log Message:
-----------
Merge pull request #1360 from martenson/raise-specific-exception
[15.10] datalibs: raise and show specific exception and warning when no files detected
Commit: abd51e7f791c99a93062b9f2fee7827dea857c20
https://github.com/galaxyproject/galaxy/commit/abd51e7f791c99a93062b9f2fee7…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/utils/uploadbox.js
M static/maps/utils/uploadbox.js.map
M static/scripts/utils/uploadbox.js
Log Message:
-----------
Merge pull request #1358 from guerler/fix_same_upload_000
[15.10] Fix change handler association
Commit: d9068a808994dee2b1c0ea873365846706e03d70
https://github.com/galaxyproject/galaxy/commit/d9068a808994dee2b1c0ea873365…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/util/__init__.py
Log Message:
-----------
Merge pull request #1359 from jmchilton/py3_0
PY3 fixes for galaxy.util.
Commit: 872458f8b9ebda4d86863b3d0ca2a9d74e0b53ba
https://github.com/galaxyproject/galaxy/commit/872458f8b9ebda4d86863b3d0ca2…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/util/aliaspickler.py
M lib/galaxy/util/expressions.py
M lib/galaxy/util/object_wrapper.py
M lib/galaxy/util/odict.py
Log Message:
-----------
Merge pull request #1362 from jmchilton/py3_1
PY3 fixes for galaxy.util submodules.
Commit: e7f4ec9685f345c13309b16412fd22a6ddadf852
https://github.com/galaxyproject/galaxy/commit/e7f4ec9685f345c13309b16412fd…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M lib/galaxy/app.py
M lib/galaxy/jobs/command_factory.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/imp_exp/__init__.py
A lib/galaxy/tools/special_tools.py
Log Message:
-----------
Merge pull request #1307 from jmchilton/collection_opts_prereq1
Refactor tool stuff for generic model actions
Commit: 80a35c21841671907d326e4fb6cedb433389648d
https://github.com/galaxyproject/galaxy/commit/80a35c21841671907d326e4fb6ce…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
R lib/galaxy/datatypes/checkers.py
M lib/galaxy/datatypes/converters/fastq_to_fqtoc.py
M lib/galaxy/datatypes/sequence.py
M lib/galaxy/datatypes/sniff.py
M lib/galaxy/datatypes/tabular.py
A lib/galaxy/util/checkers.py
M lib/galaxy/webapps/tool_shed/api/repositories.py
M lib/galaxy/webapps/tool_shed/controllers/upload.py
M lib/tool_shed/metadata/metadata_generator.py
M lib/tool_shed/util/commit_util.py
M lib/tool_shed/util/shed_util_common.py
M lib/tool_shed/util/tool_util.py
M tools/data_source/upload.py
Log Message:
-----------
Merge pull request #1363 from jmchilton/checkers_refactor
Refactor galaxy.datatypes.checkers into galaxy.util.checkers.
Commit: 455372e6bf711d64947768f8b05418f8e6b49647
https://github.com/galaxyproject/galaxy/commit/455372e6bf711d64947768f8b054…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/actions/__init__.py
M lib/galaxy/tools/execute.py
M lib/galaxy/tools/parser/__init__.py
M lib/galaxy/tools/parser/output_actions.py
A lib/galaxy/tools/parser/output_objects.py
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/workflow/extract.py
M test/unit/tools/test_actions.py
M test/unit/tools/test_evaluation.py
Log Message:
-----------
Merge pull request #1353 from jmchilton/output_refactor
Refactor tool output classes out of galaxy.tools and into parser module.
Commit: 04f5ed4552d5b0b837eabded18704eeda5cc8c26
https://github.com/galaxyproject/galaxy/commit/04f5ed4552d5b0b837eabded1870…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M client/galaxy/scripts/layout/menu.js
M static/maps/layout/menu.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/layout/menu.js
Log Message:
-----------
Reimplement menu onclick functionality that appears to have been dropped (probably a bad merge?) in the webpack PR.
Commit: b5ad20401b28e29b727c1212be5443d7dd9c2dad
https://github.com/galaxyproject/galaxy/commit/b5ad20401b28e29b727c1212be54…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Refactor UI component out of AbstractToolBox.
If it belongs in the base class ToolBox which is more concerned with Galaxy-spcifics like UI, AbstractToolBox is suppose to be an abstract description of a toolbox - it is about data management.
Commit: 536b4e2a2038d889486bbf0836341e03d737f53c
https://github.com/galaxyproject/galaxy/commit/536b4e2a2038d889486bbf083634…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/util/__init__.py
M lib/tool_shed/util/common_util.py
Log Message:
-----------
Improve some random tool shed code.
Commit: 914adfcc0cd5e8b060df059da9a4f8e9b1293fde
https://github.com/galaxyproject/galaxy/commit/914adfcc0cd5e8b060df059da9a4…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/toolbox/base.py
M lib/tool_shed/metadata/metadata_generator.py
Log Message:
-----------
Sychronize tool shed, planemo, and toolbox code for filtering out non-tool XML files.
A single abstraction will allow toolbox and planemo to deal with other kinds of tools in the future, and the stronger preconditions should eliminate some busy error logging when monitoring a tool directory.
Commit: 20b47f3ca208ded3682f68591f5801b85547efc1
https://github.com/galaxyproject/galaxy/commit/20b47f3ca208ded3682f68591f58…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/loader_directory.py
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Update looks_like_a_tool to respect enable_beta_tool_formats.
Default is off obviously, so for instance the tool shed will never think unsupported beta tools are real tools.
Commit: a8ed6146e88642b17273e316c571c5a5a9f4df45
https://github.com/galaxyproject/galaxy/commit/a8ed6146e88642b17273e316c571…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/parser/factory.py
M lib/galaxy/tools/parser/yaml.py
M lib/galaxy/util/odict.py
Log Message:
-----------
Tweak YAML tools to use ordered dictionaries.
Order of inputs and outputs in Galaxy is important, so preserve this order if using dictionary-style (both available) for inputs and/or outputs.
Commit: 75e7276e5e9c43ec6f09f68adea2870b3a6917dc
https://github.com/galaxyproject/galaxy/commit/75e7276e5e9c43ec6f09f68adea2…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
M lib/galaxy/tools/toolbox/lineages/tool_shed.py
Log Message:
-----------
Eliminate sqlalchemy and tool shed dependencies from AbstractToolBox.
Provide an extension point instead that allows Galaxy's ToolBox class to provide the functionality that required these dependencies. And optionally load ToolVersion class required for reasoning about tool shed logic.
Commit: e06bf5a32052d6cf474cb5c3d195f632ffe8b9e4
https://github.com/galaxyproject/galaxy/commit/e06bf5a32052d6cf474cb5c3d195…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py
Log Message:
-----------
Allow installation of different repositories with the same name in a single install transaction.
Commit: c6fbf987d2c4422eda793fa817f0ce83931d0119
https://github.com/galaxyproject/galaxy/commit/c6fbf987d2c4422eda793fa817f0…
Author: Marius van den Beek <m.vandenbeek(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/tool_shed/galaxy_install/repository_dependencies/repository_dependency_manager.py
Log Message:
-----------
Whitespaces around operator.
Commit: b7b8f097d5a7617b2997f254b4e0229adfaae623
https://github.com/galaxyproject/galaxy/commit/b7b8f097d5a7617b2997f254b4e0…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/parser/yaml.py
Log Message:
-----------
Enhance YAML/dictionary tool rep. to allow output collections.
Commit: f042fe8548ec4a0f2f29b72d0c34736e2ff524f9
https://github.com/galaxyproject/galaxy/commit/f042fe8548ec4a0f2f29b72d0c34…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M test/api/test_jobs.py
Log Message:
-----------
Attempt to fix transiently failing API tests.
- Fix default timeout of wait_on_state api helper. Had the wrong default specified and might fix this failure: https://jenkins.galaxyproject.org/job/docker-api/229/testReport/junit/api.t…
- Modify job search test case to allow a little more time between the history being "ok" and the job, in case there is a timing condition if the HDA is committed first and then job. Also improve the test output in case this isn't the problem.
Commit: 93c6d0542124c220e36c1e90d62e3e2aef607e9a
https://github.com/galaxyproject/galaxy/commit/93c6d0542124c220e36c1e90d62e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M lib/galaxy/tools/parser/xml.py
M lib/galaxy/tools/test.py
M test/base/twilltestcase.py
A test/functional/tools/maxseconds.xml
M test/functional/tools/samples_tool_conf.xml
Log Message:
-----------
Revise and fix waiting for tool tests.
- maxseconds on test tag stopped being respected at some point, fix that.
- maxseconds on test tag stopped being parsed at some later point, fix that.
- Revise default behavior so it can be overridden with yet another testing environment variable GALAXY_TEST_DEFAULT_WAIT.
- Add test case to ensure there is no future regression of these behaviors.
Commit: ffb973477b02c4bc1cbfa95c7a6247f1d7949fdd
https://github.com/galaxyproject/galaxy/commit/ffb973477b02c4bc1cbfa95c7a62…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M scripts/functional_tests.py
Log Message:
-----------
Do not check for tool migrations when running tests.
This is an inappropriate time for the check and causes slow down when running tests.
Commit: 641b275aa424421591833f6a3bce3ebd8b358017
https://github.com/galaxyproject/galaxy/commit/641b275aa424421591833f6a3bce…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M test/api/helpers.py
M test/api/test_jobs.py
Log Message:
-----------
Wait on jobs and history in certain API test cases.
This strategy proved to work around certain race conditions in tool testing so hopefully it will solve the transiently failing job searching and filtering test cases.
Commit: 57a76065a54f63a47874158c121f002308648025
https://github.com/galaxyproject/galaxy/commit/57a76065a54f63a47874158c121f…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M test/api/helpers.py
Log Message:
-----------
Fix missing assertion pointed out @nsoranzo.
Lots of other tests would fail if simple uploads aren't working, but it is better to be direct and very explicit about why this particular test is failing.
Commit: 2817eabf95a980a250e272c3917e5dcfc24743b