Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 3a9e1571458f931b6d6a268ad628bfac88655df3 https://github.com/galaxyproject/galaxy/commit/3a9e1571458f931b6d6a268ad628b... Author: guerler <aysam.guerler@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/visualizations.py Log Message: ----------- Fix saving visualizations Commit: 41baf5d107b23b1761bfc5f4769f08f7b68c692e https://github.com/galaxyproject/galaxy/commit/41baf5d107b23b1761bfc5f4769f0... Author: guerler <aysam.guerler@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Fix library common json loads call Commit: ac902304ae6f64dc9c9f313a12572bcfb7769d06 https://github.com/galaxyproject/galaxy/commit/ac902304ae6f64dc9c9f313a12572... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M tools/filters/sff_extract.py Log Message: ----------- Fix two errors in sff_extract.py detected by flake8 -- either of these code paths would have thrown an exception and failed prior to this. Commit: dad193e3c0819358e734d74702bbcc18a34babd8 https://github.com/galaxyproject/galaxy/commit/dad193e3c0819358e734d74702bbc... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/visualizations.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M tools/filters/sff_extract.py Log Message: ----------- Merge pull request #2521 from guerler/fix_viz_000 [16.04] Fix saving visualizations Commit: 4bfa2f62fb1b04d8e05e5edca17fab319bbc4f8b https://github.com/galaxyproject/galaxy/commit/4bfa2f62fb1b04d8e05e5edca17fa... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py Log Message: ----------- Fix for py34-lint Commit: 89890d4f60452a9fc55d924fd960f4bd72ddbb12 https://github.com/galaxyproject/galaxy/commit/89890d4f60452a9fc55d924fd960f... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py Log Message: ----------- Fix move_directory_files tool dependency action when destination is not empty Historically this action moves the contents of the source directory to the destination directory. Commit d38936bd8d9b3612dc0718859067e299651e6c86 broke the install when e.g. the destination is $INSTALL_DIR, which is created by Galaxy and is not empty (contains INSTALLATION.log after first action). Commit: 67c4df712a0d8b0abc9eb93f2f4fa145c5843b2c https://github.com/galaxyproject/galaxy/commit/67c4df712a0d8b0abc9eb93f2f4fa... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py Log Message: ----------- Merge pull request #2522 from nsoranzo/release_16.01_fix_for_2479 [16.01] Fix move_directory_files tool dependency action when destination is not empty Commit: 15a4734aed73aabaf70f0da8a1eb54adeb75553b https://github.com/galaxyproject/galaxy/commit/15a4734aed73aabaf70f0da8a1eb5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: 0ba99fe246099cc1827f71f2722d253becee64ba https://github.com/galaxyproject/galaxy/commit/0ba99fe246099cc1827f71f2722d2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/api/visualizations.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py M tools/filters/sff_extract.py Log Message: ----------- Merge branch 'release_16.04' Compare: https://github.com/galaxyproject/galaxy/compare/9226e60fcc3c...0ba99fe24609