Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c94b2205b27d1d527f159bcf13ba62ce937457f6 https://github.com/galaxyproject/galaxy/commit/c94b2205b27d1d527f159bcf13ba6... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M lib/galaxy/tools/toolbox/integrated_panel.py Log Message: ----------- Escape section id and name when writing integrated_tool_panel.xml This should fix #3084. Commit: f6ca913809330922a3bc96bcf0f77d3f60e9bbe9 https://github.com/galaxyproject/galaxy/commit/f6ca913809330922a3bc96bcf0f77... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Log invalid xml filename Commit: c5245219567562f67556548cbc0b8a9624ea0308 https://github.com/galaxyproject/galaxy/commit/c5245219567562f67556548cbc0b8... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M lib/galaxy/util/__init__.py Log Message: ----------- Make catching XML parsing errors python2.6 compatible Commit: a274e635a6f7f2b169506ebf4a5a2363578bbfb1 https://github.com/galaxyproject/galaxy/commit/a274e635a6f7f2b169506ebf4a5a2... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-11-05 (Sat, 05 Nov 2016) Changed paths: M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/util/__init__.py Log Message: ----------- Merge pull request #3128 from mvdbeek/backport_3122_3124 [16.01] Backport #3122 #3124 - fix unescaped & in integrated_tool_panel.xml Commit: 788dc1ebef5110fded19d23e4a2c48e06e3c5e63 https://github.com/galaxyproject/galaxy/commit/788dc1ebef5110fded19d23e4a2c4... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/util/__init__.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Conflicts: lib/galaxy/util/__init__.py Commit: 53a66c9d46780a4910a8a03de565eb3fb53f5bdc https://github.com/galaxyproject/galaxy/commit/53a66c9d46780a4910a8a03de565e... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M lib/galaxy/tools/toolbox/integrated_panel.py M lib/galaxy/util/__init__.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Commit: 3200fa343b12b2c40ad6b3e29b77c6628d66b7a0 https://github.com/galaxyproject/galaxy/commit/3200fa343b12b2c40ad6b3e29b77c... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-11-07 (Mon, 07 Nov 2016) Log Message: ----------- Merge branch 'release_16.07' into dev Conflicts: lib/galaxy/util/__init__.py Compare: https://github.com/galaxyproject/galaxy/compare/202f96c73114...3200fa343b12