Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 600112256970c1024b3ba4e6fa57cd61f9fe199d
https://github.com/galaxyproject/galaxy/commit/600112256970c1024b3ba4e6fa57…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M templates/user/index.mako
Log Message:
-----------
remove the communication server check
from non-galaxy calls
Commit: cf0e4e84ce4137334ee6e8c20e56a52070179c4d
https://github.com/galaxyproject/galaxy/commit/cf0e4e84ce4137334ee6e8c20e56…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-10-14 (Fri, 14 Oct 2016)
Changed paths:
M templates/user/index.mako
Log Message:
-----------
Merge pull request #3053 from martenson/fix-userindex-for-ts
[16.07] remove the communication server check
Commit: 096a7bf94d799f905013f7052c1bdf87062a45a7
https://github.com/galaxyproject/galaxy/commit/096a7bf94d799f905013f7052c1b…
Author: Martin Cech <cech.marten(a)gmail.com>
Date: 2016-10-20 (Thu, 20 Oct 2016)
Changed paths:
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/bundled/analysis.bundled.js
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/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
Log Message:
-----------
fix the incorrect handling of root when prefix is in play
Commit: 65dc4f22aa7b717109aca6fac7947a84d2bd587a
https://github.com/galaxyproject/galaxy/commit/65dc4f22aa7b717109aca6fac794…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2016-10-23 (Sun, 23 Oct 2016)
Changed paths:
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/bundled/analysis.bundled.js
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/mvc/library/library-dataset-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
Log Message:
-----------
Merge pull request #3074 from martenson/fix-libraries-prefix
[16.07] Fix libraries prefix
Commit: 9abe863f26ba742c9f362b3a8177af5c8efa5741
https://github.com/galaxyproject/galaxy/commit/9abe863f26ba742c9f362b3a8177…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-11-01 (Tue, 01 Nov 2016)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Fix loading of collection operations
If MODEL_TOOLS_PATH is not absolute, it will be joined with tool_path
(i.e. './tools' ) inside _load_tool_tag_set(), so Galaxy will try to load
e.g. './tools/lib/galaxy/tools/unzip_collection.xml'
Commit: 5963a2fa22e64b5494a1aa00931808a11d792cbd
https://github.com/galaxyproject/galaxy/commit/5963a2fa22e64b5494a1aa009318…
Author: Björn Grüning <bjoern(a)gruenings.eu>
Date: 2016-11-02 (Wed, 02 Nov 2016)
Changed paths:
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
Log Message:
-----------
Merge pull request #3115 from nsoranzo/release_16.07_fix_collection_ops_loading
[16.07] Fix loading of collection operations
Commit: ef3e63e6d7327719a4581bb939dff8fd1ac1fcd9
https://github.com/galaxyproject/galaxy/commit/ef3e63e6d7327719a4581bb939df…
Author: Nicola Soranzo <nicola.soranzo(a)tgac.ac.uk>
Date: 2016-11-02 (Wed, 02 Nov 2016)
Changed paths:
M client/galaxy/scripts/mvc/library/library-dataset-view.js
M client/galaxy/scripts/mvc/library/library-folderrow-view.js
M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
M lib/galaxy/tools/__init__.py
M lib/galaxy/tools/toolbox/base.py
M static/maps/mvc/library/library-dataset-view.js.map
M static/maps/mvc/library/library-folderrow-view.js.map
M static/maps/mvc/library/library-foldertoolbar-view.js.map
M static/scripts/bundled/analysis.bundled.js
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-dataset-view.js
M static/scripts/mvc/library/library-folderrow-view.js
M static/scripts/mvc/library/library-foldertoolbar-view.js
M templates/user/index.mako
Log Message:
-----------
Merge branch 'release_16.07' into dev
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
Compare: https://github.com/galaxyproject/galaxy/compare/38dd9ca509ed...ef3e63e6d732