Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ab3d53c5ce170855d68c955f5cb453d70989f630 https://github.com/galaxyproject/galaxy/commit/ab3d53c5ce170855d68c955f5cb45... Author: John Chilton <jmchilton@gmail.com> Date: 2018-02-01 (Thu, 01 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M lib/galaxy/managers/collections.py M lib/galaxy/webapps/galaxy/api/history_contents.py Log Message: ----------- More options for collection deletion. Delete button now a drop down menu (like dropdown for downloading metadata files). - Top option just deletes the collection. - Second option deletes the collection and attempts to delete the datasets contained within it. - The third option deletes the collection and attempts to purge the datasets within it. Commit: b0162ba5431097185faf641935d6ca27e11073e2 https://github.com/galaxyproject/galaxy/commit/b0162ba5431097185faf641935d6c... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M lib/galaxy/util/facts.py Log Message: ----------- Fix server_name when config is a dict. Commit: 55b6d601a8ae5ad43a234721b2b21cc6db6ae067 https://github.com/galaxyproject/galaxy/commit/55b6d601a8ae5ad43a234721b2b21... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- add empty href to links so the cursor is right Commit: 8019afb8b544ef57de953d8ae23e8a45b0e15d52 https://github.com/galaxyproject/galaxy/commit/8019afb8b544ef57de953d8ae23e8... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- fix typo Commit: 3512096a146f7d32ebc352049717df22a7c87fef https://github.com/galaxyproject/galaxy/commit/3512096a146f7d32ebc352049717d... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- remove unused classes and aria Commit: dac1ba58124eb0d3b96cf6e114f6ff0e101726c8 https://github.com/galaxyproject/galaxy/commit/dac1ba58124eb0d3b96cf6e114f6f... Author: Nate Coraor <nate@bx.psu.edu> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M lib/galaxy/config.py Log Message: ----------- Fix failing integration tests for workflow handlers. Commit: b28fb7e4d7af29ffd6db7ce2674fe2be3d6dad03 https://github.com/galaxyproject/galaxy/commit/b28fb7e4d7af29ffd6db7ce2674fe... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-02-04 (Sun, 04 Feb 2018) Changed paths: M client/galaxy/style/less/ui/icon-btn.less Log Message: ----------- change the history icon-btn selector to work with dropdowns Commit: 2cb3af5d60d5fe08889691a8ff3b2b31038727b7 https://github.com/galaxyproject/galaxy/commit/2cb3af5d60d5fe08889691a8ff3b2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M lib/galaxy/config.py M lib/galaxy/util/facts.py Log Message: ----------- Merge pull request #5447 from natefoo/server-name-fix [18.01] Fix server_name when config is a dict Commit: 0704d63d0b6353cf59153f59ab27519dc6bfc7d4 https://github.com/galaxyproject/galaxy/commit/0704d63d0b6353cf59153f59ab275... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/style/less/ui/icon-btn.less M lib/galaxy/managers/collections.py M lib/galaxy/webapps/galaxy/api/history_contents.py Log Message: ----------- Merge remote-tracking branch 'jmchilton/1801_hdca_delete' into release_18.01 Commit: f0a8243f7d4079ac406e0a2d8b0a061f1745dca1 https://github.com/galaxyproject/galaxy/commit/f0a8243f7d4079ac406e0a2d8b0a0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js Log Message: ----------- Client-format post-merge Commit: 3a7414acaca59dc602ab3ea8092df2be9ce34258 https://github.com/galaxyproject/galaxy/commit/3a7414acaca59dc602ab3ea8092df... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-02-05 (Mon, 05 Feb 2018) Changed paths: M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/history/hdca-li-edit.js M client/galaxy/style/less/ui/icon-btn.less M lib/galaxy/config.py M lib/galaxy/managers/collections.py M lib/galaxy/util/facts.py M lib/galaxy/webapps/galaxy/api/history_contents.py Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/490f67f3a0e7...3a7414acaca5