[galaxyproject/galaxy] 2c4977: Separate condensed user preference form into three...
Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2c49779d81b8eb2eae1e9f4dd74de7e01647f675 https://github.com/galaxyproject/galaxy/commit/2c49779d81b8eb2eae1e9f4dd74de... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/webapps/galaxy/buildapp.py 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Separate condensed user preference form into three components, improve route handling Commit: 84f9d3c5c9dc27af1d121e9b84504109d9291ff0 https://github.com/galaxyproject/galaxy/commit/84f9d3c5c9dc27af1d121e9b84504... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-preferences.js 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Fix basic routing between main preference panel and individual user forms Commit: 3c31cbd21ed222060c31400eb0e0d0ea90b33ec0 https://github.com/galaxyproject/galaxy/commit/3c31cbd21ed222060c31400eb0e0d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-preferences.js 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Fix error message Commit: 88b4b7a7182fb48904d587b7a049e099169c7ccf https://github.com/galaxyproject/galaxy/commit/88b4b7a7182fb48904d587b7a049e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-preferences.js 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Properly handle openid redirect and sign out feature Commit: ceb11577bde43e6ee61ee1c89e6c002037039510 https://github.com/galaxyproject/galaxy/commit/ceb11577bde43e6ee61ee1c89e6c0... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/user/user-preferences.js 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Place row template into separate function Commit: 365c56f77f6b57c8930641864924ec9a67fdf174 https://github.com/galaxyproject/galaxy/commit/365c56f77f6b57c8930641864924e... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-23 (Thu, 23 Feb 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/web/base/controllers/admin.py 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Redirect admin user manager route to js-based preference forms Commit: efa856dbb91766dbf80c447c241dd37e1a5401ca https://github.com/galaxyproject/galaxy/commit/efa856dbb91766dbf80c447c241dd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M templates/grid_base.mako Log Message: ----------- Attempt to fix grid routing options Commit: 8a8603be7f697c065382d61fb0539552d15d1f3f https://github.com/galaxyproject/galaxy/commit/8a8603be7f697c065382d61fb0539... Author: guerler <aysam.guerler@gmail.com> Date: 2017-02-24 (Fri, 24 Feb 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M templates/grid_base.mako Log Message: ----------- Enhance grid target handling for links Commit: cc6fa6a4c8607c0c2f33b2271a963da54756334f https://github.com/galaxyproject/galaxy/commit/cc6fa6a4c8607c0c2f33b2271a963... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M .ci/flake8_blacklist.txt M client/galaxy/scripts/mvc/grid/grid-view.js M config/datatypes_conf.xml.sample M config/plugins/interactive_environments/jupyter/config/allowed_images.yml.sample M doc/source/releases/17.01_announce.rst M lib/galaxy/auth/providers/ldap_ad.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/jobs/__init__.py M lib/galaxy/model/orm/engine_factory.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/search/__init__.py M lib/galaxy/visualization/plugins/plugin.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/user.py M scripts/bootstrap_history.py M static/maps/mvc/grid/grid-view.js.map M static/scripts/mvc/grid/grid-view.js M templates/grid_base.mako A templates/webapps/galaxy/user/manage_info.mako M tools/data_source/upload.py Log Message: ----------- Merge branch 'dev' into ui_pref_routing Commit: f0b03a59b51bd02a07b591900147d0e9a79053f7 https://github.com/galaxyproject/galaxy/commit/f0b03a59b51bd02a07b591900147d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/user.py R templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- Strip old user manager mako Commit: c281dd87ed83934ffe2654130d8c709892796142 https://github.com/galaxyproject/galaxy/commit/c281dd87ed83934ffe2654130d8c7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-01 (Wed, 01 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/form/form-input.js M client/galaxy/scripts/mvc/form/form-section.js M client/galaxy/scripts/mvc/tool/tool-form-composite.js R client/galaxy/scripts/mvc/tool/tool-form-workflow.js A client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M lib/galaxy/managers/workflows.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/workflow/modules.py M static/maps/mvc/form/form-input.js.map M static/maps/mvc/form/form-section.js.map M static/maps/mvc/tool/tool-form-composite.js.map R static/maps/mvc/tool/tool-form-workflow.js.map A static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-view.js.map R 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.map M static/scripts/mvc/form/form-input.js M static/scripts/mvc/form/form-section.js M static/scripts/mvc/tool/tool-form-composite.js R static/scripts/mvc/tool/tool-form-workflow.js A static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-view.js M test/unit/workflows/test_modules.py Log Message: ----------- Merge branch 'dev' into ui_pref_routing Commit: fa1f81cbcf5ac4c026bb624ee003f56405ef358e https://github.com/galaxyproject/galaxy/commit/fa1f81cbcf5ac4c026bb624ee003f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/webapps/galaxy/buildapp.py 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.map M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Users -> user in menu/interface usage. Commit: 42c090cb20e82bee50b8931aeeedca4e735f766b https://github.com/galaxyproject/galaxy/commit/42c090cb20e82bee50b8931aeeedc... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-02 (Thu, 02 Mar 2017) Changed paths: M client/galaxy/scripts/layout/menu.js M static/maps/layout/menu.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/layout/menu.js Log Message: ----------- Update users->user in the menu as well Commit: 2ee81a3faaef38547295f9a47f9f063423b40394 https://github.com/galaxyproject/galaxy/commit/2ee81a3faaef38547295f9a47f9f0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Client route priority is *last* Commit: b00dfc8a7b7bc739a84c5a229c161a917601d68a https://github.com/galaxyproject/galaxy/commit/b00dfc8a7b7bc739a84c5a229c161... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py Log Message: ----------- Remove extra empty line. Commit: 0fb9fbc3885eb11b7e49f97f6a129f9c0343e780 https://github.com/galaxyproject/galaxy/commit/0fb9fbc3885eb11b7e49f97f6a129... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-03-03 (Fri, 03 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/webapps/galaxy/buildapp.py M static/maps/layout/menu.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/layout/menu.js M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Merge pull request #18 from dannon/ui_pref_routing User->Users Commit: 6e32b0f7c119ca6c3d54a761e64f49fe6a7f8280 https://github.com/galaxyproject/galaxy/commit/6e32b0f7c119ca6c3d54a761e64f4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/tool/tools.js M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/tool/tools.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/dataset/dataset-li-edit.js M static/scripts/mvc/tool/tools.js Log Message: ----------- Use routing helper to navigate to tool form Commit: 5df0187d42d19c5a930bf067a52a2ef4cf9d3ec8 https://github.com/galaxyproject/galaxy/commit/5df0187d42d19c5a930bf067a52a2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M client/galaxy/scripts/mvc/history/hda-li.js M client/galaxy/scripts/mvc/ui/ui-select-content.js M client/galaxy/scripts/mvc/ui/ui-select-default.js M client/galaxy/scripts/mvc/upload/upload-ftp.js M client/galaxy/scripts/onload.js M client/galaxy/style/less/history.less M client/galaxy/style/less/ui.less M config/datatypes_conf.xml.sample M config/galaxy.ini.sample M config/plugins/interactive_environments/bam_iobio/config/bam_iobio.ini.sample M config/plugins/interactive_environments/jupyter/config/jupyter.ini.sample M config/plugins/interactive_environments/neo/config/neo.ini.sample M config/plugins/interactive_environments/phinch/config/phinch.ini.sample M config/plugins/interactive_environments/rstudio/config/rstudio.ini.sample A config/plugins/webhooks/demo/search/config/searchover.yaml A config/plugins/webhooks/demo/search/static/script.js A config/plugins/webhooks/demo/search/static/styles.css A cron/clean_docker_swarm_mode_services.sh M doc/source/admin/interactive_environments.rst M lib/galaxy/config.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/text.py M lib/galaxy/managers/hdas.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/queue_worker.py M lib/galaxy/tools/actions/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/parameters/basic.py M lib/galaxy/util/json.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/workflow/steps.py M run_tests.sh A static/maps/analysis.js.map A static/maps/app.js.map A static/maps/app/analysis.js.map M static/maps/mvc/history/hda-li.js.map M static/maps/mvc/ui/ui-select-content.js.map M static/maps/mvc/ui/ui-select-default.js.map M static/maps/mvc/upload/upload-ftp.js.map M static/maps/onload.js.map A static/scripts/analysis.js A static/scripts/app.js A static/scripts/app/analysis.js 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/history/hda-li.js M static/scripts/mvc/ui/ui-select-content.js M static/scripts/mvc/ui/ui-select-default.js M static/scripts/mvc/upload/upload-ftp.js M static/scripts/onload.js M static/style/blue/base.css M templates/webapps/galaxy/admin/index.mako A templates/webapps/galaxy/admin/manage_dependencies.mako M templates/webapps/tool_shed/repository/common.mako M test/TESTING.md M test/api/test_workflows.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation-data.yml A test/selenium_tests/test_collection_builders.py M test/unit/tools/test_data_parameters.py Log Message: ----------- Merge branch 'dev' into ui_pref_routing Commit: 9f498f9c4be7d1ba6cfba38a2cc8993f732c013b https://github.com/galaxyproject/galaxy/commit/9f498f9c4be7d1ba6cfba38a2cc89... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Avoid reusing 'map' builtin Commit: 3ef22d2e6728bf890f14ef6465e88f757bd88b94 https://github.com/galaxyproject/galaxy/commit/3ef22d2e6728bf890f14ef6465e88... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Slightly more accurate check to verify we have a controller match Commit: 675c375cad69affacda74521d7e88f5227160cb6 https://github.com/galaxyproject/galaxy/commit/675c375cad69affacda74521d7e88... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- A try at two layer routing with failthrough to clientside routes. Commit: 036d35ac643ace26f1bad289d1989d3db8971ff2 https://github.com/galaxyproject/galaxy/commit/036d35ac643ace26f1bad289d1989... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Slight refactoring to reduce duplication in map matching Commit: 66e6be890bedbf59f98b1d10a54146175524df8a https://github.com/galaxyproject/galaxy/commit/66e6be890bedbf59f98b1d10a5414... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-09 (Thu, 09 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- No need to check API routes against clientside mapper, catch specific exception Commit: bf88e891977da140d36ba9a627ffebf19178b290 https://github.com/galaxyproject/galaxy/commit/bf88e891977da140d36ba9a627ffe... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Merge pull request #20 from dannon/ui_pref_routing Ui pref routing Commit: df73622becc820017a1873db00f64fdcbb6de27a https://github.com/galaxyproject/galaxy/commit/df73622becc820017a1873db00f64... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M lib/galaxy/web/base/controllers/admin.py Log Message: ----------- Fix route used in admin controller Commit: 05a689e2adf455f461556fa1aa9229cf4f0454ff https://github.com/galaxyproject/galaxy/commit/05a689e2adf455f461556fa1aa922... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M client/galaxy/scripts/onload.js M config/plugins/webhooks/demo/search/static/script.js M lib/galaxy/model/__init__.py M lib/galaxy/queue_worker.py M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/onload.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/onload.js Log Message: ----------- Merge branch 'dev' into ui_pref_routing Commit: 20916c16a9861cf1f491173cbded2bac0b61f378 https://github.com/galaxyproject/galaxy/commit/20916c16a9861cf1f491173cbded2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/user/user-preferences.js M static/maps/layout/menu.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/layout/menu.js M static/scripts/mvc/user/user-preferences.js Log Message: ----------- Remove back button to simplify routing, avoid failing returns Commit: 7523ff6983bd6511725509ae4f4d744b36223b97 https://github.com/galaxyproject/galaxy/commit/7523ff6983bd6511725509ae4f4d7... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.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 random identifier to request url in order to allow proper reload upon multiple navigation requests Commit: 38336e7e94b15b1580e32e4d0b4321836791db9b https://github.com/galaxyproject/galaxy/commit/38336e7e94b15b1580e32e4d0b432... Author: guerler <aysam.guerler@gmail.com> Date: 2017-03-13 (Mon, 13 Mar 2017) Changed paths: M config/dependency_resolvers_conf.xml.sample M doc/source/admin/dependency_resolvers.rst M lib/galaxy/tools/deps/__init__.py M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/tools/deps/resolvers/__init__.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/views.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/api/tools.py M lib/galaxy/webapps/galaxy/buildapp.py M templates/webapps/galaxy/admin/manage_dependencies.mako M test/integration/test_resolvers.py Log Message: ----------- Merge branch 'dev' into ui_pref_routing Commit: e9c98e46ed580463a4f7a4ed989d11f7714ac13f https://github.com/galaxyproject/galaxy/commit/e9c98e46ed580463a4f7a4ed989d1... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Don't have the clientside mapper register itself Commit: 3b0be252e3485b413d7978a91b14242b589702c5 https://github.com/galaxyproject/galaxy/commit/3b0be252e3485b413d7978a91b142... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Remove old deprecated option (explicit is defined at mapper instantiation, and we wat the default Commit: 93c2286442bbb27e9dd3db708064e6f3deb45287 https://github.com/galaxyproject/galaxy/commit/93c2286442bbb27e9dd3db708064e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Initialize clientside_routes regexes. Commit: 061b7d78f26d4aa1298a3a072fcc420d214d4f7b https://github.com/galaxyproject/galaxy/commit/061b7d78f26d4aa1298a3a072fcc4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Refactor failthrough mapping logic Commit: 550bc423af0cb036d1a870c0c419533f25517bbf https://github.com/galaxyproject/galaxy/commit/550bc423af0cb036d1a870c0c4195... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Rename parameter, make it a bit more clear what this failthrough logic is doing. Commit: 44fd8aa9bbc77680083eb71d30840a41ce1f79ee https://github.com/galaxyproject/galaxy/commit/44fd8aa9bbc77680083eb71d30840... Author: Aysam Guerler <aysam.guerler@gmail.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M lib/galaxy/web/framework/base.py Log Message: ----------- Merge pull request #21 from dannon/ui_pref_routing Don't have the clientside mapper register itself Commit: 0498c7f833fad513e2ca878843938e378475202b https://github.com/galaxyproject/galaxy/commit/0498c7f833fad513e2ca878843938... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-03-15 (Wed, 15 Mar 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/mvc/tool/tools.js M client/galaxy/scripts/mvc/user/user-preferences.js M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/web/framework/base.py M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/user.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py M static/maps/layout/menu.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/grid/grid-template.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/mvc/tool/tools.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/layout/menu.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M static/scripts/mvc/tool/tools.js M static/scripts/mvc/user/user-preferences.js M templates/grid_base.mako R templates/webapps/galaxy/user/manage_info.mako Log Message: ----------- Merge pull request #3446 from guerler/ui_pref_routing Improve routing for user preference views Compare: https://github.com/galaxyproject/galaxy/compare/149bbf87e3d5...0498c7f833fa
participants (1)
-
GitHub