Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 934542dd1113cefb19840f68b465f8604a0fd4c9 https://github.com/galaxyproject/galaxy/commit/934542dd1113cefb19840f68b465f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow.js Log Message: ----------- Fix duplicate import of _l in workflows Commit: 8a3c3c15a43f64b615bceba9cf4449f5f230b9a2 https://github.com/galaxyproject/galaxy/commit/8a3c3c15a43f64b615bceba9cf444... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/locale.js Log Message: ----------- Client format. Commit: 440aba01b4cc87d472f9871999378233181a3f22 https://github.com/galaxyproject/galaxy/commit/440aba01b4cc87d472f9871999378... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: 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/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/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 Log Message: ----------- Client build. Commit: 6055de286d6c8d36a5c29f960390c5ac65c1c3b5 https://github.com/galaxyproject/galaxy/commit/6055de286d6c8d36a5c29f960390c... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-12-07 (Thu, 07 Dec 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-error.js M client/galaxy/scripts/mvc/toolshed/repository-view.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/nls/fr/locale.js M client/galaxy/scripts/nls/locale.js 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/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/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 Log Message: ----------- Merge pull request #5156 from dannon/fix_localization_and_build Fix localization and build client. Compare: https://github.com/galaxyproject/galaxy/compare/c8d45dd4b37c...6055de286d6c