Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e50e7239b58ef80f62c537096bdf642198aaa9cb https://github.com/galaxyproject/galaxy/commit/e50e7239b58ef80f62c537096bdf6... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/tools/actions/upload.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/webapps/galaxy/controllers/library_common.py Log Message: ----------- Implement IP address whitelisting Commit: 569bd6bedf17b1b1f73c964345dd41b3d29cf104 https://github.com/galaxyproject/galaxy/commit/569bd6bedf17b1b1f73c964345dd4... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M client/galaxy/scripts/utils/uploadbox.js M static/maps/utils/uploadbox.js.map M static/scripts/utils/uploadbox.js Log Message: ----------- Show a more useful error when one is available Commit: d1892fc4446474b14da33b6862002a7d54fd9fd2 https://github.com/galaxyproject/galaxy/commit/d1892fc4446474b14da33b6862002... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M lib/galaxy/config.py M lib/galaxy/tools/actions/upload_common.py Log Message: ----------- the library prefers unicode stuff Commit: 36758478d590664615f7fe8e32ef9f7879eb2284 https://github.com/galaxyproject/galaxy/commit/36758478d590664615f7fe8e32ef9... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M lib/galaxy/tools/actions/upload_common.py Log Message: ----------- non-URL things get passed to this function Commit: b620536dc25af3b68a28aade5682b6b7a92af15d https://github.com/galaxyproject/galaxy/commit/b620536dc25af3b68a28aade5682b... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- rebuild client Commit: cb416390781e546ce77b94f56cca73e48faed070 https://github.com/galaxyproject/galaxy/commit/cb416390781e546ce77b94f56cca7... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- flake8 Commit: e8ea1104a7ec1775350d881d3f5eed9fb420b38e https://github.com/galaxyproject/galaxy/commit/e8ea1104a7ec1775350d881d3f5ee... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/integration/test_upload_configuration_options.py Log Message: ----------- add a test expecting failure Commit: 618d89b972258db5d2dafcb127ed3a6b473402ae https://github.com/galaxyproject/galaxy/commit/618d89b972258db5d2dafcb127ed3... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M lib/galaxy/config.py Log Message: ----------- lint-import-order Commit: 4e2cd5fea628884d1dddd305e28f3ec81b509982 https://github.com/galaxyproject/galaxy/commit/4e2cd5fea628884d1dddd305e28f3... Author: E Rasche <hxr@hx42.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: 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.map M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- rebuild client Commit: 2aeb4590d1c9c7bb86bb21b42d6fe20ffc8d59f8 https://github.com/galaxyproject/galaxy/commit/2aeb4590d1c9c7bb86bb21b42d6fe... Author: John Chilton <jmchilton@gmail.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M client/galaxy/scripts/utils/uploadbox.js M config/galaxy.ini.sample M lib/galaxy/config.py M lib/galaxy/tools/actions/upload.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/utils/uploadbox.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/library/library-foldertoolbar-view.js M static/scripts/utils/uploadbox.js M test/integration/test_upload_configuration_options.py Log Message: ----------- Merge pull request #4289 from erasche/local-network Local network access restrictions Compare: https://github.com/galaxyproject/galaxy/compare/74f7181eafa9...2aeb4590d1c9