Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6c6c804ab63866c6239299f4221fa436dd4a9591 https://github.com/galaxyproject/galaxy/commit/6c6c804ab63866c6239299f4221fa... Author: E Rasche <hxr@hx42.org> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- When a page is involved, the ID will be wrong Commit: 33a0c7fac3a0624d26efd8d08dabbca5f7e8c226 https://github.com/galaxyproject/galaxy/commit/33a0c7fac3a0624d26efd8d08dabb... Author: E Rasche <hxr@hx42.org> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: A static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map A static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Make client Commit: a2229783177b76786f581cc78040b059cbd2aab5 https://github.com/galaxyproject/galaxy/commit/a2229783177b76786f581cc78040b... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js A static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map A static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge pull request #4355 from erasche/patch-wrong-folder-id [release_17.05] Patch bug preventing creation of dataset library folders Commit: ecfb90ef9f8037575db2e62ae49d8bbb7e4e427b https://github.com/galaxyproject/galaxy/commit/ecfb90ef9f8037575db2e62ae49d8... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js R static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map R static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Revert "[release_17.05] Patch bug preventing creation of dataset library folders" Commit: 163e4ebbe1fbfc5f1f97b5aabc804621fdd426c9 https://github.com/galaxyproject/galaxy/commit/163e4ebbe1fbfc5f1f97b5aabc804... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js R static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map R static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge pull request #4356 from galaxyproject/revert-4355-patch-wrong-folder-id Revert "[release_17.05] Patch bug preventing creation of dataset library folders" Commit: 12f0acba1dc1b81bb621ea130a75ec7dfac0fdaa https://github.com/galaxyproject/galaxy/commit/12f0acba1dc1b81bb621ea130a75e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js A static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map A static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Revert "Revert "[release_17.05] Patch bug preventing creation of dataset library folders"" Commit: 10efd7fac6e38c5ca07d94c351d10473811c7d6c https://github.com/galaxyproject/galaxy/commit/10efd7fac6e38c5ca07d94c351d10... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js A static/maps/mvc/job/job-params.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map A static/scripts/mvc/job/job-params.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge pull request #4357 from galaxyproject/revert-4356-revert-4355-patch-wrong-folder-id [release_17.05] Patch bug preventing creation of dataset library folders Commit: ba3249acf07ca1a44a813e2c68a9d6074d2b7c4c https://github.com/galaxyproject/galaxy/commit/ba3249acf07ca1a44a813e2c68a9d... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-10 (Thu, 10 Aug 2017) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/molecules.py Log Message: ----------- Add missing chemical formats to datatypes_conf.xml.sample Commit: 61d172f18d8f7740585b038dd786e81178ca1831 https://github.com/galaxyproject/galaxy/commit/61d172f18d8f7740585b038dd786e... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-11 (Fri, 11 Aug 2017) Changed paths: M setup.cfg M tox.ini Log Message: ----------- Update pin for flake8-docstrings Similar to commit 2586df45637d794c63252838573b2d1e6d692243 . Commit: a249dc01a5d0afa42474a6e4075ed2a3ad80400f https://github.com/galaxyproject/galaxy/commit/a249dc01a5d0afa42474a6e4075ed... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-11 (Fri, 11 Aug 2017) Changed paths: M .travis.yml Log Message: ----------- Use container-based infrastructure (sudo: false) in TravisCI Commit: 0f5ad34eaf6b65a2d258f308aa6fea8b4f39a52a https://github.com/galaxyproject/galaxy/commit/0f5ad34eaf6b65a2d258f308aa6fe... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M .travis.yml M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/molecules.py M setup.cfg M tox.ini Log Message: ----------- Merge pull request #4413 from nsoranzo/release_17.01_really_add_datatypes [17.01] Add missing chemical formats to datatypes_conf.xml.sample Commit: 4faf496c9898786e8f504bd36b28dc70df4e3e26 https://github.com/galaxyproject/galaxy/commit/4faf496c9898786e8f504bd36b28d... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/molecules.py Log Message: ----------- Merge branch 'release_17.01' into release_17.05 Conflicts: tox.ini Commit: 9cbabef17e9afb4953324516d0883976edd51e87 https://github.com/galaxyproject/galaxy/commit/9cbabef17e9afb4953324516d0883... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-14 (Mon, 14 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/molecules.py M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/bundled/admin.bundled.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/library/library-foldertoolbar-view.js Log Message: ----------- Merge branch 'release_17.05' into dev Conflicts: static/maps/mvc/library/library-foldertoolbar-view.js.map static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/library/library-foldertoolbar-view.js Compare: https://github.com/galaxyproject/galaxy/compare/e594152de2dd...9cbabef17e9a