Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 45763bf85e2a868476b2807bac1ddf92be844f76
https://github.com/galaxyproject/galaxy/commit/45763bf85e2a868476b2807bac1d…
Author: guerler <aysam.guerler(a)gmail.com>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M lib/galaxy/tools/__init__.py
M static/maps/mvc/tools/tools-form-base.js.map
M static/scripts/mvc/tools/tools-form-base.js
Log Message:
-----------
Use common exceptions in tools
Commit: 408c82c43d6d05650668067b82aee8e8ece7d678
https://github.com/galaxyproject/galaxy/commit/408c82c43d6d05650668067b82ae…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2015-10-10 (Sat, 10 Oct 2015)
Changed paths:
M client/galaxy/scripts/mvc/tools/tools-form-base.js
M lib/galaxy/tools/__init__.py
M static/maps/mvc/tools/tools-form-base.js.map
M static/scripts/mvc/tools/tools-form-base.js
Log Message:
-----------
Merge pull request #874 from guerler/tool_execution_001
Use common exceptions in tools
Compare: https://github.com/galaxyproject/galaxy/compare/fae21e30f56e...408c82c43d6d
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 31c89ea29c2c504878f336d90dfcf320b873b2ee
https://github.com/galaxyproject/galaxy/commit/31c89ea29c2c504878f336d90dfc…
Author: carlfeberhard <carlfeberhard(a)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/69cd5a98dcda30771ce78118ebd3…
Author: Björn Grüning <bjoern(a)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/4705409d386f6cabe1874ac04461…
Author: Eric Rasche <rasche.eric(a)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-authenti…
Commit: a0ad2b75c29eca2c33ccfcdd4aa4a834c06c5265
https://github.com/galaxyproject/galaxy/commit/a0ad2b75c29eca2c33ccfcdd4aa4…
Author: Daniel Blankenberg <dan.blankenberg(a)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/90506ba1c6b83731cf5e11badabf…
Author: Daniel Blankenberg <dan.blankenberg(a)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/38b9ca3400eaf482c50c6224438d…
Author: Dannon Baker <dannon.baker(a)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/fae21e30f56e5a1e92aa80f58daa…
Author: Martin Cech <cech.marten(a)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
Branch: refs/heads/release_15.10
Home: https://github.com/galaxyproject/galaxy
Commit: 90506ba1c6b83731cf5e11badabfde1f8d3e34c4
https://github.com/galaxyproject/galaxy/commit/90506ba1c6b83731cf5e11badabf…
Author: Daniel Blankenberg <dan.blankenberg(a)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/38b9ca3400eaf482c50c6224438d…
Author: Dannon Baker <dannon.baker(a)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.
Compare: https://github.com/galaxyproject/galaxy/compare/a0ad2b75c29e...38b9ca3400ea
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: c72618680287d9affd56f5c4434ef7a9b9525e8d
https://github.com/galaxyproject/galaxy/commit/c72618680287d9affd56f5c4434e…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M templates/webapps/galaxy/admin/center.mako
M templates/webapps/galaxy/admin/index.mako
Log Message:
-----------
Slight tweak to sidebar section naming from 'security' to 'user management', for users, groups, roles, api keys
Commit: f10047c4d31ef44ca6be03894224ecc36d44627e
https://github.com/galaxyproject/galaxy/commit/f10047c4d31ef44ca6be03894224…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M templates/webapps/galaxy/admin/center.mako
M templates/webapps/galaxy/admin/index.mako
Log Message:
-----------
Merge pull request #877 from dannon/minor_naming_tweak
Slight tweak to sidebar section naming from 'security' to 'user manag…
Compare: https://github.com/galaxyproject/galaxy/compare/77307e686b31...f10047c4d31e