Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 6fd58afa6daf708f373513782ac907c154c266da
https://github.com/galaxyproject/galaxy/commit/6fd58afa6daf708f373513782ac9…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M lib/galaxy/version.py
Log Message:
-----------
Merge pull request #3191 from dannon/version-16.10
Update version to 16.10.rc1
Commit: 5c4ac18b44263df72b25826c03d8c2509ca68a1a
https://github.com/galaxyproject/galaxy/commit/5c4ac18b44263df72b25826c03d8…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/tool/tools.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/mvc/tool/tools.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/tool/tools.js
Log Message:
-----------
remove unused override
this caused Help/Search to point at /root/tool_search
Commit: 3f27777e76086ac94c95003882bb82003c277b4e
https://github.com/galaxyproject/galaxy/commit/3f27777e76086ac94c95003882bb…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/tool/tools.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/mvc/tool/tools.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/tool/tools.js
Log Message:
-----------
Merge pull request #3198 from martenson/fix-search-config
[16.10] remove unused (and unintended) config override
Commit: 548d3e6f05b722301deefada71d5dafda81a1881
https://github.com/galaxyproject/galaxy/commit/548d3e6f05b722301deefada71d5…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
Log Message:
-----------
Fixes for deleting histories broken in 1cc57b1eb2c295dbd68837c864740b6ff079b83d
Commit: 5ba820116365ad42dd24e099b747b40d399e6dee
https://github.com/galaxyproject/galaxy/commit/5ba820116365ad42dd24e099b747…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
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.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Pack scripts
Commit: aadc14d967c30683a10e68df61b82bb4f805de98
https://github.com/galaxyproject/galaxy/commit/aadc14d967c30683a10e68df61b8…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
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.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Merge pull request #3203 from blankenberg/fix_history_delete_16.10
[16.10] Fixes for deleting histories
Commit: d2c95b43fa33f9f4b14d274ffa60beb03a80fbb6
https://github.com/galaxyproject/galaxy/commit/d2c95b43fa33f9f4b14d274ffa60…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/history/options-menu.js
M client/galaxy/scripts/mvc/tool/tools.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/mvc/history/options-menu.js.map
M static/maps/mvc/tool/tools.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.map
M static/scripts/mvc/history/options-menu.js
M static/scripts/mvc/tool/tools.js
Log Message:
-----------
Merge pull request #3204 from galaxyproject/release_16.10
Merge release_16.10 into dev
Compare: https://github.com/galaxyproject/galaxy/compare/78b533d1b544...d2c95b43fa33
Branch: refs/heads/release_16.10
Home: https://github.com/galaxyproject/galaxy
Commit: 548d3e6f05b722301deefada71d5dafda81a1881
https://github.com/galaxyproject/galaxy/commit/548d3e6f05b722301deefada71d5…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
Log Message:
-----------
Fixes for deleting histories broken in 1cc57b1eb2c295dbd68837c864740b6ff079b83d
Commit: 5ba820116365ad42dd24e099b747b40d399e6dee
https://github.com/galaxyproject/galaxy/commit/5ba820116365ad42dd24e099b747…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
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.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Pack scripts
Commit: aadc14d967c30683a10e68df61b82bb4f805de98
https://github.com/galaxyproject/galaxy/commit/aadc14d967c30683a10e68df61b8…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-21 (Mon, 21 Nov 2016)
Changed paths:
M client/galaxy/scripts/mvc/history/options-menu.js
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.map
M static/scripts/mvc/history/options-menu.js
Log Message:
-----------
Merge pull request #3203 from blankenberg/fix_history_delete_16.10
[16.10] Fixes for deleting histories
Compare: https://github.com/galaxyproject/galaxy/compare/3f27777e7608...aadc14d967c3
Branch: refs/heads/release_16.10
Home: https://github.com/galaxyproject/galaxy
Commit: 5c4ac18b44263df72b25826c03d8c2509ca68a1a
https://github.com/galaxyproject/galaxy/commit/5c4ac18b44263df72b25826c03d8…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/tool/tools.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/mvc/tool/tools.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/tool/tools.js
Log Message:
-----------
remove unused override
this caused Help/Search to point at /root/tool_search
Commit: 3f27777e76086ac94c95003882bb82003c277b4e
https://github.com/galaxyproject/galaxy/commit/3f27777e76086ac94c95003882bb…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-11-18 (Fri, 18 Nov 2016)
Changed paths:
M client/galaxy/scripts/apps/analysis.js
M client/galaxy/scripts/apps/tool-panel.js
M client/galaxy/scripts/mvc/tool/tools.js
M lib/galaxy/webapps/galaxy/controllers/root.py
M static/maps/mvc/tool/tools.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/tool/tools.js
Log Message:
-----------
Merge pull request #3198 from martenson/fix-search-config
[16.10] remove unused (and unintended) config override
Compare: https://github.com/galaxyproject/galaxy/compare/6fd58afa6daf...3f27777e7608
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: a209523639a822dc546b9d2d946e6199df172368
https://github.com/galaxyproject/galaxy/commit/a209523639a822dc546b9d2d946e…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M test/base/twilltestcase.py
M test/functional/test_library_templates.py
Log Message:
-----------
Large cleanup of unused methods from twilltestcase.
In addition to deleting unused methods, this also moves ones only used by test_library_templates into that file.
Commit: 2bf1cf50a37d5295425798374959fbda0257b609
https://github.com/galaxyproject/galaxy/commit/2bf1cf50a37d5295425798374959…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M test/base/twilltestcase.py
M test/functional/test_library_templates.py
M test/shed_functional/base/twilltestcase.py
Log Message:
-----------
Reduce requirements for using get_filename in TwillTestCase.
Do not use a self.tool_shed_test_file and make self.shed_tools_dict optional.
Commit: b83cfe434ad875744d11d7516dc9cc11dfdec419
https://github.com/galaxyproject/galaxy/commit/b83cfe434ad875744d11d7516dc9…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M test/base/api.py
M test/base/interactor.py
M test/base/twilltestcase.py
Log Message:
-----------
Refactor generic FunctionalTestCase from TwillTestCase.
ApiTestCase uses this newer, smaller base class since these tests do not depend on Twill.
Commit: 33894ca744be3fa2eebab6942832f2931d5f0bec
https://github.com/galaxyproject/galaxy/commit/33894ca744be3fa2eebab6942832…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M test/base/api.py
M test/base/interactor.py
M test/base/twilltestcase.py
M test/functional/test_library_templates.py
M test/shed_functional/base/twilltestcase.py
Log Message:
-----------
Merge pull request #3190 from jmchilton/test_cleanup
Various Test Cleanups and Refactorings
Compare: https://github.com/galaxyproject/galaxy/compare/50f5c15f63a3...33894ca744be