Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: fe556c8425859e2c0866b215d4f91e680590a935 https://github.com/galaxyproject/galaxy/commit/fe556c8425859e2c0866b215d4f91... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/upload-view.js 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 M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Add new tab for batchmode ftp uploads Commit: 40f3ac3e6b53344d092827bc4bd86c7969101956 https://github.com/galaxyproject/galaxy/commit/40f3ac3e6b53344d092827bc4bd86... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M static/maps/mvc/upload/collection/collection-view.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js Log Message: ----------- Load ftp file list view into ftp specific tab Commit: 985b17f1f67d9b108e3972e3b69eeba951f82c9a https://github.com/galaxyproject/galaxy/commit/985b17f1f67d9b108e3972e3b69ee... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/upload-ftp.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/upload/upload-ftp.js M static/style/blue/base.css Log Message: ----------- Adjust styles for view of ftp list Commit: b677bb1e467713745c11db69906bdc1e87190a28 https://github.com/galaxyproject/galaxy/commit/b677bb1e467713745c11db69906bd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Remove important tag from css style adjustment Commit: 6d11c856f8b2893ede15776b9251dc39de643ecf https://github.com/galaxyproject/galaxy/commit/6d11c856f8b2893ede15776b9251d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 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: ----------- Fix extensions and genome build styles, align with default uploader view Commit: 4f5b574412b7a988c912be13c8080ca3a55ad0c7 https://github.com/galaxyproject/galaxy/commit/4f5b574412b7a988c912be13c8080... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/style/less/upload.less 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/upload/composite/composite-view.js M static/style/blue/base.css Log Message: ----------- Align style of composite uploader to all other upload modes Commit: 7a2c1cdb0ecc481ae376df07cff732a922b9ad03 https://github.com/galaxyproject/galaxy/commit/7a2c1cdb0ecc481ae376df07cff73... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 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: ----------- Add handlers to add and remove selected ftp files Commit: 47d7357d87c528665a05060931a9e1e5b650f11f https://github.com/galaxyproject/galaxy/commit/47d7357d87c528665a05060931a9e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: 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.map Log Message: ----------- Add extension info popup Commit: 668c268775ddf630221098adbbfa654e22b9c35d https://github.com/galaxyproject/galaxy/commit/668c268775ddf630221098adbbfa6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-view.js M static/maps/mvc/upload/collection/collection-view.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-view.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/upload/collection/collection-view.js M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-view.js Log Message: ----------- Add reusable extension info popup Commit: 4637e4e392baa19452bb7bbbf9f6aeb16357f84b https://github.com/galaxyproject/galaxy/commit/4637e4e392baa19452bb7bbbf9f6a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: A client/galaxy/scripts/mvc/upload/ftp/ftp-view.js A client/galaxy/scripts/mvc/upload/upload-extension.js A static/maps/mvc/upload/ftp/ftp-view.js.map A static/maps/mvc/upload/upload-extension.js.map A static/scripts/mvc/upload/ftp/ftp-view.js A static/scripts/mvc/upload/upload-extension.js Log Message: ----------- Add packed files Commit: e38ecb4b11f28840b51bee922a46dbbc4f764140 https://github.com/galaxyproject/galaxy/commit/e38ecb4b11f28840b51bee922a46d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M static/maps/mvc/upload/ftp/ftp-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/upload/ftp/ftp-view.js Log Message: ----------- Add listener to adjust start button activity Commit: bac5299a4556592e453140d9be4c60c9ebe94ba5 https://github.com/galaxyproject/galaxy/commit/bac5299a4556592e453140d9be4c6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-28 (Mon, 28 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-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/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-view.js Log Message: ----------- Fix upload submission, refresh history after success Commit: 7496d66628cf754ffafa2264d06b6df701fae0d6 https://github.com/galaxyproject/galaxy/commit/7496d66628cf754ffafa2264d06b6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-ftp.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/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-ftp.js M static/style/blue/base.css Log Message: ----------- Augment ftp popover view, add refresh button to ftp view Commit: 779a3418053e1c3bd17eb6f06089ebf0aef6427f https://github.com/galaxyproject/galaxy/commit/779a3418053e1c3bd17eb6f06089e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-ftp.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/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-ftp.js Log Message: ----------- Fix select all event handler Commit: aca251dd7939718e4f292504ff20611c77e129e9 https://github.com/galaxyproject/galaxy/commit/aca251dd7939718e4f292504ff206... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js 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: ----------- Fix submission of multiple ftp files Commit: 911bb2b52473c684f28faed5048856d1437c9afe https://github.com/galaxyproject/galaxy/commit/911bb2b52473c684f28faed504885... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/upload-view.js 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: ----------- Order tab alphabatically Commit: d6221bf339e73ef186e0e11c7036810a9fcdfff4 https://github.com/galaxyproject/galaxy/commit/d6221bf339e73ef186e0e11c70368... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js 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: ----------- Show proper message if files are selected twice Commit: 459bd881529fd742bbeb9fe9e6e04b45bb8cf1db https://github.com/galaxyproject/galaxy/commit/459bd881529fd742bbeb9fe9e6e04... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/ui/ui-select-content.js M lib/galaxy/datatypes/data.py M lib/galaxy/workflow/modules.py M static/maps/mvc/ui/ui-select-content.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.map M static/scripts/mvc/ui/ui-select-content.js Log Message: ----------- Merge branch 'dev' into ftp_uploader Commit: e4cb4912d9e09e96c78261318a0e18d8b1ea32dc https://github.com/galaxyproject/galaxy/commit/e4cb4912d9e09e96c78261318a0e1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-view.js 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: ----------- Hide ftp tab if ftp is unavailable, use info header of ftp tab to display ftp help Commit: 1b9a6275b2d1decd6f76b6cfb96a34dab2297f79 https://github.com/galaxyproject/galaxy/commit/1b9a6275b2d1decd6f76b6cfb96a3... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M static/maps/mvc/upload/upload-ftp.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/upload/upload-ftp.js Log Message: ----------- Use model and consistently named attributes Commit: 694f58651e225748dfd8bb0e3a84230074289fe6 https://github.com/galaxyproject/galaxy/commit/694f58651e225748dfd8bb0e3a842... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-ftp.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/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-ftp.js Log Message: ----------- Indicate job submission in start button Commit: 6757d047a0804005c63984d71ee6c779c75585bb https://github.com/galaxyproject/galaxy/commit/6757d047a0804005c63984d71ee6c... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/upload-view.js M static/maps/mvc/upload/upload-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/upload/upload-view.js Log Message: ----------- Rename tab label Commit: 2ecd18e769c7e180da4e5374758dcb9f5b0f42b1 https://github.com/galaxyproject/galaxy/commit/2ecd18e769c7e180da4e5374758dc... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/utils/uploadbox.js M static/maps/mvc/upload/collection/collection-view.js.map M static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-ftp.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/upload/collection/collection-view.js M static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/utils/uploadbox.js Log Message: ----------- Index ftp files instead of using backbones filtering function Commit: de3bf8e46fb7df80ef050a6e3a97f3eb60f06634 https://github.com/galaxyproject/galaxy/commit/de3bf8e46fb7df80ef050a6e3a97f... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-01 (Fri, 01 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/tag.js A client/galaxy/scripts/mvc/workflow/workflow-model.js M client/galaxy/scripts/mvc/workflow/workflow-terminals.js M client/galaxy/scripts/mvc/workflow/workflow-view-terminals.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/style/less/base.less M config/datatypes_conf.xml.sample M config/error_report.yml.sample M doc/source/admin/special_topics/bug_reports.rst M lib/galaxy/datatypes/data.py M lib/galaxy/datatypes/registry.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/item_attrs.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/deps/requirements.py A lib/galaxy/tools/error_reports/plugins/influxdb.py M lib/galaxy/tools/error_reports/plugins/json.py M lib/galaxy/tools/error_reports/plugins/sentry.py M lib/galaxy/tools/linters/help.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/__init__.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/workflow/modules.py M static/maps/mvc/tag.js.map A static/maps/mvc/workflow/workflow-model.js.map M static/maps/mvc/workflow/workflow-terminals.js.map M static/maps/mvc/workflow/workflow-view-terminals.js.map M static/maps/mvc/workflow/workflow.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/tag.js A static/scripts/mvc/workflow/workflow-model.js M static/scripts/mvc/workflow/workflow-terminals.js M static/scripts/mvc/workflow/workflow-view-terminals.js M static/scripts/mvc/workflow/workflow.js M static/style/blue/base.css M test/api/test_jobs.py M test/api/test_workflows.py M test/galaxy_selenium/driver_factory.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/sizzle.py M test/selenium_tests/framework.py A test/selenium_tests/test_published_histories_grid.py A test/selenium_tests/test_sizzle_loading.py M test/selenium_tests/test_workflow_management.py M test/selenium_tests/test_workflow_run.py Log Message: ----------- Merge branch 'dev' into ftp_uploader Commit: dc3218eab2f971e4d3f13e16389ea480caf74af7 https://github.com/galaxyproject/galaxy/commit/dc3218eab2f971e4d3f13e16389ea... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-04 (Mon, 04 Sep 2017) Changed paths: M test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Fix ftp test Commit: 55486381a6701f748bb8b051bcd70a20a526fca6 https://github.com/galaxyproject/galaxy/commit/55486381a6701f748bb8b051bcd70... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-05 (Tue, 05 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/ui.less M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/default/default-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/upload/default/default-row.js M static/scripts/mvc/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Use lazy loader to handle uploader row construction Commit: 4de5c95866b2264b6d3ea36f0e313bac1417edb8 https://github.com/galaxyproject/galaxy/commit/4de5c95866b2264b6d3ea36f0e313... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/ui.less M static/maps/mvc/upload/default/default-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/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Use limit loader Fix reset call Commit: 5b16f0974f5f1af737f639ddcaa17ebe77a7bdae https://github.com/galaxyproject/galaxy/commit/5b16f0974f5f1af737f639ddcaa17... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: R client/galaxy/scripts/mvc/upload/ftp/ftp-view.js M client/galaxy/scripts/mvc/upload/upload-view.js R static/maps/mvc/upload/ftp/ftp-view.js.map M static/maps/mvc/upload/upload-view.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 M static/scripts/bundled/login.bundled.js.map R static/scripts/mvc/upload/ftp/ftp-view.js M static/scripts/mvc/upload/upload-view.js Log Message: ----------- Remove separate ftp tab Commit: 45ec3a9568a0c7102dfcc2b16cf01c428c5bfcdc https://github.com/galaxyproject/galaxy/commit/45ec3a9568a0c7102dfcc2b16cf01... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: A client/galaxy/scripts/mvc/lazy/lazy-limited.js M client/galaxy/scripts/mvc/upload/default/default-view.js A static/maps/mvc/lazy/lazy-limited.js.map M static/maps/mvc/upload/default/default-view.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 M static/scripts/bundled/login.bundled.js.map A static/scripts/mvc/lazy/lazy-limited.js M static/scripts/mvc/upload/default/default-view.js Log Message: ----------- Put lazy loader into separate file for reusability Commit: 9977d85d0bf238064ceb75009917a86c4156490d https://github.com/galaxyproject/galaxy/commit/9977d85d0bf238064ceb75009917a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js 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 M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Add support to submit ftp files before queueing remaining files Commit: edd6bcbe41071d276912944cb6bac6752c532e49 https://github.com/galaxyproject/galaxy/commit/edd6bcbe41071d276912944cb6bac... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js 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: ----------- Use consistent names Commit: 7816b6b4430fd96ce311fd64ac7352f833cb595d https://github.com/galaxyproject/galaxy/commit/7816b6b4430fd96ce311fd64ac735... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js 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: ----------- Move render function Commit: f24fda5301de8f3cb4c033cb6dd1036f19409d89 https://github.com/galaxyproject/galaxy/commit/f24fda5301de8f3cb4c033cb6dd10... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/lazy/lazy-limited.js M client/galaxy/scripts/mvc/upload/default/default-view.js 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: ----------- Add collection listener to govern lazy loader Commit: 33414be9e4b3aad9eb1338a9600b8789aaaea7e8 https://github.com/galaxyproject/galaxy/commit/33414be9e4b3aad9eb1338a9600b8... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js 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: ----------- Move ftp helper to separate function Commit: a7108b63c1b037c1b45aef56650996bbe919330e https://github.com/galaxyproject/galaxy/commit/a7108b63c1b037c1b45aef5665099... Author: guerler <aysam.guerler@gmail.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-view.js 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: ----------- Add submission function using current format Commit: 728087ed530f27698a0c9634ca0c1e5d471d24cb https://github.com/galaxyproject/galaxy/commit/728087ed530f27698a0c9634ca0c1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/jenkins/selenium/docker-compose.yml M .travis.yml M CITATION M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/galaxy.interactive_environments.js M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/base/controlled-fetch-collection.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/grid/grid-shared.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/history/history-model.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M client/galaxy/scripts/mvc/library/library-librarylist-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/user/user-custom-builds.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow-model.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/onload.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/scripts/utils/utils.js M client/galaxy/style/less/library.less M client/galaxy/style/less/upload.less M client/toolshed/scripts/mvc/groups/group-detail-view.js M client/toolshed/scripts/mvc/groups/group-list-view.js M client/toolshed/scripts/mvc/groups/group-model.js M config/datatypes_conf.xml.sample M config/dependency_resolvers_conf.xml.sample M config/galaxy.ini.sample A config/lmod_modules_mapping.yml.sample M config/plugins/interactive_environments/common/templates/ie.mako A config/plugins/interactive_environments/hicbrowser/config/allowed_images.yml.sample A config/plugins/interactive_environments/hicbrowser/config/hicbrowser.ini.sample A config/plugins/interactive_environments/hicbrowser/config/hicbrowser.xml A config/plugins/interactive_environments/hicbrowser/static/js/hicbrowser.js A config/plugins/interactive_environments/hicbrowser/templates/hicbrowser.mako M config/plugins/interactive_environments/jupyter/static/js/jupyter.js M config/plugins/interactive_environments/jupyter/templates/jupyter.mako M create_db.sh M cron/build_chrom_db.py M cron/parse_builds.py M cron/parse_builds_3_sites.py M doc/source/admin/reports.md A doc/source/dev/finding_and_improving_slow_code.rst M extract_dataset_parts.sh M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/containers/__init__.py M lib/galaxy/datatypes/binary.py R lib/galaxy/datatypes/converters/bam_to_bai.xml A lib/galaxy/datatypes/converters/biom1_to_biom2.xml A lib/galaxy/datatypes/converters/biom2_to_biom1.xml M lib/galaxy/datatypes/converters/interval_to_coverage.py M lib/galaxy/datatypes/converters/lped_to_pbed_converter.py M lib/galaxy/datatypes/converters/pbed_ldreduced_converter.py M lib/galaxy/datatypes/converters/pbed_to_lped_converter.py M lib/galaxy/datatypes/converters/sam_to_bam.py M lib/galaxy/datatypes/dataproviders/base.py M lib/galaxy/datatypes/dataproviders/dataset.py M lib/galaxy/datatypes/dataproviders/external.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/datatypes/registry.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py A lib/galaxy/datatypes/test/biom2_sparse_otu_table_hdf5.biom A lib/galaxy/datatypes/test/chebi_57262.v3k.mol A lib/galaxy/datatypes/test/github88.v3k.sdf A lib/galaxy/datatypes/test/test.fast5.tar A lib/galaxy/datatypes/test/test.fast5.tar.bz2 A lib/galaxy/datatypes/test/test.fast5.tar.gz M lib/galaxy/datatypes/text.py M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/dependencies/dev-requirements.txt M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/dependencies/requirements.txt M lib/galaxy/external_services/actions.py M lib/galaxy/jobs/__init__.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py M lib/galaxy/jobs/runners/__init__.py M lib/galaxy/jobs/runners/cli.py M lib/galaxy/jobs/runners/pulsar.py M lib/galaxy/jobs/runners/state_handlers/_safe_eval.py M lib/galaxy/jobs/runners/tasks.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/jobs/runners/util/job_script/__init__.py M lib/galaxy/jobs/runners/util/kill.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/managers/citations.py M lib/galaxy/managers/collections.py A lib/galaxy/managers/jobs.py M lib/galaxy/managers/libraries.py A lib/galaxy/managers/library_datasets.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/objectstore/__init__.py M lib/galaxy/objectstore/azure_blob.py M lib/galaxy/objectstore/pulsar.py M lib/galaxy/objectstore/s3.py M lib/galaxy/queue_worker.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/actions/metadata.py M lib/galaxy/tools/actions/upload.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/cache.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/deps/conda_compat.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/__init__.py A lib/galaxy/tools/deps/resolvers/lmod.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/evaluation.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py M lib/galaxy/tools/loader.py M lib/galaxy/tools/loader_directory.py M lib/galaxy/tools/locations/dockstore.py M lib/galaxy/tools/parameters/__init__.py M lib/galaxy/tools/parameters/dynamic_options.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parser/factory.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/filters/__init__.py M lib/galaxy/tools/toolbox/parser.py M lib/galaxy/tools/util/maf_utilities.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/tours/__init__.py M lib/galaxy/util/__init__.py M lib/galaxy/util/checkers.py M lib/galaxy/util/compression_utils.py M lib/galaxy/util/plugin_config.py M lib/galaxy/util/properties.py M lib/galaxy/util/xml_macros.py M lib/galaxy/version.py M lib/galaxy/visualization/genomes.py A lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/visualization/plugins/registry.py M lib/galaxy/web/base/controller.py R lib/galaxy/web/base/interactive_environments.py R lib/galaxy/web/base/pluginframework.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/web/proxy/__init__.py M lib/galaxy/webapps/config_manage.py M lib/galaxy/webapps/galaxy/api/jobs.py R lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/libraries.py A lib/galaxy/webapps/galaxy/api/library_datasets.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/config_watchers.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/async.py M lib/galaxy/webapps/galaxy/controllers/forms.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/root.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/galaxy/webapps/galaxy/controllers/workflow.py M lib/galaxy/webapps/reports/config.py M lib/galaxy/webapps/reports/controllers/system.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/webhooks/__init__.py M lib/galaxy/work/context.py M lib/galaxy/workflow/modules.py M lib/galaxy/workflow/run.py M lib/galaxy_ext/metadata/set_metadata.py M lib/tool_shed/capsule/capsule_manager.py M lib/tool_shed/galaxy_install/installed_repository_manager.py M lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py M lib/tool_shed/grids/repository_grids.py M lib/tool_shed/tool_shed_registry.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/xml_util.py M manage_db.sh M manage_tools.sh M scripts/api/data_manager_example_execute.py M scripts/api/display.py M scripts/api/search.py R scripts/binary_compatibility.py M scripts/common_startup.sh M scripts/common_startup_functions.sh M scripts/data_libraries/build_lucene_index.py M scripts/dump_tour.py M scripts/edam_mapping.py M scripts/fetch_eggs.py M scripts/grt/export.py M scripts/grt/upload.py M scripts/manage_tool_dependencies.py M scripts/microbes/BeautifulSoup.py M scripts/microbes/harvest_bacteria.py M scripts/paster.py M scripts/rst2html.py M scripts/summarize_timings.py M scripts/tool_shed/api/export.py M scripts/tool_shed/api/get_filtered_repository_revisions.py M scripts/tool_shed/bootstrap_tool_shed/bootstrap_util.py M scripts/tool_shed/bootstrap_tool_shed/create_user_with_api_key.py M scripts/tool_shed/build_ts_whoosh_index.py M scripts/tool_shed/deprecate_repositories_without_metadata.py M scripts/tools/maf/check_loc_file.py M scripts/transfer.py M static/maps/galaxy.interactive_environments.js.map M static/maps/layout/page.js.map M static/maps/mvc/base/controlled-fetch-collection.js.map M static/maps/mvc/grid/grid-shared.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/history/history-list.js.map M static/maps/mvc/history/history-model.js.map M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/lazy/lazy-limited.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/mvc/library/library-library-view.js.map M static/maps/mvc/library/library-librarylist-view.js.map M static/maps/mvc/library/library-librarytoolbar-view.js.map M static/maps/mvc/tours.js.map M static/maps/mvc/upload/default/default-view.js.map M static/maps/mvc/user/user-custom-builds.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow-model.js.map M static/maps/mvc/workflow/workflow.js.map M static/maps/onload.js.map M static/maps/utils/uploadbox.js.map M static/maps/utils/utils.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/galaxy.interactive_environments.js M static/scripts/layout/page.js M static/scripts/mvc/base/controlled-fetch-collection.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/grid/grid-shared.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/history-list.js M static/scripts/mvc/history/history-view-edit.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/lazy/lazy-limited.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-library-view.js M static/scripts/mvc/library/library-librarylist-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/mvc/tours.js M static/scripts/mvc/upload/default/default-view.js M static/scripts/mvc/user/user-custom-builds.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow-model.js M static/scripts/mvc/workflow/workflow.js M static/scripts/onload.js M static/scripts/utils/uploadbox.js M static/scripts/utils/utils.js M static/style/blue/base.css M static/style/blue/library.css 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 R templates/admin/forms/create_form.mako R templates/admin/forms/edit_form_definition.mako R templates/admin/forms/grid.mako R templates/admin/forms/view_form_definition.mako R templates/admin/tool_shed_repository/browse_category.mako M templates/display_base.mako M templates/display_common.mako R templates/export_base.mako R templates/rss.mako M templates/webapps/galaxy/admin/sanitize_whitelist.mako R templates/webapps/galaxy/admin/toolsheds.mako R templates/webapps/galaxy/history/permissions.mako R templates/webapps/galaxy/history/rename.mako R templates/webapps/galaxy/page/create.mako R templates/webapps/galaxy/visualization/create.mako M templates/webapps/galaxy/workflow/editor.mako A test-data/joiner_header_in1.tab A test-data/joiner_header_in2.tab A test-data/joiner_out1.bed A test-data/joiner_out2.bed A test-data/joiner_out3.bed A test-data/joiner_out4.bed A test-data/joiner_out5.tab A test-data/joiner_out6.tab A test-data/joiner_out7.tab M test/api/test_api_batch.py M test/api/test_authenticate.py M test/api/test_dataset_collections.py M test/api/test_datatypes.py M test/api/test_histories.py M test/api/test_history_contents.py M test/api/test_jobs.py M test/api/test_libraries.py M test/api/test_pages.py M test/api/test_tools.py M test/api/test_users.py M test/api/test_visualizations.py M test/api/test_workflows.py M test/api/test_workflows_from_yaml.py M test/base/api.py M test/base/driver_util.py M test/base/interactor.py M test/base/populators.py R test/base/test_db_util.py A test/base/testcase.py M test/base/tool_shed_util.py R test/base/twilltestcase.py M test/base/workflows_format_2/converter.py M test/base/workflows_format_2/main.py R test/functional/database_contexts.py R test/functional/test_library_templates.py M test/functional/test_toolbox.py M test/functional/tools/composite.xml M test/functional/tools/composite_output.xml M test/functional/tools/composite_output_tests.xml M test/functional/tools/metadata.xml A test/functional/twilltestcase.py M test/functional/webhooks/phdcomics/helper/__init__.py M test/galaxy_selenium/data.py M test/galaxy_selenium/driver_factory.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py A test/integration/test_data_manager_table_reload.py M test/integration/test_resolvers.py M test/integration/test_upload_configuration_options.py A test/integration/tool_sheds_conf.xml M test/manual/workflows_scaling.py M test/selenium_tests/framework.py M test/selenium_tests/test_anon_history.py M test/selenium_tests/test_collection_builders.py A test/selenium_tests/test_custom_builds.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_history_options.py M test/selenium_tests/test_history_panel.py M test/selenium_tests/test_history_sharing.py M test/selenium_tests/test_login.py M test/selenium_tests/test_published_histories_grid.py A test/selenium_tests/test_saved_histories.py M test/selenium_tests/test_sizzle_loading.py M test/selenium_tests/test_stock_tours.py M test/selenium_tests/test_tool_form.py M test/selenium_tests/test_uploads.py M test/selenium_tests/test_workflow_editor.py M test/selenium_tests/test_workflow_management.py M test/selenium_tests/test_workflow_run.py M test/shed_functional/base/test_db_util.py M test/shed_functional/base/twilltestcase.py A test/unit/__init__.py M test/unit/datatypes/dataproviders/test_base_dataproviders.py M test/unit/jobs/test_job_wrapper.py M test/unit/jobs/test_runner_local.py M test/unit/managers/base.py M test/unit/managers/test_HistoryManager.py M test/unit/shed_unit/test_installed_repository_manager.py M test/unit/shed_unit/test_tool_panel_manager.py M test/unit/tools/test_actions.py M test/unit/tools/test_collect_primary_datasets.py M test/unit/tools/test_column_parameters.py M test/unit/tools/test_data_parameters.py M test/unit/tools/test_dataset_matcher.py M test/unit/tools/test_evaluation.py M test/unit/tools/test_execution.py M test/unit/tools/test_history_imp_exp.py M test/unit/tools/test_parameter_parsing.py M test/unit/tools/test_tool_deps.py M test/unit/tools/test_tool_loader.py M test/unit/tools/test_toolbox.py M test/unit/tools/test_toolbox_filters.py M test/unit/tools_support.py M test/unit/visualizations/plugins/test_VisualizationPlugin.py M test/unit/visualizations/plugins/test_VisualizationsRegistry.py R test/unit/web/base/__init__.py R test/unit/web/base/test_HookPluginManager.py R test/unit/web/base/test_PageServingPluginManager.py R test/unit/web/base/test_PluginManager.py M test/unit/web/framework/test_webapp.py M test/unit/workflows/workflow_support.py M tools/data_source/upload.py M tools/data_source/upload.xml M tools/extract/liftOver_wrapper.xml M tools/filters/join.py M tools/filters/joiner.xml M tools/sr_assembly/velvetg.xml Log Message: ----------- Merge remote-tracking branch 'jmchilton/multiple_files_per_upload' into ftp_uploader Commit: 5c4ae1e319e08f72de146783b1e4adab1b1b41eb https://github.com/galaxyproject/galaxy/commit/5c4ae1e319e08f72de146783b1e4a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/upload/upload-view.js M static/maps/mvc/upload/upload-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/upload/upload-view.js Log Message: ----------- Specify file type and dbkey per entry Commit: 833554a42eea0686f608efc9dd2c4e2f83013a9b https://github.com/galaxyproject/galaxy/commit/833554a42eea0686f608efc9dd2c4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M lib/galaxy/datatypes/text.py Log Message: ----------- Make sure that column count and lines are defined Commit: 10196dd2e46614a9c366fa95afae7bd360233f4b https://github.com/galaxyproject/galaxy/commit/10196dd2e46614a9c366fa95afae7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-view.js M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py A lib/galaxy/datatypes/test/postgresql_fake.tar.bz2 M lib/galaxy/model/__init__.py M lib/galaxy/tools/toolbox/base.py M static/maps/mvc/history/history-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/history/history-view.js A test-data/selenium-test-notebook.ipynb M test/galaxy_selenium/data.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml A test/galaxy_selenium/navigation.yml M test/selenium_tests/framework.py M test/selenium_tests/test_anon_history.py M test/selenium_tests/test_collection_builders.py M test/selenium_tests/test_custom_builds.py M test/selenium_tests/test_history_options.py M test/selenium_tests/test_history_panel.py A test/selenium_tests/test_jupyter.py A test/selenium_tests/test_library_contents.py A test/selenium_tests/test_library_landing.py A test/selenium_tests/test_navigates_galaxy.py M test/selenium_tests/test_published_histories_grid.py M test/selenium_tests/test_registration.py M test/selenium_tests/test_saved_histories.py M test/selenium_tests/test_uploads.py M test/selenium_tests/test_workflow_editor.py M test/selenium_tests/test_workflow_management.py M test/selenium_tests/test_workflow_run.py Log Message: ----------- Merge branch 'dev' into ftp_uploader Commit: 6081c0bc8392320ecb865af9f58f5726fa40fcdf https://github.com/galaxyproject/galaxy/commit/6081c0bc8392320ecb865af9f58f5... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-folderlist-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/onload.js M config/galaxy.ini.sample M lib/galaxy/__init__.py M lib/galaxy/app.py M lib/galaxy/config.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/jobs/actions/post.py M lib/galaxy/model/__init__.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/toolbox/panel.py M lib/galaxy/util/__init__.py R lib/galaxy/util/backports/__init__.py M lib/galaxy/util/biostar.py M lib/galaxy/util/handlers.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/image_util.py R lib/galaxy/util/log/__init__.py R lib/galaxy/util/log/fluent_log.py A lib/galaxy/util/logging/__init__.py A lib/galaxy/util/logging/fluent_log.py M lib/galaxy/util/object_wrapper.py M lib/galaxy/util/pastescript/serve.py M lib/galaxy/util/streamball.py M lib/galaxy/util/submodules.py M lib/galaxy/visualization/plugins/interactive_environments.py M lib/galaxy/web/security/__init__.py M lib/galaxy/webapps/tool_shed/model/__init__.py M run.sh M setup.cfg M static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/maps/onload.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/onload.js M test/api/test_tools.py A test/api/test_tools_upload.py M test/base/api.py M test/base/api_util.py A test/base/constants.py M test/base/populators.py M test/integration/test_upload_configuration_options.py M test/unit/test_security_helper.py M tools/filters/joiner.xml Log Message: ----------- Merge remote-tracking branch 'jmchilton/dev' into ftp_uploader Conflicts: static/scripts/bundled/libs.bundled.js static/scripts/bundled/libs.bundled.js.map Commit: e03bedfb8526e55d34fd66348fc78e1a397abbd7 https://github.com/galaxyproject/galaxy/commit/e03bedfb8526e55d34fd66348fc78... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: A client/galaxy/scripts/mvc/lazy/lazy-limited.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/default/default-view.js A client/galaxy/scripts/mvc/upload/upload-extension.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/scripts/utils/uploadbox.js M client/galaxy/style/less/ui.less M client/galaxy/style/less/upload.less M lib/galaxy/datatypes/text.py A static/maps/mvc/lazy/lazy-limited.js.map M static/maps/mvc/upload/collection/collection-view.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/maps/mvc/upload/default/default-row.js.map M static/maps/mvc/upload/default/default-view.js.map A static/maps/mvc/upload/upload-extension.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-view.js.map M static/maps/utils/uploadbox.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 A static/scripts/mvc/lazy/lazy-limited.js M static/scripts/mvc/upload/collection/collection-view.js M static/scripts/mvc/upload/composite/composite-view.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/default/default-view.js A static/scripts/mvc/upload/upload-extension.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/upload/upload-view.js M static/scripts/utils/uploadbox.js M static/style/blue/base.css M test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Merge pull request #4513 from guerler/ftp_uploader Allow users to upload multiple FTP files within a single request Compare: https://github.com/galaxyproject/galaxy/compare/5edc4235bb23...e03bedfb8526