Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 82267855ed3bc6d3f8911acf6e7e388023f6693d https://github.com/galaxyproject/galaxy/commit/82267855ed3bc6d3f8911acf6e7e3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/workflow/workflow.js M static/maps/layout/page.js.map M static/maps/mvc/workflow/workflow.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/layout/page.js M static/scripts/mvc/workflow/workflow.js Log Message: ----------- Support for applying window title on display() of views. Commit: 9a66adb4fe7a3be6e07baaec6cef8f553d6b486d https://github.com/galaxyproject/galaxy/commit/9a66adb4fe7a3be6e07baaec6cef8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Standard (for now) paren spacing. Commit: 84de84294c95110f0ee3059ad8a5e9924daf6a9d https://github.com/galaxyproject/galaxy/commit/84de84294c95110f0ee3059ad8a5e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/user/user-preferences.js M static/maps/mvc/history/history-list.js.map M static/maps/mvc/tours.js.map M static/maps/mvc/user/user-preferences.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/history/history-list.js M static/scripts/mvc/tours.js M static/scripts/mvc/user/user-preferences.js Log Message: ----------- History List, Tours, and User Preferences titles Commit: 6b2277e37dd0520de26442701407badcf792cfab https://github.com/galaxyproject/galaxy/commit/6b2277e37dd0520de26442701407b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/history/history-list.js M client/galaxy/scripts/mvc/tours.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow.js Log Message: ----------- Automatically append 'Galaxy | ' to title instead of requiring it for all view titles. Commit: 2cb8a28f7be2ff8b7076ef04a6d575d276e3bca6 https://github.com/galaxyproject/galaxy/commit/2cb8a28f7be2ff8b7076ef04a6d57... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M static/maps/layout/page.js.map M static/maps/mvc/history/history-list.js.map M static/maps/mvc/tours.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow.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/layout/page.js M static/scripts/mvc/history/history-list.js M static/scripts/mvc/tours.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow.js Log Message: ----------- Rebuild. Commit: 9a0506c5c0832c93dcd7844ea9de92b619c00773 https://github.com/galaxyproject/galaxy/commit/9a0506c5c0832c93dcd7844ea9de9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Include Galaxy brand in titles. Commit: 91eb849500faec57bebb35228a5a2e2638be70aa https://github.com/galaxyproject/galaxy/commit/91eb849500faec57bebb35228a5a2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Use 'Galaxy / Brand' consistent styling instead of 'Galaxy | Brand' Commit: 935f25aa32b3a22a53de02d5bfe4b5f7de819a0b https://github.com/galaxyproject/galaxy/commit/935f25aa32b3a22a53de02d5bfe4b... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-shared.js M static/maps/mvc/grid/grid-shared.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/grid/grid-shared.js Log Message: ----------- Titles for abstract grids w/ plural set. Commit: f83188e7f3c19a5686a623d9bb30f683cd04ff27 https://github.com/galaxyproject/galaxy/commit/f83188e7f3c19a5686a623d9bb30f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-08 (Fri, 08 Sep 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-view.js M static/maps/mvc/grid/grid-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.map M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Normal grid title propagation. Commit: 928ad294936c4f6ca4ebc007963578527886af02 https://github.com/galaxyproject/galaxy/commit/928ad294936c4f6ca4ebc00796357... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-09 (Sat, 09 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Localize displayed titles. Commit: 6b14dda216d103da518a906f4eda018eb58bafbe https://github.com/galaxyproject/galaxy/commit/6b14dda216d103da518a906f4eda0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/grid/grid-view.js M static/maps/layout/page.js.map M static/maps/mvc/grid/grid-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/layout/page.js M static/scripts/mvc/grid/grid-view.js Log Message: ----------- Grids do a late initialization and the title isn't available until this happens (after display()), so provide a way to allow views to set title late if necessary. Commit: 59d0e297f7217faed3d7c6d30e88678f1eaef600 https://github.com/galaxyproject/galaxy/commit/59d0e297f7217faed3d7c6d30e886... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- When title isn't set, revert to the default -- otherwise display()'d contents without titles show up with the previous and incorrect titles. Commit: 2c40efb6c236220ccaffd7893fafa1b8969f1ad2 https://github.com/galaxyproject/galaxy/commit/2c40efb6c236220ccaffd7893fafa... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/utils/utils.js M static/maps/layout/page.js.map M static/maps/mvc/grid/grid-view.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/layout/page.js M static/scripts/mvc/grid/grid-view.js M static/scripts/utils/utils.js Log Message: ----------- Minor refactor, use a single Utils.setWindowTitle() method. Commit: a5dbf29e13e1d558ac1c6798e7952963b0599e6e https://github.com/galaxyproject/galaxy/commit/a5dbf29e13e1d558ac1c6798e7952... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Use standard naming for Utils import. Commit: ecb4e06799fb61c4577e1a52276359149670cdf7 https://github.com/galaxyproject/galaxy/commit/ecb4e06799fb61c4577e1a5227635... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/utils/utils.js M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/utils/utils.js Log Message: ----------- We apparently always use '|' in the title, even though masthead uses '/'. It does look better. Commit: ae1c68c7dbb9214def95e97a2f6714c68e23927b https://github.com/galaxyproject/galaxy/commit/ae1c68c7dbb9214def95e97a2f671... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M static/scripts/bundled/admin.bundled.js M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Set title on base admin page. Commit: ff5b430319196a61e2a593b04a4bc60859062e3c https://github.com/galaxyproject/galaxy/commit/ff5b430319196a61e2a593b04a4bc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Workflow editor title fix (not new-style, to keep it simple and use the approach consistent with the .mako layout used. Commit: c71d3035ab7bbcdfb682a39e4e9e3cb49417289d https://github.com/galaxyproject/galaxy/commit/c71d3035ab7bbcdfb682a39e4e9e3... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-09-11 (Mon, 11 Sep 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/style/less/library.less 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 static/maps/mvc/library/library-folderlist-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-folderlist-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js M static/style/blue/base.css M static/style/blue/library.css M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.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 Log Message: ----------- Merge remote-tracking branch 'upstream/dev' into titles_in_views Commit: 2e160935d9ceb3ca8441e3b51107594b9539573d https://github.com/galaxyproject/galaxy/commit/2e160935d9ceb3ca8441e3b511075... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-09-12 (Tue, 12 Sep 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/layout/page.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/tours.js M client/galaxy/scripts/mvc/user/user-preferences.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/scripts/utils/utils.js M static/maps/layout/page.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/tours.js.map M static/maps/mvc/user/user-preferences.js.map M static/maps/mvc/workflow/workflow.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/bundled/login.bundled.js.map M static/scripts/layout/page.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/tours.js M static/scripts/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow.js M static/scripts/utils/utils.js M templates/webapps/galaxy/workflow/editor.mako Log Message: ----------- Merge pull request #4578 from dannon/titles_in_views Delegate displaying of page titles to Layout.display() Compare: https://github.com/galaxyproject/galaxy/compare/36a3a6b3d9c0...2e160935d9ce