Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 688128feed6147e359969f19775630d11a5281c1 https://github.com/galaxyproject/galaxy/commit/688128feed6147e359969f1977563... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-list.js Log Message: ----------- Minor tweak; use dot notation in history-list.js Commit: 12da37bb9ab1fbf35b13a36ba808d23f054a738c https://github.com/galaxyproject/galaxy/commit/12da37bb9ab1fbf35b13a36ba808d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-view.js Log Message: ----------- Grid-view cleanup. Commit: 35d854b8c13d951692e9f0bc9564031d1dc790e0 https://github.com/galaxyproject/galaxy/commit/35d854b8c13d951692e9f0bc95640... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js Log Message: ----------- Fixes in grid-template. A couple redefined vars, one used out of scope, and some general cleanup. Commit: f296d1f3334098481f56ac82ea861554cb48ab38 https://github.com/galaxyproject/galaxy/commit/f296d1f3334098481f56ac82ea861... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js Log Message: ----------- Minor formatting. Commit: 53bcd063bce83257546a46918d73074491693324 https://github.com/galaxyproject/galaxy/commit/53bcd063bce83257546a46918d730... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-list.js Log Message: ----------- Started refactoring more dramatically, but I think we probably want to do a bigger rewrite of this stuff with Vue grid components, Vuex, etc., so this simple subclassing should fix the problems we're seeing for now. Commit: cb6bbe3a0fbf5fb12507ddc391366b24177724c0 https://github.com/galaxyproject/galaxy/commit/cb6bbe3a0fbf5fb12507ddc391366... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-list.js Log Message: ----------- Client format. Commit: 556c17d154e2efe496484b917f25acacaaba7c87 https://github.com/galaxyproject/galaxy/commit/556c17d154e2efe496484b917f25a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-06 (Wed, 06 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js Log Message: ----------- Convert a bunch of iterables to use 'of' syntax instead of 'in'. Commit: eca993539a2e00895e32316e939e09fdfb79b84d https://github.com/galaxyproject/galaxy/commit/eca993539a2e00895e32316e939e0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/apps/panels/history-panel.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/layout/generic-nav-view.js M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-error.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/form/form-repeat.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M client/galaxy/scripts/mvc/library/library-librarytoolbar-view.js M client/galaxy/scripts/mvc/tool/tool-form-base.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js M client/galaxy/scripts/mvc/tool/tool-form.js M client/galaxy/scripts/mvc/toolshed/repo-status-view.js M client/galaxy/scripts/mvc/toolshed/repository-queue-view.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/toolshed/shed-list-view.js M client/galaxy/scripts/mvc/toolshed/workflows-view.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/ui/ui-frames.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-genomespace.js M client/galaxy/scripts/mvc/upload/collection/collection-row.js M client/galaxy/scripts/mvc/upload/collection/collection-view.js 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-view.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-forms.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/ja/locale.js M client/galaxy/scripts/nls/locale.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/sweepster.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/filters.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/visualization.js A doc/source/admin/cluster.md M doc/source/admin/index.rst A doc/source/admin/jobs.md A doc/source/admin/production.md A doc/source/admin/scaling.md A doc/source/admin/special_topics/apache.md A doc/source/admin/special_topics/ftp.md M doc/source/admin/special_topics/index.rst A doc/source/admin/special_topics/job_metrics.md A doc/source/admin/special_topics/nginx.md M doc/source/conf.py M lib/galaxy/model/tool_shed_install/__init__.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/parameters/basic.py A lib/galaxy/tools/repositories.py A lib/galaxy/util/renamed_temporary_file.py M lib/galaxy/webapps/galaxy/api/toolshed.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/tool_shed/api/tools.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/controllers/upload.py M lib/galaxy/workflow/run.py M lib/tool_shed/galaxy_install/install_manager.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/metadata/repository_metadata_manager.py M lib/tool_shed/tools/data_table_manager.py M lib/tool_shed/tools/tool_validator.py M lib/tool_shed/util/commit_util.py M lib/tool_shed/util/tool_util.py M lib/tool_shed/util/workflow_util.py M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/extended.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/login.bundled.js M static/scripts/galaxy.pages.js M static/scripts/layout/generic-nav-view.js M static/scripts/layout/scratchbook.js M static/scripts/mvc/collection/list-of-pairs-collection-creator.js M static/scripts/mvc/dataset/data.js M static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-error.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/dataset/dataset-li.js M static/scripts/mvc/form/form-repeat.js M static/scripts/mvc/history/history-list.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/scripts/mvc/library/library-librarytoolbar-view.js M static/scripts/mvc/tool/tool-form-base.js M static/scripts/mvc/tool/tool-form-composite.js M static/scripts/mvc/tool/tool-form.js M static/scripts/mvc/toolshed/repo-status-view.js M static/scripts/mvc/toolshed/repository-queue-view.js M static/scripts/mvc/toolshed/repository-view.js M static/scripts/mvc/toolshed/shed-list-view.js M static/scripts/mvc/toolshed/workflows-view.js M static/scripts/mvc/tours.js M static/scripts/mvc/ui/ui-frames.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-genomespace.js M static/scripts/mvc/upload/collection/collection-row.js M static/scripts/mvc/upload/collection/collection-view.js 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-button.js M static/scripts/mvc/upload/upload-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-forms.js M static/scripts/mvc/workflow/workflow-view.js M static/scripts/mvc/workflow/workflow.js M static/scripts/nls/fr/locale.js M static/scripts/nls/ja/locale.js M static/scripts/nls/locale.js M static/scripts/viz/circster.js M static/scripts/viz/phyloviz.js M static/scripts/viz/sweepster.js M static/scripts/viz/trackster.js M static/scripts/viz/trackster/filters.js M static/scripts/viz/trackster/tracks.js M static/scripts/viz/visualization.js M test/api/test_workflows.py A test/shed_functional/test_data/bowtie2_loc_sample/bowtie2_indices.loc.sample A test/unit/tools/test_tool_validation.py Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into fix-history-copy Commit: a92da1c109c3e5cbc530d17cd148a5877098a676 https://github.com/galaxyproject/galaxy/commit/a92da1c109c3e5cbc530d17cd148a... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js Log Message: ----------- use encoded ids for popup anchor identifiers instead of sequence; this is more robust Commit: e08a3d0ffd01a7d58ad7445ef19050e6fbbefae3 https://github.com/galaxyproject/galaxy/commit/e08a3d0ffd01a7d58ad7445ef1905... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/history-list.js Log Message: ----------- Make client Commit: 30196f5941df704f6bb0a2a215315db08ffc92bf https://github.com/galaxyproject/galaxy/commit/30196f5941df704f6bb0a2a215315... Author: John Chilton <jmchilton@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/history/history-list.js M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/libs.bundled.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/history/history-list.js Log Message: ----------- Merge pull request #5144 from dannon/fix-history-copy Fix history copy Compare: https://github.com/galaxyproject/galaxy/compare/ef13e2857851...30196f5941df