Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 1676434ab58d35da37b3f9327d31e763eb4e9cc8
https://github.com/galaxyproject/galaxy/commit/1676434ab58d35da37b3f9327d31…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/workflow/workflow-model.js
Log Message:
-----------
Correct base route for workflows, allowing proxy-prefix to work.
Commit: d214ccc0e4884edd8234de8758400d08b8dda64d
https://github.com/galaxyproject/galaxy/commit/d214ccc0e4884edd8234de875840…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/workflow/workflow-model.js
Log Message:
-----------
Leading slash not required here
Commit: 146010fcbf215f21e9f232467aabac1f095fe2d5
https://github.com/galaxyproject/galaxy/commit/146010fcbf215f21e9f232467aab…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/onload.js
M static/maps/onload.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/onload.js
Log Message:
-----------
Fix onload webhook call w/ Galaxy.root
Commit: 42c81293f6cccbb26c4466bd5f5f3d702943fa93
https://github.com/galaxyproject/galaxy/commit/42c81293f6cccbb26c4466bd5f5f…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/toolshed/scripts/mvc/groups/group-model.js
M static/toolshed/maps/mvc/groups/group-detail-view.js.map
M static/toolshed/maps/mvc/groups/group-list-view.js.map
M static/toolshed/maps/mvc/groups/group-listrow-view.js.map
M static/toolshed/maps/mvc/groups/group-model.js.map
M static/toolshed/scripts/mvc/groups/group-detail-view.js
M static/toolshed/scripts/mvc/groups/group-list-view.js
M static/toolshed/scripts/mvc/groups/group-listrow-view.js
M static/toolshed/scripts/mvc/groups/group-model.js
Log Message:
-----------
Galaxy.root (proxy prefix) support for toolshed's Group model.
Commit: 89ce44803ea5cf38b778e61bb7eedfc7b952ce12
https://github.com/galaxyproject/galaxy/commit/89ce44803ea5cf38b778e61bb7ee…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M lib/galaxy/web/framework/webapp.py
Log Message:
-----------
Append fewer characters to id_secret by default for encrypting csrf tokens.
Seems there is a maximum length and main hit it. It never did for job files - so this should be fine. If you have a secret that is near the maximum lenght one just needs to set ``per_kind_id_secret_base`` to something shorter than id_secret.
Commit: 7775d429b6b06397b5ab90d7bea1671a7aa4b424
https://github.com/galaxyproject/galaxy/commit/7775d429b6b06397b5ab90d7bea1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M client/galaxy/scripts/onload.js
M client/toolshed/scripts/mvc/groups/group-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/maps/onload.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/workflow/workflow-model.js
M static/scripts/onload.js
M static/toolshed/maps/mvc/groups/group-detail-view.js.map
M static/toolshed/maps/mvc/groups/group-list-view.js.map
M static/toolshed/maps/mvc/groups/group-listrow-view.js.map
M static/toolshed/maps/mvc/groups/group-model.js.map
M static/toolshed/scripts/mvc/groups/group-detail-view.js
M static/toolshed/scripts/mvc/groups/group-list-view.js
M static/toolshed/scripts/mvc/groups/group-listrow-view.js
M static/toolshed/scripts/mvc/groups/group-model.js
Log Message:
-----------
Merge pull request #4705 from dannon/proxy_prefix_model_fixes
[17.09] Correct base route for workflows, allowing proxy-prefix to work.
Commit: d41f4ce0ec8996677dba6b12be49f0c94f7d4f24
https://github.com/galaxyproject/galaxy/commit/d41f4ce0ec8996677dba6b12be49…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M lib/galaxy/web/framework/webapp.py
Log Message:
-----------
Merge pull request #4710 from jmchilton/id_secret_fix
[17.09] Append fewer characters to id_secret by default for encrypting csrf tokens.
Commit: 9a0511e8839cbf972d8c374243e1b562ef327bc1
https://github.com/galaxyproject/galaxy/commit/9a0511e8839cbf972d8c374243e1…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M client/galaxy/scripts/onload.js
M client/toolshed/scripts/mvc/groups/group-model.js
M lib/galaxy/web/framework/webapp.py
M static/maps/mvc/workflow/workflow-model.js.map
M static/maps/onload.js.map
M static/scripts/bundled/admin.bundled.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/workflow/workflow-model.js
M static/scripts/onload.js
M static/toolshed/maps/mvc/groups/group-detail-view.js.map
M static/toolshed/maps/mvc/groups/group-list-view.js.map
M static/toolshed/maps/mvc/groups/group-listrow-view.js.map
M static/toolshed/maps/mvc/groups/group-model.js.map
M static/toolshed/scripts/mvc/groups/group-detail-view.js
M static/toolshed/scripts/mvc/groups/group-list-view.js
M static/toolshed/scripts/mvc/groups/group-listrow-view.js
M static/toolshed/scripts/mvc/groups/group-model.js
Log Message:
-----------
Merge branch 'release_17.09' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/319489c88ea9...9a0511e8839c
Branch: refs/heads/release_17.09
Home: https://github.com/galaxyproject/galaxy
Commit: 89ce44803ea5cf38b778e61bb7eedfc7b952ce12
https://github.com/galaxyproject/galaxy/commit/89ce44803ea5cf38b778e61bb7ee…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M lib/galaxy/web/framework/webapp.py
Log Message:
-----------
Append fewer characters to id_secret by default for encrypting csrf tokens.
Seems there is a maximum length and main hit it. It never did for job files - so this should be fine. If you have a secret that is near the maximum lenght one just needs to set ``per_kind_id_secret_base`` to something shorter than id_secret.
Commit: d41f4ce0ec8996677dba6b12be49f0c94f7d4f24
https://github.com/galaxyproject/galaxy/commit/d41f4ce0ec8996677dba6b12be49…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M lib/galaxy/web/framework/webapp.py
Log Message:
-----------
Merge pull request #4710 from jmchilton/id_secret_fix
[17.09] Append fewer characters to id_secret by default for encrypting csrf tokens.
Compare: https://github.com/galaxyproject/galaxy/compare/7775d429b6b0...d41f4ce0ec89
Branch: refs/heads/release_17.09
Home: https://github.com/galaxyproject/galaxy
Commit: 1676434ab58d35da37b3f9327d31e763eb4e9cc8
https://github.com/galaxyproject/galaxy/commit/1676434ab58d35da37b3f9327d31…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/workflow/workflow-model.js
Log Message:
-----------
Correct base route for workflows, allowing proxy-prefix to work.
Commit: d214ccc0e4884edd8234de8758400d08b8dda64d
https://github.com/galaxyproject/galaxy/commit/d214ccc0e4884edd8234de875840…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/scripts/bundled/analysis.bundled.js
M static/scripts/bundled/analysis.bundled.js.map
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/mvc/workflow/workflow-model.js
Log Message:
-----------
Leading slash not required here
Commit: 146010fcbf215f21e9f232467aabac1f095fe2d5
https://github.com/galaxyproject/galaxy/commit/146010fcbf215f21e9f232467aab…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/onload.js
M static/maps/onload.js.map
M static/scripts/bundled/libs.bundled.js
M static/scripts/bundled/libs.bundled.js.map
M static/scripts/onload.js
Log Message:
-----------
Fix onload webhook call w/ Galaxy.root
Commit: 42c81293f6cccbb26c4466bd5f5f3d702943fa93
https://github.com/galaxyproject/galaxy/commit/42c81293f6cccbb26c4466bd5f5f…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/toolshed/scripts/mvc/groups/group-model.js
M static/toolshed/maps/mvc/groups/group-detail-view.js.map
M static/toolshed/maps/mvc/groups/group-list-view.js.map
M static/toolshed/maps/mvc/groups/group-listrow-view.js.map
M static/toolshed/maps/mvc/groups/group-model.js.map
M static/toolshed/scripts/mvc/groups/group-detail-view.js
M static/toolshed/scripts/mvc/groups/group-list-view.js
M static/toolshed/scripts/mvc/groups/group-listrow-view.js
M static/toolshed/scripts/mvc/groups/group-model.js
Log Message:
-----------
Galaxy.root (proxy prefix) support for toolshed's Group model.
Commit: 7775d429b6b06397b5ab90d7bea1671a7aa4b424
https://github.com/galaxyproject/galaxy/commit/7775d429b6b06397b5ab90d7bea1…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/mvc/workflow/workflow-model.js
M client/galaxy/scripts/onload.js
M client/toolshed/scripts/mvc/groups/group-model.js
M static/maps/mvc/workflow/workflow-model.js.map
M static/maps/onload.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/workflow/workflow-model.js
M static/scripts/onload.js
M static/toolshed/maps/mvc/groups/group-detail-view.js.map
M static/toolshed/maps/mvc/groups/group-list-view.js.map
M static/toolshed/maps/mvc/groups/group-listrow-view.js.map
M static/toolshed/maps/mvc/groups/group-model.js.map
M static/toolshed/scripts/mvc/groups/group-detail-view.js
M static/toolshed/scripts/mvc/groups/group-list-view.js
M static/toolshed/scripts/mvc/groups/group-listrow-view.js
M static/toolshed/scripts/mvc/groups/group-model.js
Log Message:
-----------
Merge pull request #4705 from dannon/proxy_prefix_model_fixes
[17.09] Correct base route for workflows, allowing proxy-prefix to work.
Compare: https://github.com/galaxyproject/galaxy/compare/8230d14fad37...7775d429b6b0
Branch: refs/heads/dev
Home: https://github.com/galaxyproject/galaxy
Commit: 4f9d5df34fb84e2547a280ab7536491a66e1da28
https://github.com/galaxyproject/galaxy/commit/4f9d5df34fb84e2547a280ab7536…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-22 (Fri, 22 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
Log Message:
-----------
WIP a bunch of GIE javascript that probabaly won't work
Commit: 04b03b28530455ff850f41215c2cfa15b597ef19
https://github.com/galaxyproject/galaxy/commit/04b03b28530455ff850f41215c2c…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-22 (Fri, 22 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
Log Message:
-----------
Make the URL spinner actually work.
Commit: 744ea8289ee29572775d2d606ab31a15e2cf4b12
https://github.com/galaxyproject/galaxy/commit/744ea8289ee29572775d2d606ab3…
Author: Nicola Soranzo <nicola.soranzo(a)earlham.ac.uk>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M lib/galaxy/tools/deps/conda_util.py
Log Message:
-----------
Update versions of conda and conda-build
Creating environments for (some) Python packages now requires conda 4.3 due
to the conda-forge `python`:
```
$ conda create -n __crossmap(a)0.2.2 crossmap=0.2.2
Fetching package metadata ...............
...
Linking packages ...
Installing conda-forge::wheel-0.30.0-py_1 requires a minimum conda version of 4.3.
```
Commit: 7edeedd7fe123ad8740f830e4c7b5e8478552137
https://github.com/galaxyproject/galaxy/commit/7edeedd7fe123ad8740f830e4c7b…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
Log Message:
-----------
Additional GIE spinning fixes for when the error condition is not a
timeout.
Commit: 180bfe718485bdfd05233402d4720f67f114d88f
https://github.com/galaxyproject/galaxy/commit/180bfe718485bdfd05233402d472…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
Log Message:
-----------
Treat timeouts and errors the same, except that timeouts step the
ajax timeout of the next request. Also fixes for toastr messages.
Commit: 9075976669be95c4ee1b505fb952d246660a6f2c
https://github.com/galaxyproject/galaxy/commit/9075976669be95c4ee1b505fb952…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M lib/galaxy/tools/deps/conda_util.py
Log Message:
-----------
Support conda create --offline for Conda >= 4.3.18.
Commit: 40900d76a96bb76542653e2c2bf886c7d88e9552
https://github.com/galaxyproject/galaxy/commit/40900d76a96bb76542653e2c2bf8…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
M static/maps/galaxy.interactive_environments.js.map
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/admin.bundled.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/galaxy.interactive_environments.js
Log Message:
-----------
Re-enable keepalive, build client.
Commit: c235382ceefb09e28c987621164f9f40450f1ed1
https://github.com/galaxyproject/galaxy/commit/c235382ceefb09e28c987621164f…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
Log Message:
-----------
No need for this keep_alive invocation after all; removes the commented out code.
Commit: 1c5c046a63d6afd160d6cb7dcafd4ec273ec029a
https://github.com/galaxyproject/galaxy/commit/1c5c046a63d6afd160d6cb7dcafd…
Author: John Chilton <jmchilton(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M lib/galaxy/tools/deps/conda_util.py
Log Message:
-----------
Merge pull request #4701 from nsoranzo/release_17.09_update_conda_version
[17.09] Update versions of conda and conda-build
Commit: 242755ee9f6a267e416a525bbf69ef513c35a2f4
https://github.com/galaxyproject/galaxy/commit/242755ee9f6a267e416a525bbf69…
Author: Nate Coraor <nate(a)bx.psu.edu>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
M static/maps/galaxy.interactive_environments.js.map
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/admin.bundled.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/galaxy.interactive_environments.js
Log Message:
-----------
Merge pull request #7 from dannon/gie_fixes
Re-enable keepalive, build client.
Commit: 8230d14fad3765585517e02a6b74126835f46fce
https://github.com/galaxyproject/galaxy/commit/8230d14fad3765585517e02a6b74…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
M static/maps/galaxy.interactive_environments.js.map
M static/scripts/bundled/admin.bundled.js
M static/scripts/bundled/admin.bundled.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/galaxy.interactive_environments.js
Log Message:
-----------
Merge pull request #4680 from natefoo/gie-client
[17.09] Client side fixes for GIEs
Commit: 319489c88ea933c1837015c386cae18ebf518d18
https://github.com/galaxyproject/galaxy/commit/319489c88ea933c1837015c386ca…
Author: Dannon Baker <dannon.baker(a)gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M client/galaxy/scripts/galaxy.interactive_environments.js
M config/plugins/interactive_environments/jupyter/static/js/jupyter.js
M config/plugins/interactive_environments/jupyter/templates/jupyter.mako
M lib/galaxy/tools/deps/conda_util.py
M static/maps/galaxy.interactive_environments.js.map
M static/scripts/galaxy.interactive_environments.js
Log Message:
-----------
Merge branch 'release_17.09' into dev
Compare: https://github.com/galaxyproject/galaxy/compare/8f33cc627f53...319489c88ea9