Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9d3b304879959f9cea76cd2dd242b2eea6c1c478 https://github.com/galaxyproject/galaxy/commit/9d3b304879959f9cea76cd2dd242b... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M static/maps/mvc/history/history-contents.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/history-contents.js

Log Message: ----------- UI, history: stringify contents copy params

Commit: 96cca7ccadba60c7aac970e656bf0932070b9d00 https://github.com/galaxyproject/galaxy/commit/96cca7ccadba60c7aac970e656bf0... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-07 (Thu, 07 Jul 2016)

Changed paths: M lib/galaxy/util/__init__.py M lib/galaxy/web/framework/decorators.py

Log Message: ----------- Core, request body: handle hex vs. float better

When parsing a non-json request body, params for a payload have been parsed individually using loads on a single value. This can cause a hex id in the (regex) form '\d+e\d+' to be parsed as a float.

This commit: - adds a parse_non_hex_float function that refuses to parse scientific notation in the above form - and uses it *only* in the payload parsing method for non-json request bodies

Commit: d157865857589ef73a164219dc4ed630a16520ca https://github.com/galaxyproject/galaxy/commit/d157865857589ef73a164219dc4ed... Author: carlfeberhard carlfeberhard@gmail.com Date: 2016-07-11 (Mon, 11 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/jobs/runners/kubernetes.py M lib/galaxy/webapps/galaxy/api/datasets.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/tag.py M lib/galaxy/workflow/modules.py M scripts/common_startup.sh M static/maps/mvc/dataset/data.js.map M static/maps/mvc/tool/tool-form-composite.js.map M static/maps/mvc/tool/tool-template.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/dataset/data.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-template.js

Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into fix.hex-vs-float

Commit: 3b19a061cf896ea1eed9933bf6bda549be7d8a06 https://github.com/galaxyproject/galaxy/commit/3b19a061cf896ea1eed9933bf6bda... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-07-18 (Mon, 18 Jul 2016)

Changed paths: M client/galaxy/scripts/mvc/history/history-contents.js M lib/galaxy/util/__init__.py M lib/galaxy/web/framework/decorators.py M static/maps/mvc/history/history-contents.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/history-contents.js

Log Message: ----------- Merge pull request #2597 from carlfeberhard/fix.hex-vs-float

Fix hex vs float parsing in request body

Compare: https://github.com/galaxyproject/galaxy/compare/389b2f4fbd2e...3b19a061cf89