Branch: refs/heads/release_15.07 Home: https://github.com/galaxyproject/galaxy Commit: 6dc5f022c73d5bde3b4ef1abe31a8d3b37ade9c3 https://github.com/galaxyproject/galaxy/commit/6dc5f022c73d5bde3b4ef1abe31a8... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/controllers/workflow.py Log Message: ----------- Merge branch 'security-20150812-xss' into release_15.01 Commit: 096a1686badda620acb507deaf9382ccee37086a https://github.com/galaxyproject/galaxy/commit/096a1686badda620acb507deaf938... Author: Nate Coraor <nate@bx.psu.edu> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M lib/galaxy/webapps/tool_shed/api/repositories.py Log Message: ----------- Merge branch 'security-20150812-shed' into release_15.01 Commit: a1bff672f39da8610543ba572c322d53eda88b4f https://github.com/galaxyproject/galaxy/commit/a1bff672f39da8610543ba572c322... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Fix bug in tool reloading API where ID not passed Commit: 71f28c99e539acf828a03e8288e1de4af40a887e https://github.com/galaxyproject/galaxy/commit/71f28c99e539acf828a03e8288e1d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Merge pull request #622 from erasche/tool-reloading-fix [15.01] Tool reloading fix Commit: 01278aa956f5791badaa6e475d94f679adab10b1 https://github.com/galaxyproject/galaxy/commit/01278aa956f5791badaa6e475d94f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Merge branch 'release_15.01' into release_15.03 Commit: 483ea9e735bf7de22f7ce7abb6105c9b929ea928 https://github.com/galaxyproject/galaxy/commit/483ea9e735bf7de22f7ce7abb6105... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Merge branch 'release_15.03' into release_15.05 Commit: b4df5e944bddcbd03699a4b3b395044cc3c4886c https://github.com/galaxyproject/galaxy/commit/b4df5e944bddcbd03699a4b3b3950... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-19 (Wed, 19 Aug 2015) Changed paths: M lib/galaxy/webapps/galaxy/api/tools.py Log Message: ----------- Resolve merge conflict merging forward 15.05-15.07 Compare: https://github.com/galaxyproject/galaxy/compare/79dbff19674d...b4df5e944bdd