Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fbf3cf30d7df5673ebbc098a2561e26a5486a18a https://github.com/galaxyproject/galaxy/commit/fbf3cf30d7df5673ebbc098a2561e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M tools/filters/joiner.xml Log Message: ----------- Fix joiner tool to inherit datatype, restoring previous behavior. Commit: 7ce0d87a597353d7915a29708a440939e73bb7a3 https://github.com/galaxyproject/galaxy/commit/7ce0d87a597353d7915a29708a440... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M tools/filters/joiner.xml Log Message: ----------- Merge pull request #4745 from dannon/joiner_fix [17.09] Fix joiner tool to inherit datatype from the input format Commit: 096b387f8e97a3620855793cb0d257dd3a56883f https://github.com/galaxyproject/galaxy/commit/096b387f8e97a3620855793cb0d25... Author: Anthony Bretaudeau <anthony.bretaudeau@inria.fr> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M lib/galaxy/dependencies/conditional-requirements.txt Log Message: ----------- update python-ldap with fix for ldaps Commit: d788bfb80ae1140ecb7757eea2d192de0a7e4045 https://github.com/galaxyproject/galaxy/commit/d788bfb80ae1140ecb7757eea2d19... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M lib/galaxy/dependencies/conditional-requirements.txt Log Message: ----------- Merge pull request #4748 from abretaud/ldap [17.09] Fix auth with ldaps:// Commit: fb0586398d81a39734ee1f2031375d547b2da6c1 https://github.com/galaxyproject/galaxy/commit/fb0586398d81a39734ee1f2031375... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/web/security/__init__.py M test/unit/test_security_helper.py Log Message: ----------- Better hanlding of long id secrets when generating per-kind encryption keys. Generally more validation and more testing as well. Test cases layout the reasons for some of these changes. Thanks to @nsoranzo for the Python 3 fix. Commit: bf5c8248b340a0f60519f3c40afb05b8020ddcf3 https://github.com/galaxyproject/galaxy/commit/bf5c8248b340a0f60519f3c40afb0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/onload.js M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/onload.js Log Message: ----------- Force onload webhooks to wait for Galaxy object (and root) resolution. Commit: 95d5ffc71d5c373b92252e1ea1ec4d119ebbf636 https://github.com/galaxyproject/galaxy/commit/95d5ffc71d5c373b92252e1ea1ec4... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/onload.js M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/onload.js Log Message: ----------- Merge pull request #4750 from dannon/onloadjs_webhooks_fix [17.09] Force onload webhooks to wait for Galaxy object (and root) resolution. Commit: c3f7f391cbca37624566ca99fa1c8e0e5c525a83 https://github.com/galaxyproject/galaxy/commit/c3f7f391cbca37624566ca99fa1c8... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/web/security/__init__.py M test/unit/test_security_helper.py Log Message: ----------- Merge pull request #4713 from jmchilton/id_secret_fix [17.09] Better handling of long id secrets when generating per-kind encryption keys. Commit: a9c23f0ba97b1a5560642b6106aa9236c7645682 https://github.com/galaxyproject/galaxy/commit/a9c23f0ba97b1a5560642b6106aa9... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- replace selector for selecting selected rows muhaha Commit: 9a954ca3432e3da8f002bc901bfd723f8caa3aef https://github.com/galaxyproject/galaxy/commit/9a954ca3432e3da8f002bc901bfd7... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/admin.bundled.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/bundled/login.bundled.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge pull request #4752 from martenson/fix-library-allselect [17.09] replace selector for selecting selected rows Commit: 562465ffe9c6d1ecb8e67375798d35acce441475 https://github.com/galaxyproject/galaxy/commit/562465ffe9c6d1ecb8e67375798d3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/onload.js M config/galaxy.ini.sample M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/web/security/__init__.py M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/onload.js M test/unit/test_security_helper.py M tools/filters/joiner.xml Log Message: ----------- Merge remote-tracking branch 'upstream/release_17.09' into dev Compare: https://github.com/galaxyproject/galaxy/compare/f4eb2dca9642...562465ffe9c6