Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 07a94a6e15157cafc6fde587624d8be486f249c9 https://github.com/galaxyproject/galaxy/commit/07a94a6e15157cafc6fde587624d8... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.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/upload/composite/composite-row.js M static/style/blue/base.css Log Message: ----------- Revise composite row views Commit: 2122ba55065e89b7b4ffbc63c1647d0e8cfcf5ea https://github.com/galaxyproject/galaxy/commit/2122ba55065e89b7b4ffbc63c1647... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/composite/composite-view.js.map M static/scripts/mvc/upload/composite/composite-view.js Log Message: ----------- Revise composite main view Commit: e3003a0abf845695406ea8f4d44a4accaefdd5a7 https://github.com/galaxyproject/galaxy/commit/e3003a0abf845695406ea8f4d44a4... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-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/composite/composite-row.js M static/scripts/mvc/upload/composite/composite-view.js M static/style/blue/base.css Log Message: ----------- Fix progress bar Commit: 2a14fd8ce4d5e1932eb2dc2fcf21bbf1474ddc2a https://github.com/galaxyproject/galaxy/commit/2a14fd8ce4d5e1932eb2dc2fcf21b... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/upload-button.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/upload-ftp.js Log Message: ----------- Revise and properly indent upload-ftp code Commit: 80c414ab98b439b06c94c35a6369b878af0112b8 https://github.com/galaxyproject/galaxy/commit/80c414ab98b439b06c94c35a6369b... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/upload-model.js M static/maps/mvc/upload/upload-model.js.map Log Message: ----------- Fix indent for upload-model Commit: 9c196a822f8510934c16fe1a3a73a1c138059139 https://github.com/galaxyproject/galaxy/commit/9c196a822f8510934c16fe1a3a73a... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/upload-settings.js M static/maps/mvc/upload/upload-settings.js.map Log Message: ----------- Fix indent for upload-settings Commit: ed2722996f2c3c0b33ec9212da2c722cf86a8ef8 https://github.com/galaxyproject/galaxy/commit/ed2722996f2c3c0b33ec9212da2c7... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M client/galaxy/scripts/mvc/upload/default/default-row.js M client/galaxy/scripts/mvc/upload/upload-view.js M static/maps/mvc/upload/composite/composite-row.js.map M static/maps/mvc/upload/default/default-row.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/composite/composite-row.js M static/scripts/mvc/upload/default/default-row.js M static/scripts/mvc/upload/upload-view.js Log Message: ----------- Revise default-row view Commit: 966e33e3ac6a10177670c0b4616fefecb8c83958 https://github.com/galaxyproject/galaxy/commit/966e33e3ac6a10177670c0b4616fe... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M client/galaxy/scripts/mvc/upload/default/default-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-view.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/composite/composite-view.js M static/scripts/mvc/upload/default/default-view.js M static/style/blue/base.css Log Message: ----------- Revise uploader default view Commit: 60a496c6dacaeaff1f58f7ad06e8d67bf7410657 https://github.com/galaxyproject/galaxy/commit/60a496c6dacaeaff1f58f7ad06e8d... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/style/less/upload.less M static/style/blue/base.css Log Message: ----------- Fix info text style and color Commit: ba10f032f1c9a1a392b4e826d01785f8c0428673 https://github.com/galaxyproject/galaxy/commit/ba10f032f1c9a1a392b4e826d0178... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M static/maps/mvc/upload/composite/composite-row.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/composite/composite-row.js Log Message: ----------- Fix no transitional progress bar reset for composite uploader rows Commit: af3e0e23628a3726c803883d58e9f39db0bc2410 https://github.com/galaxyproject/galaxy/commit/af3e0e23628a3726c803883d58e9f... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/history-panel.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/mvc/annotation.js M client/galaxy/scripts/mvc/base-mvc.js A client/galaxy/scripts/mvc/base/controlled-fetch-collection.js 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/collection/collection-view.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/dataset/dataset-li.js M client/galaxy/scripts/mvc/dataset/dataset-model.js M client/galaxy/scripts/mvc/history/copy-dialog.js M client/galaxy/scripts/mvc/history/hda-li-edit.js M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/history/hda-model.js M client/galaxy/scripts/mvc/history/hdca-li.js M client/galaxy/scripts/mvc/history/hdca-model.js M client/galaxy/scripts/mvc/history/history-content-model.js M client/galaxy/scripts/mvc/history/history-contents.js M client/galaxy/scripts/mvc/history/history-model.js A client/galaxy/scripts/mvc/history/history-preferences.js M client/galaxy/scripts/mvc/history/history-structure-view.js M client/galaxy/scripts/mvc/history/history-view-annotated.js M client/galaxy/scripts/mvc/history/history-view-edit-current.js M client/galaxy/scripts/mvc/history/history-view-edit.js M client/galaxy/scripts/mvc/history/history-view.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/history/options-menu.js M client/galaxy/scripts/mvc/list/list-item.js M client/galaxy/scripts/mvc/list/list-view.js M client/galaxy/scripts/mvc/ui/error-modal.js M client/galaxy/scripts/mvc/ui/ui-modal.js M client/galaxy/scripts/ui/search-input.js M client/galaxy/scripts/utils/ajax-queue.js M client/galaxy/style/less/base.less A client/galaxy/style/less/collection.less R client/galaxy/style/less/collections.less A client/galaxy/style/less/dataset.less A client/galaxy/style/less/flex.less M client/galaxy/style/less/history.less M client/galaxy/style/less/list-item.less A client/galaxy/style/less/ui/error-modal.less M client/galaxy/style/less/ui/search-input.less M client/galaxy/style/less/upload.less M lib/galaxy/managers/annotatable.py M lib/galaxy/managers/base.py M lib/galaxy/managers/datasets.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/hdcas.py M lib/galaxy/managers/histories.py M lib/galaxy/managers/history_contents.py M lib/galaxy/model/__init__.py M lib/galaxy/webapps/galaxy/api/history_contents.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M static/maps/layout/panel.js.map M static/maps/mvc/annotation.js.map M static/maps/mvc/base-mvc.js.map A static/maps/mvc/base/controlled-fetch-collection.js.map 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/collection/collection-view.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/dataset/dataset-li.js.map M static/maps/mvc/dataset/dataset-model.js.map M static/maps/mvc/history/copy-dialog.js.map M static/maps/mvc/history/hda-li-edit.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/history/hda-model.js.map M static/maps/mvc/history/hdca-li.js.map M static/maps/mvc/history/hdca-model.js.map M static/maps/mvc/history/history-content-model.js.map M static/maps/mvc/history/history-contents.js.map M static/maps/mvc/history/history-model.js.map A static/maps/mvc/history/history-preferences.js.map M static/maps/mvc/history/history-structure-view.js.map M static/maps/mvc/history/history-view-annotated.js.map M static/maps/mvc/history/history-view-edit-current.js.map M static/maps/mvc/history/history-view-edit.js.map M static/maps/mvc/history/history-view.js.map M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/history/options-menu.js.map M static/maps/mvc/list/list-item.js.map M static/maps/mvc/list/list-view.js.map M static/maps/mvc/ui/error-modal.js.map M static/maps/mvc/ui/ui-modal.js.map M static/maps/ui/search-input.js.map M static/maps/utils/ajax-queue.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/layout/panel.js M static/scripts/mvc/annotation.js M static/scripts/mvc/base-mvc.js A static/scripts/mvc/base/controlled-fetch-collection.js M static/scripts/mvc/collection/collection-model.js M static/scripts/mvc/collection/collection-view.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/dataset/dataset-model.js M static/scripts/mvc/history/copy-dialog.js M static/scripts/mvc/history/hda-model.js M static/scripts/mvc/history/hdca-model.js M static/scripts/mvc/history/history-content-model.js M static/scripts/mvc/history/history-contents.js M static/scripts/mvc/history/history-model.js A static/scripts/mvc/history/history-preferences.js M static/scripts/mvc/history/history-structure-view.js M static/scripts/mvc/history/history-view-annotated.js M static/scripts/mvc/history/history-view-edit-current.js M static/scripts/mvc/history/history-view-edit.js M static/scripts/mvc/history/history-view.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/history/options-menu.js M static/scripts/mvc/list/list-item.js M static/scripts/mvc/list/list-view.js M static/scripts/mvc/ui/error-modal.js M static/scripts/mvc/ui/ui-modal.js M static/scripts/ui/search-input.js M static/scripts/utils/ajax-queue.js M static/style/blue/base.css M static/style/blue/bootstrap-tour.css M static/style/blue/jquery.rating.css M templates/webapps/galaxy/history/display.mako M templates/webapps/galaxy/history/embed.mako M templates/webapps/galaxy/history/view.mako M templates/webapps/galaxy/history/view_multiple.mako M test/qunit/tests/history_contents_model_tests.js M test/unit/managers/test_HistoryManager.py Log Message: ----------- Merge branch 'dev' into refactor_uploader Commit: 4c6d04e3a773e25f3c8a709546c8eb65c939a1ab https://github.com/galaxyproject/galaxy/commit/4c6d04e3a773e25f3c8a709546c8e... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/default/default-row.js M static/maps/mvc/upload/default/default-row.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 test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Fix test cases Commit: e685211851c1ecfa3999df5df26c7509a1c2047a https://github.com/galaxyproject/galaxy/commit/e685211851c1ecfa3999df5df26c7... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.js M static/maps/mvc/upload/composite/composite-row.js.map M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Fix spacing, remove multi line comments Commit: ae9961eab3c98cf1fce768e55e853e10d5d456de https://github.com/galaxyproject/galaxy/commit/ae9961eab3c98cf1fce768e55e853... Author: guerler <aysam.guerler@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-view.js M static/maps/mvc/upload/composite/composite-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/composite/composite-view.js Log Message: ----------- Use listenTo for collection events Commit: 370c00124157d5ffb01752d8c0dbb4c0283ac4c2 https://github.com/galaxyproject/galaxy/commit/370c00124157d5ffb01752d8c0dbb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M client/galaxy/scripts/mvc/upload/composite/composite-row.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 M client/galaxy/scripts/mvc/upload/upload-button.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/mvc/upload/upload-model.js M client/galaxy/scripts/mvc/upload/upload-settings.js M client/galaxy/scripts/mvc/upload/upload-view.js M client/galaxy/style/less/upload.less M static/maps/mvc/upload/composite/composite-row.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 M static/maps/mvc/upload/upload-button.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/mvc/upload/upload-model.js.map M static/maps/mvc/upload/upload-settings.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 M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/upload/composite/composite-row.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 M static/scripts/mvc/upload/upload-ftp.js M static/scripts/mvc/upload/upload-view.js M static/style/blue/base.css M test/qunit/tests/upload_dialog_tests.js Log Message: ----------- Merge pull request #2711 from guerler/refactor_uploader Refactor uploader dialog, use local css classes, avoid model listeners Compare: https://github.com/galaxyproject/galaxy/compare/710174cbf98d...370c00124157