Branch: refs/heads/release_16.10
Home: https://github.com/galaxyproject/galaxy
Commit: 3e0e96657d765f4023bb6801ace2e96a1ffc4505
https://github.com/galaxyproject/galaxy/commit/3e0e96657d765f4023bb6801ace2…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M doc/source/admin/index.rst
M doc/source/admin/webhooks.rst
M doc/source/releases/16.10.rst
M doc/source/releases/16.10_announce.rst
Log Message:
-----------
add work on release notes 16.10, improve docs for webhooks
Conflicts:
doc/source/releases/16.10.rst
doc/source/releases/16.10_announce.rst
Commit: 739fb59cba5b7747a32e685a3632f96effad4c11
https://github.com/galaxyproject/galaxy/commit/739fb59cba5b7747a32e685a3632…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M doc/source/admin/webhooks.rst
Log Message:
-----------
fix the fix
Commit: 5784a838a554f8dcf9e132e26be01240a37a3e65
https://github.com/galaxyproject/galaxy/commit/5784a838a554f8dcf9e132e26be0…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M doc/source/releases/16.10.rst
Log Message:
-----------
fix bad merge
Commit: 83de83e7edc230d7f9841a6d9770d87d0c89d06f
https://github.com/galaxyproject/galaxy/commit/83de83e7edc230d7f9841a6d9770…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M doc/source/admin/index.rst
M doc/source/admin/webhooks.rst
M doc/source/releases/16.10.rst
M doc/source/releases/16.10_announce.rst
Log Message:
-----------
Merge pull request #3282 from martenson/release_16.10
[16.10] work on release notes 16.10
Compare: https://github.com/galaxyproject/galaxy/compare/d0f39ceff518...83de83e7edc2
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: a84601ba80cb8620a396e740e9a69f3d6f1dfd37
https://github.com/galaxyproject/galaxy/commit/a84601ba80cb8620a396e740e9a6…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
A doc/source/releases/16.10.rst
M doc/source/releases/16.10_announce.rst
A doc/source/releases/17.01_announce.rst
M scripts/bootstrap_history.py
Log Message:
-----------
Add 16.10 release notes.
Commit: 8766e125091d0a5a83a0fd4daf274fe93551a443
https://github.com/galaxyproject/galaxy/commit/8766e125091d0a5a83a0fd4daf27…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/composite/composite-row.js
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/composite/composite-row.js.map
M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js
M static/scripts/mvc/upload/default/default-row.js
Log Message:
-----------
Escape filename in upload dialog, default and composite. Pointed out by David Wyde.
Commit: 13ab07030c8ffa5012a123671c2ab450bf14c40b
https://github.com/galaxyproject/galaxy/commit/13ab07030c8ffa5012a123671c2a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/default/default-row.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Use consistent spacing.
Commit: 75d327f165c730f95e181a2feff1db64074ab3e6
https://github.com/galaxyproject/galaxy/commit/75d327f165c730f95e181a2feff1…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/composite/composite-row.js
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/composite/composite-row.js.map
M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js
M static/scripts/mvc/upload/default/default-row.js
Log Message:
-----------
Merge pull request #3278 from dannon/upload_escape_filename
[16.10] Escape filename in upload dialog, default and composite.
Commit: f6b94dc465a41e0ce25cd0d38b8cfa81ab4c5254
https://github.com/galaxyproject/galaxy/commit/f6b94dc465a41e0ce25cd0d38b8c…
Author: Daniel Blankenberg <dan.blankenberg(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M lib/tool_shed/util/tool_util.py
Log Message:
-----------
Fix for ToolShed install when copied sample data target exists, but is broken symlink.
Commit: 70fc43b24090e537479a74b34a7ff9bc4e43de84
https://github.com/galaxyproject/galaxy/commit/70fc43b24090e537479a74b34a7f…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M lib/tool_shed/util/tool_util.py
Log Message:
-----------
Merge pull request #3279 from blankenberg/16.10_ts_install_broken_symlink
[16.10] Fix for ToolShed install when copied sample data target exists, but is broken symlink.
Commit: d0f39ceff51843a95048dfdaf49035d07ce75c1d
https://github.com/galaxyproject/galaxy/commit/d0f39ceff51843a95048dfdaf490…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
A doc/source/releases/16.10.rst
M doc/source/releases/16.10_announce.rst
A doc/source/releases/17.01_announce.rst
M scripts/bootstrap_history.py
Log Message:
-----------
Merge pull request #3270 from jmchilton/16.10_release_notes_0
[16.10] Add 16.10 release notes.
Commit: cbd527b9a4671c7abe9a22cf69e869b5d2de858a
https://github.com/galaxyproject/galaxy/commit/cbd527b9a4671c7abe9a22cf69e8…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/composite/composite-row.js
M client/galaxy/scripts/mvc/upload/default/default-row.js
A doc/source/releases/16.10.rst
M doc/source/releases/16.10_announce.rst
A doc/source/releases/17.01_announce.rst
M lib/tool_shed/util/tool_util.py
M scripts/bootstrap_history.py
M static/maps/mvc/upload/composite/composite-row.js.map
M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js
M static/scripts/mvc/upload/default/default-row.js
Log Message:
-----------
Merge branch 'release_16.10' into dev
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
Compare: https://github.com/galaxyproject/galaxy/compare/33dec01ba218...cbd527b9a467
Branch: refs/heads/release_16.10
Home: https://github.com/galaxyproject/galaxy
Commit: 8766e125091d0a5a83a0fd4daf274fe93551a443
https://github.com/galaxyproject/galaxy/commit/8766e125091d0a5a83a0fd4daf27…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/composite/composite-row.js
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/composite/composite-row.js.map
M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js
M static/scripts/mvc/upload/default/default-row.js
Log Message:
-----------
Escape filename in upload dialog, default and composite. Pointed out by David Wyde.
Commit: 13ab07030c8ffa5012a123671c2ab450bf14c40b
https://github.com/galaxyproject/galaxy/commit/13ab07030c8ffa5012a123671c2a…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/default/default-row.js.map
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
Log Message:
-----------
Use consistent spacing.
Commit: 75d327f165c730f95e181a2feff1db64074ab3e6
https://github.com/galaxyproject/galaxy/commit/75d327f165c730f95e181a2feff1…
Author: Aysam Guerler <aysam.guerler(a)gmail.com>
Date: 2016-12-07 (Wed, 07 Dec 2016)
Changed paths:
M client/galaxy/scripts/mvc/upload/composite/composite-row.js
M client/galaxy/scripts/mvc/upload/default/default-row.js
M static/maps/mvc/upload/composite/composite-row.js.map
M static/maps/mvc/upload/default/default-row.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/upload/composite/composite-row.js
M static/scripts/mvc/upload/default/default-row.js
Log Message:
-----------
Merge pull request #3278 from dannon/upload_escape_filename
[16.10] Escape filename in upload dialog, default and composite.
Compare: https://github.com/galaxyproject/galaxy/compare/8a5ff5df21ef...75d327f165c7