Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 31c89ea29c2c504878f336d90dfcf320b873b2ee https://github.com/galaxyproject/galaxy/commit/31c89ea29c2c504878f336d90dfcf... Author: carlfeberhard <carlfeberhard@gmail.com> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M static/maps/mvc/collection/collection-li-edit.js.map M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/scripts/mvc/collection/collection-li-edit.js M static/scripts/mvc/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/history/hda-li-edit.js Log Message: ----------- UI, Collections: allow expansion to fetch details for DatasetDCEs (assuming they're HDAs); move rerunnable and creating_job fetch to HDAs Commit: 69cd5a98dcda30771ce78118ebd3a934dfb09c65 https://github.com/galaxyproject/galaxy/commit/69cd5a98dcda30771ce78118ebd3a... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M static/maps/mvc/collection/collection-li-edit.js.map M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/scripts/mvc/collection/collection-li-edit.js M static/scripts/mvc/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/history/hda-li-edit.js Log Message: ----------- Merge pull request #854 from carlfeberhard/release_15.10 [15.10] UI, Collections: allow expansion to fetch details for DatasetDCEs (as… Commit: 4705409d386f6cabe1874ac044617d6ed226a80e https://github.com/galaxyproject/galaxy/commit/4705409d386f6cabe1874ac044617... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-10-08 (Thu, 08 Oct 2015) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Expose all API keys to admins under REMOTE_USER This is the default setting for non-remote-user setups, this commit adjusts the middleware to behave as expected. Issue raised in http://dev.list.galaxyproject.org/User-API-keys-with-External-LDAP-authentic... Commit: a0ad2b75c29eca2c33ccfcdd4aa4a834c06c5265 https://github.com/galaxyproject/galaxy/commit/a0ad2b75c29eca2c33ccfcdd4aa4a... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-10-08 (Thu, 08 Oct 2015) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py Log Message: ----------- Merge pull request #873 from erasche/api-key-backpatch [release_15.10] Expose all API keys to admins under REMOTE_USER Commit: 90506ba1c6b83731cf5e11badabfde1f8d3e34c4 https://github.com/galaxyproject/galaxy/commit/90506ba1c6b83731cf5e11badabfd... Author: Daniel Blankenberg <dan.blankenberg@gmail.com> Date: 2015-10-08 (Thu, 08 Oct 2015) Changed paths: M templates/webapps/galaxy/data_manager/index.mako M templates/webapps/galaxy/data_manager/view_job.mako Log Message: ----------- Fix for no longer being able to access data managers. Have datamanager links point to root with tool_id provided while targeting a new window. Commit: 38b9ca3400eaf482c50c6224438d3341241453c1 https://github.com/galaxyproject/galaxy/commit/38b9ca3400eaf482c50c6224438d3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-10-08 (Thu, 08 Oct 2015) Changed paths: M templates/webapps/galaxy/data_manager/index.mako M templates/webapps/galaxy/data_manager/view_job.mako Log Message: ----------- Merge pull request #879 from blankenberg/datamanager-fix [15.10] Fix for no longer being able to access data managers. Commit: fae21e30f56e5a1e92aa80f58daa684eeb87aaa9 https://github.com/galaxyproject/galaxy/commit/fae21e30f56e5a1e92aa80f58daa6... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-10-09 (Fri, 09 Oct 2015) Changed paths: M client/galaxy/scripts/mvc/collection/collection-li-edit.js M client/galaxy/scripts/mvc/collection/collection-li.js M client/galaxy/scripts/mvc/collection/collection-model.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M static/maps/mvc/collection/collection-li-edit.js.map M static/maps/mvc/collection/collection-li.js.map M static/maps/mvc/collection/collection-model.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/scripts/mvc/collection/collection-li-edit.js M static/scripts/mvc/collection/collection-li.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/history/hda-li-edit.js M templates/webapps/galaxy/data_manager/index.mako M templates/webapps/galaxy/data_manager/view_job.mako Log Message: ----------- Merge branch 'release_15.10' into dev Conflicts: lib/galaxy/web/framework/middleware/remoteuser.py Compare: https://github.com/galaxyproject/galaxy/compare/f10047c4d31e...fae21e30f56e