Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: d7ab1c5cfbfcdff3ce3e201f6fb0684fdb914096 https://github.com/galaxyproject/galaxy/commit/d7ab1c5cfbfcdff3ce3e201f6fb06... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js M static/maps/mvc/ui/ui-modal.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-modal.js Log Message: ----------- UI, Modal: re-build dom on render Moves templating to render (and updates dom node attributes after) to reset modal and prevent inline styling and other modifications to the singleton from persisting between calls to show. Commit: e18d4ed33b8b453229f969f2d05c997b2fa7fe96 https://github.com/galaxyproject/galaxy/commit/e18d4ed33b8b453229f969f2d05c9... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- UI, datasets: fix optional column form values Updates metadata column checkbox flag from 'true' to '__NOTHING__' to reflect newer form_builder values. Fixes #2175 Commit: aa2e7834f697f02ebf11545b53882baee8b87f4e https://github.com/galaxyproject/galaxy/commit/aa2e7834f697f02ebf11545b53882... Author: guerler <aysam.guerler@gmail.com> Date: 2016-09-22 (Thu, 22 Sep 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Fix optional flag for library datasets in legacy library ui Commit: 26d381c9a5d77ecfa6bf3e96b2cb77df3d3f846d https://github.com/galaxyproject/galaxy/commit/26d381c9a5d77ecfa6bf3e96b2cb7... Author: John Chilton <jmchilton@gmail.com> Date: 2016-09-24 (Sat, 24 Sep 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Merge pull request #2962 from guerler/fix_library_optional_flag [16.07] Fix optional flag for library datasets in legacy library ui Commit: e667f9f360388839d723421b884836acb6974e6c https://github.com/galaxyproject/galaxy/commit/e667f9f360388839d723421b88483... Author: John Chilton <jmchilton@gmail.com> Date: 2016-09-25 (Sun, 25 Sep 2016) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Merge pull request #2960 from carlfeberhard/fix.bed-columns [16.07] UI, datasets: fix optional column form values Commit: 04d62e242412d0eb6e739f3577256d99b1aaa5bf https://github.com/galaxyproject/galaxy/commit/04d62e242412d0eb6e739f3577256... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js M static/maps/mvc/ui/ui-modal.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-modal.js Log Message: ----------- Merge pull request #2955 from carlfeberhard/fix.modal-resetting [16.07] UI, Modal: re-build dom on render Commit: 375ed8cc81590a18a52b61e32307562488fd551e https://github.com/galaxyproject/galaxy/commit/375ed8cc81590a18a52b61e323075... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- polish resolvers section in conda faq docs Commit: ba274e37f2f0e8c9973b19c46fe99c5565c5118c https://github.com/galaxyproject/galaxy/commit/ba274e37f2f0e8c9973b19c46fe99... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- describe the conda installation behavior a bit better Commit: 2899372791fdbba4f8db7c414a5447cf049987f3 https://github.com/galaxyproject/galaxy/commit/2899372791fdbba4f8db7c414a544... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Update conda_faq.rst Commit: fdfe9d8c20a63e6e6e6951d5fe5cbd7d74446d0a https://github.com/galaxyproject/galaxy/commit/fdfe9d8c20a63e6e6e6951d5fe5cb... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge pull request #19 from martenson/nsoranzo-patch-1-1 Small fixes to conda_faq.rst changes Commit: d9fab3345856770a16a98f18cf9e6185a4eae91a https://github.com/galaxyproject/galaxy/commit/d9fab3345856770a16a98f18cf9e6... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M doc/source/admin/conda_faq.rst Log Message: ----------- Merge pull request #2998 from martenson/conda-faq-polish [16.07] Conda FAQ polish Commit: 1e8337df5a4acf9e899adc07883f967973cbcac7 https://github.com/galaxyproject/galaxy/commit/1e8337df5a4acf9e899adc07883f9... Author: John Chilton <jmchilton@gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Fix setting conda_copy_dependencies in galaxy.ini. (cherry picked from commit 9246b8629c3831ab623983c9003c4e92cbde97d5) Commit: 6d27a3c4b6184b393e535afd32f87e55e7a07b70 https://github.com/galaxyproject/galaxy/commit/6d27a3c4b6184b393e535afd32f87... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Fix initial conda version at 4.0.5 This should prevent missing `activate` in <conda_prefix>/bin when downgrading to 3.19.3. This is what the conda people use in their CI environment ( [see](https://github.com/conda/conda/blob/master/utils/travis-run-install.sh#L61) and perhaps why that bug made it into the release in the first place). Commit: f7c3e25e5db1a1d99c81380f552719bee07c1790 https://github.com/galaxyproject/galaxy/commit/f7c3e25e5db1a1d99c81380f55271... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Merge pull request #3009 from mvdbeek/conda_downgrade [16.01] Backport #2869 Fix initial conda version at 4.0.5 Commit: 224c2126c73617ec906abc1e08d5f5a7548633b1 https://github.com/galaxyproject/galaxy/commit/224c2126c73617ec906abc1e08d5f... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Merge branch 'release_16.01' into release_16.04 Commit: d6845c249466d013b58ab021540fc5176096aaa0 https://github.com/galaxyproject/galaxy/commit/d6845c249466d013b58ab021540fc... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/conda_util.py Log Message: ----------- Merge branch 'release_16.04' into release_16.07 Commit: f32b6446a7a4fd5a0bca2fa8e93d4407e0ce3938 https://github.com/galaxyproject/galaxy/commit/f32b6446a7a4fd5a0bca2fa8e93d4... Author: John Chilton <jmchilton@gmail.com> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M lib/galaxy/tools/deps/__init__.py Log Message: ----------- Merge pull request #3008 from natefoo/conda-copy-dependencies [16.07] Fix setting conda_copy_dependencies in galaxy.ini. Commit: a2ee8d10af84332bf1afa1e32f0acf9cdb754f0a https://github.com/galaxyproject/galaxy/commit/a2ee8d10af84332bf1afa1e32f0ac... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2016-10-05 (Wed, 05 Oct 2016) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js M doc/source/admin/conda_faq.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M static/maps/mvc/ui/ui-modal.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-modal.js Log Message: ----------- Merge branch 'release_16.07' into dev Conflicts: doc/source/admin/conda_faq.rst static/maps/mvc/ui/ui-modal.js.map static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/ui/ui-modal.js Commit: 59a6d07b7b02f2b23719acdc83122eae89e49b78 https://github.com/galaxyproject/galaxy/commit/59a6d07b7b02f2b23719acdc83122... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-06 (Thu, 06 Oct 2016) Changed paths: M client/galaxy/scripts/mvc/ui/ui-modal.js M doc/source/admin/conda_faq.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M static/maps/mvc/ui/ui-modal.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/ui/ui-modal.js Log Message: ----------- Merge pull request #3010 from nsoranzo/merge_release_16.07 Merge release_16.07 into dev Compare: https://github.com/galaxyproject/galaxy/compare/c03748dd49c0...59a6d07b7b02