[galaxyproject/galaxy] c40957: Handle potential regex expression in workflow para...
Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c409572ef8510e0c4322d835c5ba90f32bc9c653 https://github.com/galaxyproject/galaxy/commit/c409572ef8510e0c4322d835c5ba9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-31 (Wed, 31 May 2017) 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/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/tool/tool-form-composite.js Log Message: ----------- Handle potential regex expression in workflow parameter names Commit: a9d0d3671afc2be90509517b53b96af694ff22e5 https://github.com/galaxyproject/galaxy/commit/a9d0d3671afc2be90509517b53b96... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2017-05-31 (Wed, 31 May 2017) Changed paths: M lib/galaxy/util/compression_utils.py Log Message: ----------- Fix for returning a fileobject in compression_utils.py when handling a zipfile. Will return the first named object in the archive. zipfile.os_zipfile does not exist... Commit: f6ced00ef0de0fa67e2ecd06fa2db204e73f25ad https://github.com/galaxyproject/galaxy/commit/f6ced00ef0de0fa67e2ecd06fa2db... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-05-31 (Wed, 31 May 2017) Changed paths: M lib/galaxy/util/compression_utils.py Log Message: ----------- Merge pull request #4135 from blankenberg/17.05_zipfile [17.05] Fix for returning a fileobject in compression_utils.py when handling a zipfile. Commit: 75028ac1eec7de53a197217921ebd5b7dac4daac https://github.com/galaxyproject/galaxy/commit/75028ac1eec7de53a197217921ebd... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-05-31 (Wed, 31 May 2017) 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/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/tool/tool-form-composite.js Log Message: ----------- Merge pull request #4133 from guerler/escape_regex [17.05] Properly escape potential regex expression in workflow parameters Commit: c2348340cfa865ac33ed38311f22c0e8043c89ae https://github.com/galaxyproject/galaxy/commit/c2348340cfa865ac33ed38311f22c... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/tools/data/__init__.py Log Message: ----------- Fix for Data Tables loaded from a URL. Commit: b0c46cc4d0ec554d10186050c91a5c8a4880a8ff https://github.com/galaxyproject/galaxy/commit/b0c46cc4d0ec554d10186050c91a5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M lib/galaxy/tools/data/__init__.py Log Message: ----------- Merge pull request #4140 from blankenberg/17.05_data_tables_URL_fix [17.05] Fix for Data Tables loaded from a URL. Commit: 20d2303d34636b77d631eb3d1a99e3df8690d865 https://github.com/galaxyproject/galaxy/commit/20d2303d34636b77d631eb3d1a99e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M client/galaxy/scripts/mvc/tool/tool-form-composite.js M lib/galaxy/tools/data/__init__.py M lib/galaxy/util/compression_utils.py M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Merge remote-tracking branch 'upstream/release_17.05' into dev Compare: https://github.com/galaxyproject/galaxy/compare/c1d822d96de0...20d2303d3463
participants (1)
-
GitHub