- galaxy-commits - lists.galaxyproject.org

[galaxyproject/galaxy] a0b20a: Initialize objectstore for fix_set_dataset_sizes s...
by GitHub 26 Jun '16

26 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a0b20a61a2dd2ed0d11d21c85d31198d37c747b1 https://github.com/galaxyproject/galaxy/commit/a0b20a61a2dd2ed0d11d21c85d31… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-25 (Sat, 25 Jun 2016) Changed paths: M scripts/set_dataset_sizes.py Log Message: ----------- Initialize objectstore for fix_set_dataset_sizes script (otherwise it doesn't currently run successfully) Commit: 48af26ebfb11003f1e981c5cd684bcddd9387c16 https://github.com/galaxyproject/galaxy/commit/48af26ebfb11003f1e981c5cd684… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-25 (Sat, 25 Jun 2016) Changed paths: M scripts/set_dataset_sizes.py Log Message: ----------- Merge pull request #2544 from dannon/fix_set_dataset_sizes_script Initialize objectstore for fix_set_dataset_sizes script Compare: https://github.com/galaxyproject/galaxy/compare/6552bd71dffb...48af26ebfb11

1 0

[galaxyproject/galaxy] 43a4a4: Add the missing bigwig xml file for the IGV displa...
by GitHub 26 Jun '16

26 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 43a4a45cc8c849075b7eb93d3a830b3750252d76 https://github.com/galaxyproject/galaxy/commit/43a4a45cc8c849075b7eb93d3a83… Author: Devon Ryan <dpryan79(a)gmail.com> Date: 2016-06-25 (Sat, 25 Jun 2016) Changed paths: A display_applications/igv/bigwig.xml Log Message: ----------- Add the missing bigwig xml file for the IGV display application Commit: 3d6c55d1ce5c2bf693c710ff03942a3157966afd https://github.com/galaxyproject/galaxy/commit/3d6c55d1ce5c2bf693c710ff0394… Author: Devon Ryan <dpryan79(a)gmail.com> Date: 2016-06-25 (Sat, 25 Jun 2016) Changed paths: M config/datatypes_conf.xml.sample Log Message: ----------- Update the sample datatype_conf.xml file for bigwigs in IGV Commit: 6552bd71dffb1cc75f51bd15eca46064f06d7517 https://github.com/galaxyproject/galaxy/commit/6552bd71dffb1cc75f51bd15eca4… Author: John Chilton <jmchilton(a)gmail.com> Date: 2016-06-25 (Sat, 25 Jun 2016) Changed paths: M config/datatypes_conf.xml.sample A display_applications/igv/bigwig.xml Log Message: ----------- Merge pull request #2545 from dpryan79/igv_bigwig bigWig files displayed in IGV Compare: https://github.com/galaxyproject/galaxy/compare/7a5726649d09...6552bd71dffb

1 0

[galaxyproject/galaxy] 385f0a: Use self.decode_id instead of trans.security.decod...
by GitHub 23 Jun '16

23 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 385f0afdc1aae6308a69132e101ee4433f4ab6fe https://github.com/galaxyproject/galaxy/commit/385f0afdc1aae6308a69132e101e… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Use self.decode_id instead of trans.security.decode_id Because trans.security.decode_id does not cast the id to str and this reduces the use of trans. Commit: 7a5726649d091eab5c4b709f2a1cfe4e28bd9599 https://github.com/galaxyproject/galaxy/commit/7a5726649d091eab5c4b709f2a1c… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Merge pull request #2529 from nsoranzo/decode_id Use self.decode_id instead of trans.security.decode_id Compare: https://github.com/galaxyproject/galaxy/compare/f36ad6a53b02...7a5726649d09

1 0

[galaxyproject/galaxy] 03bf42: Fix HTML errors on 2 templates
by GitHub 22 Jun '16

22 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 03bf4262f4f72a1bc82fb14caf492240577ad966 https://github.com/galaxyproject/galaxy/commit/03bf4262f4f72a1bc82fb14caf49… Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk> Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M templates/webapps/galaxy/dataset/copy_view.mako M templates/webapps/galaxy/library/common/import_datasets_to_histories.mako Log Message: ----------- Fix HTML errors on 2 templates Commit: f36ad6a53b02e9ff47b9aedc958c580defbcba95 https://github.com/galaxyproject/galaxy/commit/f36ad6a53b02e9ff47b9aedc958c… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M templates/webapps/galaxy/dataset/copy_view.mako M templates/webapps/galaxy/library/common/import_datasets_to_histories.mako Log Message: ----------- Merge pull request #2524 from nsoranzo/template_fixes Fix HTML errors on 2 templates Compare: https://github.com/galaxyproject/galaxy/compare/d722dd34af31...f36ad6a53b02

1 0

[galaxyproject/galaxy] 3a9e15: Fix saving visualizations
by GitHub 21 Jun '16

21 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3a9e1571458f931b6d6a268ad628bfac88655df3 https://github.com/galaxyproject/galaxy/commit/3a9e1571458f931b6d6a268ad628… Author: guerler <aysam.guerler(a)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/41baf5d107b23b1761bfc5f4769f… Author: guerler <aysam.guerler(a)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/ac902304ae6f64dc9c9f313a1257… Author: Dannon Baker <dannon.baker(a)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/dad193e3c0819358e734d74702bb… Author: Martin Cech <cech.marten(a)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/4bfa2f62fb1b04d8e05e5edca17f… Author: Nicola Soranzo <nicola.soranzo(a)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/89890d4f60452a9fc55d924fd960… Author: Nicola Soranzo <nicola.soranzo(a)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/67c4df712a0d8b0abc9eb93f2f4f… Author: Dannon Baker <dannon.baker(a)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/15a4734aed73aabaf70f0da8a1eb… Author: Dannon Baker <dannon.baker(a)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: d722dd34af31d5d920251bc48cb7b938134fcf74 https://github.com/galaxyproject/galaxy/commit/d722dd34af31d5d920251bc48cb7… Author: Dannon Baker <dannon.baker(a)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 Log Message: ----------- Merge branch 'release_16.04' into dev Compare: https://github.com/galaxyproject/galaxy/compare/a5cc0081f78c...d722dd34af31

1 0

[galaxyproject/galaxy] 3a9e15: Fix saving visualizations
by GitHub 21 Jun '16

21 Jun '16

Branch: refs/heads/master Home: https://github.com/galaxyproject/galaxy Commit: 3a9e1571458f931b6d6a268ad628bfac88655df3 https://github.com/galaxyproject/galaxy/commit/3a9e1571458f931b6d6a268ad628… Author: guerler <aysam.guerler(a)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/41baf5d107b23b1761bfc5f4769f… Author: guerler <aysam.guerler(a)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/ac902304ae6f64dc9c9f313a1257… Author: Dannon Baker <dannon.baker(a)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/dad193e3c0819358e734d74702bb… Author: Martin Cech <cech.marten(a)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/4bfa2f62fb1b04d8e05e5edca17f… Author: Nicola Soranzo <nicola.soranzo(a)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/89890d4f60452a9fc55d924fd960… Author: Nicola Soranzo <nicola.soranzo(a)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/67c4df712a0d8b0abc9eb93f2f4f… Author: Dannon Baker <dannon.baker(a)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/15a4734aed73aabaf70f0da8a1eb… Author: Dannon Baker <dannon.baker(a)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/0ba99fe246099cc1827f71f2722d… Author: Dannon Baker <dannon.baker(a)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

1 0

[galaxyproject/galaxy] 4bfa2f: Fix for py34-lint
by GitHub 21 Jun '16

21 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 4bfa2f62fb1b04d8e05e5edca17fab319bbc4f8b https://github.com/galaxyproject/galaxy/commit/4bfa2f62fb1b04d8e05e5edca17f… Author: Nicola Soranzo <nicola.soranzo(a)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/89890d4f60452a9fc55d924fd960… Author: Nicola Soranzo <nicola.soranzo(a)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/67c4df712a0d8b0abc9eb93f2f4f… Author: Dannon Baker <dannon.baker(a)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/15a4734aed73aabaf70f0da8a1eb… Author: Dannon Baker <dannon.baker(a)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 Compare: https://github.com/galaxyproject/galaxy/compare/dad193e3c081...15a4734aed73

1 0

[galaxyproject/galaxy] 4bfa2f: Fix for py34-lint
by GitHub 21 Jun '16

21 Jun '16

Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 4bfa2f62fb1b04d8e05e5edca17fab319bbc4f8b https://github.com/galaxyproject/galaxy/commit/4bfa2f62fb1b04d8e05e5edca17f… Author: Nicola Soranzo <nicola.soranzo(a)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/89890d4f60452a9fc55d924fd960… Author: Nicola Soranzo <nicola.soranzo(a)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/67c4df712a0d8b0abc9eb93f2f4f… Author: Dannon Baker <dannon.baker(a)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 Compare: https://github.com/galaxyproject/galaxy/compare/5aaa1ecdf0cb...67c4df712a0d

1 0

[galaxyproject/galaxy] 3a9e15: Fix saving visualizations
by GitHub 21 Jun '16

21 Jun '16

Branch: refs/heads/release_16.04 Home: https://github.com/galaxyproject/galaxy Commit: 3a9e1571458f931b6d6a268ad628bfac88655df3 https://github.com/galaxyproject/galaxy/commit/3a9e1571458f931b6d6a268ad628… Author: guerler <aysam.guerler(a)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/41baf5d107b23b1761bfc5f4769f… Author: guerler <aysam.guerler(a)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/ac902304ae6f64dc9c9f313a1257… Author: Dannon Baker <dannon.baker(a)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/dad193e3c0819358e734d74702bb… Author: Martin Cech <cech.marten(a)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 Compare: https://github.com/galaxyproject/galaxy/compare/67eca6d49016...dad193e3c081

1 0

[galaxyproject/galaxy] c8af30: UI, history: backport of 3672eda
by GitHub 20 Jun '16

20 Jun '16

Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c8af30009b3201037e55ff26a7d26f1734ae1dc3 https://github.com/galaxyproject/galaxy/commit/c8af30009b3201037e55ff26a7d2… Author: carlfeberhard <carlfeberhard(a)gmail.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M static/maps/mvc/history/history-model.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-model.js Log Message: ----------- UI, history: backport of 3672eda (update using xhr date header) Commit: 70b40979968f1ec3c36f025e5639b879ad017ca1 https://github.com/galaxyproject/galaxy/commit/70b40979968f1ec3c36f025e5639… Author: Martin Cech <cech.marten(a)gmail.com> Date: 2016-06-16 (Thu, 16 Jun 2016) Changed paths: M client/galaxy/scripts/mvc/history/history-model.js M static/maps/mvc/history/history-model.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-model.js Log Message: ----------- Merge pull request #2506 from carlfeberhard/twice-a-day [16.04] UI, history: backport of 3672eda Commit: 8b2ae464678e96c917ed06a82f158f7c3b97b34a https://github.com/galaxyproject/galaxy/commit/8b2ae464678e96c917ed06a82f15… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Copy PJAs when importing a workflow. Commit: 5aaa1ecdf0cb9a015bbfaf68d02cdab30bf02335 https://github.com/galaxyproject/galaxy/commit/5aaa1ecdf0cb9a015bbfaf68d02c… Author: Nicola Soranzo <nsoranzo(a)tiscali.it> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge pull request #2518 from dannon/backport_to_1601_pjafix [16.01] Copy PJAs when importing a workflow. Commit: 67eca6d4901615b57c2690e719a220afe6d42b28 https://github.com/galaxyproject/galaxy/commit/67eca6d4901615b57c2690e719a2… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M lib/galaxy/model/__init__.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: a5cc0081f78c08b984eadf236845e945e0f7edcc https://github.com/galaxyproject/galaxy/commit/a5cc0081f78c08b984eadf236845… Author: Dannon Baker <dannon.baker(a)gmail.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Merge branch 'release_16.04' into dev Rebuild client. Compare: https://github.com/galaxyproject/galaxy/compare/a902420b92ae...a5cc0081f78c

1 0