Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3164fc88d0861f5ea1853803741cdc008e4f9459 https://github.com/galaxyproject/galaxy/commit/3164fc88d0861f5ea1853803741cd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M lib/galaxy/web/base/controller.py M lib/galaxy/web/framework/base.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/root.py Log Message: ----------- Allow app specific client side routing Commit: e5e390d829e373301ab169a4ecb1a01c4fb6548d https://github.com/galaxyproject/galaxy/commit/e5e390d829e373301ab169a4ecb1a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/webapps/galaxy/buildapp.py 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 M static/scripts/bundled/login.bundled.js.map Log Message: ----------- Create admin specific client router Commit: 0679534a1ff6ade2e3c9341f5a6e95fb59509248 https://github.com/galaxyproject/galaxy/commit/0679534a1ff6ade2e3c9341f5a6e9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 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/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 Log Message: ----------- Load grid client Commit: 2671f2ae01a53d67c9f38f0cc77c12926b78055b https://github.com/galaxyproject/galaxy/commit/2671f2ae01a53d67c9f38f0cc77c1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M client/galaxy/scripts/apps/admin.js A client/galaxy/scripts/layout/router.js A static/maps/layout/router.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 M static/scripts/bundled/login.bundled.js.map A static/scripts/layout/router.js Log Message: ----------- Add shared base router Commit: f74947b816843da19a80060e78996c1e53a9de83 https://github.com/galaxyproject/galaxy/commit/f74947b816843da19a80060e78996... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/page.js M static/maps/layout/page.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/page.js Log Message: ----------- Used shared base router for admin and analysis app Repack scripts Commit: 770deb58f08bfe2c5c7e885bffe5dd73da12fa8c https://github.com/galaxyproject/galaxy/commit/770deb58f08bfe2c5c7e885bffe5d... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/buildapp.py 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: ----------- Use transformed user grid list endpoint Commit: c95ea0956f632d3c874b5c5035ec12fa66c89af0 https://github.com/galaxyproject/galaxy/commit/c95ea0956f632d3c874b5c5035ec1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py 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: ----------- Move user list endpoint to admin controller Commit: dba9c5cbf3aeacd65f41e2e7a6e5be55f9787379 https://github.com/galaxyproject/galaxy/commit/dba9c5cbf3aeacd65f41e2e7a6e5b... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix base operations Commit: 8dd816d6db39bb6da9b7f82339df001af6610ef3 https://github.com/galaxyproject/galaxy/commit/8dd816d6db39bb6da9b7f82339df0... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/history.py Log Message: ----------- Remove out commented legacy operation Commit: 95cf5f7e07c1af2cdb3d08a99af22261291807e8 https://github.com/galaxyproject/galaxy/commit/95cf5f7e07c1af2cdb3d08a99af22... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Reset passwords individually Commit: 9b7a7a2398b185217cc06b526083c7512019074d https://github.com/galaxyproject/galaxy/commit/9b7a7a2398b185217cc06b526083c... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-19 (Wed, 19 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unused roles operation Commit: 7f4d199256628fa6f8c4b24c051670d819781206 https://github.com/galaxyproject/galaxy/commit/7f4d199256628fa6f8c4b24c05167... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Separate toolshed and galaxy, index and center endpoints Commit: 0a7202d68014ceadb408e47b455dfe7e6a348f86 https://github.com/galaxyproject/galaxy/commit/0a7202d68014ceadb408e47b455df... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Restore mako based users endpoint for toolshed Commit: c075eae1d5b8425d62c3a4ea47a52c0f44ef4d6a https://github.com/galaxyproject/galaxy/commit/c075eae1d5b8425d62c3a4ea47a52... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Move tool version and role grid Commit: dca5e70c02cbbc3e443fab13586ced4296baea3c https://github.com/galaxyproject/galaxy/commit/dca5e70c02cbbc3e443fab13586ce... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Replicate legacy admin handler in toolshed before modification Commit: ce2938b6204685862c26fd8a3bc61cb6c4664d37 https://github.com/galaxyproject/galaxy/commit/ce2938b6204685862c26fd8a3bc61... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Remove functions not used in toolshed admin, package and reload tools Commit: b504095183be4d3b0b3abea792fc45d12c79de46 https://github.com/galaxyproject/galaxy/commit/b504095183be4d3b0b3abea792fc4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/admin.py Log Message: ----------- Combine both toolshed controllers into one Commit: e967a3321b7209cd10c0079e109bd4c7ed2508a4 https://github.com/galaxyproject/galaxy/commit/e967a3321b7209cd10c0079e109bd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-24 (Mon, 24 Jul 2017) Changed paths: R lib/galaxy/web/base/controllers/__init__.py R lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/api/quotas.py M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/galaxy/webapps/tool_shed/controllers/admin.py A lib/tool_shed/util/admin_util.py Log Message: ----------- Merge branch 'separate_admin_controllers' into revise_page Commit: b6379a9ede442c0e76d50bcea51c91cc8ec22b53 https://github.com/galaxyproject/galaxy/commit/b6379a9ede442c0e76d50bcea51c9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-24 (Mon, 24 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove legacy user controller endpoint Commit: 3decf1bed960e9daee09adffa993ab4fb46f6d09 https://github.com/galaxyproject/galaxy/commit/3decf1bed960e9daee09adffa993a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-24 (Mon, 24 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Restore multiple password option Commit: b9beb4723b16e270b16597e89039a3880041dc38 https://github.com/galaxyproject/galaxy/commit/b9beb4723b16e270b16597e89039a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-24 (Mon, 24 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Move user identification to shared method Commit: 50948f23695fd1cc9e95c2f95296103212ff3ae1 https://github.com/galaxyproject/galaxy/commit/50948f23695fd1cc9e95c2f952961... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-25 (Tue, 25 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Align admin user grid operations and messages Commit: f33c06dd8d8328dd1abdf846d9ba11037c1fb8ec https://github.com/galaxyproject/galaxy/commit/f33c06dd8d8328dd1abdf846d9ba1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-25 (Tue, 25 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Fix message and user information link Commit: 3829d3dea5b9128b5f7b4e1b5b4d4c6cff10f40a https://github.com/galaxyproject/galaxy/commit/3829d3dea5b9128b5f7b4e1b5b4d4... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-25 (Tue, 25 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-view.js M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/webapps/galaxy/controllers/admin.py 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: ----------- Add support for redirecting multiple select operations to the client instead of redirecting through controller Commit: 415939709448ffe9fdec44e749f022eaea9ddcec https://github.com/galaxyproject/galaxy/commit/415939709448ffe9fdec44e749f02... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-26 (Wed, 26 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Keep error messages on form page, remove duplicate center function Commit: 17eff91b2335428d8a5a4b2c86545acae2a96498 https://github.com/galaxyproject/galaxy/commit/17eff91b2335428d8a5a4b2c86545... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-26 (Wed, 26 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py M lib/tool_shed/util/admin_util.py Log Message: ----------- Fix toolshed center endpoint Commit: 149de8b44f621aac8274770f813e2b471e025ed5 https://github.com/galaxyproject/galaxy/commit/149de8b44f621aac8274770f813e2... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-26 (Wed, 26 Jul 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: ----------- Fix request submission Commit: a8720aaf8cecb3182c676a74ef16107e8ecbd047 https://github.com/galaxyproject/galaxy/commit/a8720aaf8cecb3182c676a74ef161... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-26 (Wed, 26 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Make disk size calculation operation async Commit: f449f7e4b7309b7b230187fcf0fdd374c76cb72c https://github.com/galaxyproject/galaxy/commit/f449f7e4b7309b7b230187fcf0fdd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-26 (Wed, 26 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unused dependency Commit: fa9ac881e0b600b73912bf29eac06e3a3dabb609 https://github.com/galaxyproject/galaxy/commit/fa9ac881e0b600b73912bf29eac06... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove duplicate callers Commit: d46adeff19d9b36326f70ed15a647676d7d812fe https://github.com/galaxyproject/galaxy/commit/d46adeff19d9b36326f70ed15a647... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M lib/galaxy/web/framework/helpers/grids.py Log Message: ----------- Fix href parsing for multiselect operation with redirect Commit: ba0cb1d6058acc4347f751979c950795cb4e1c3b https://github.com/galaxyproject/galaxy/commit/ba0cb1d6058acc4347f751979c950... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-28 (Fri, 28 Jul 2017) Changed paths: M client/galaxy/scripts/layout/page.js M static/maps/layout/page.js.map M static/scripts/bundled/admin.bundled.js.map 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 Log Message: ----------- Only initialize router if passed Commit: 876b1ca9040b0d1fa586654d5443331f45e3d845 https://github.com/galaxyproject/galaxy/commit/876b1ca9040b0d1fa586654d54433... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M templates/admin/user/user.mako Log Message: ----------- Add masthead header to manage user page Commit: 38125518aff32b6589ea52396f9340ab5db94c32 https://github.com/galaxyproject/galaxy/commit/38125518aff32b6589ea52396f934... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M lib/tool_shed/util/admin_util.py Log Message: ----------- Fix user grid controller for toolshed Commit: 308a4adaf5f4034943a7cf4cb2f245f5763b7c0b https://github.com/galaxyproject/galaxy/commit/308a4adaf5f4034943a7cf4cb2f24... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M templates/admin/user/user.mako Log Message: ----------- Fix js insertion in user roles mako Commit: 9fdfb41852db80eaaafde4e69e0f3d25b6bb1fbd https://github.com/galaxyproject/galaxy/commit/9fdfb41852db80eaaafde4e69e0f3... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M templates/admin/user/reset_password.mako Log Message: ----------- Add panels to reset_password mako Commit: 13e09b58550b7e805240e618f98991bb3bebe053 https://github.com/galaxyproject/galaxy/commit/13e09b58550b7e805240e618f9899... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M templates/admin/user/reset_password.mako M templates/admin/user/user.mako Log Message: ----------- Add messages to form makos Commit: b44e780867999464a1c1cb6675bb622c50848347 https://github.com/galaxyproject/galaxy/commit/b44e780867999464a1c1cb6675bb6... Author: guerler <aysam.guerler@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M templates/admin/user/reset_password.mako M templates/admin/user/user.mako Log Message: ----------- Enable overflow for form makos Commit: 41a2904128db4f642834754931305791a38db0c3 https://github.com/galaxyproject/galaxy/commit/41a2904128db4f642834754931305... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js A client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/nls/fr/locale.js M config/tool_shed.ini.sample M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/cli.py M lib/galaxy/model/mapping.py M lib/galaxy/model/metadata.py M lib/galaxy/security/__init__.py M lib/galaxy/webapps/galaxy/api/quotas.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/workflow/modules.py A static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/fr/locale.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 M static/scripts/bundled/login.bundled.js.map A static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/nls/fr/locale.js R templates/webapps/galaxy/dataset/edit_attributes.mako Log Message: ----------- Merge branch 'dev' into revise_page Commit: b3e095d66c499a31f3b0a9b0e25690e70f653bec https://github.com/galaxyproject/galaxy/commit/b3e095d66c499a31f3b0a9b0e2569... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/galaxy.js M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/controllers/root.py M static/maps/galaxy.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/galaxy.js Log Message: ----------- Parse url parameters for all client apps Commit: 1f27ad541d7d3dd542152d70ca2d0e207904286b https://github.com/galaxyproject/galaxy/commit/1f27ad541d7d3dd542152d70ca2d0... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/mvc/grid/grid-view.js M lib/galaxy/webapps/galaxy/controllers/admin.py 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: ----------- Fix url parameter forwarding to grid view Commit: 068ff8c55d1b7b0c8c22fe2beebd583fa52c4634 https://github.com/galaxyproject/galaxy/commit/068ff8c55d1b7b0c8c22fe2beebd5... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.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: ----------- Use router to load grid, avoids page refresh Commit: e952a45af9271ce72f676a9df2f799fd5d910031 https://github.com/galaxyproject/galaxy/commit/e952a45af9271ce72f676a9df2f79... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-01 (Tue, 01 Aug 2017) Changed paths: M client/galaxy/scripts/layout/router.js M static/maps/layout/router.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/layout/router.js Log Message: ----------- Reset url parameters when pushing new states Commit: f800b38dbd6957b4b2d21342c5a53aaef72fa23b https://github.com/galaxyproject/galaxy/commit/f800b38dbd6957b4b2d21342c5a53... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/user/user-preferences.js R client/galaxy/scripts/mvc/workflow/workflow-configure-menu.js M client/galaxy/scripts/mvc/workflow/workflow.js M client/galaxy/style/less/base.less M config/plugins/webhooks/demo/search/static/script.js M lib/galaxy/tools/deps/conda_util.py M lib/galaxy/webapps/galaxy/api/workflows.py M lib/galaxy/webapps/galaxy/buildapp.py 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/mvc/user/user-preferences.js M static/scripts/mvc/workflow/workflow.js M static/style/blue/base.css Log Message: ----------- Merge branch 'dev' into revise_page Commit: 11244ac2ee3d6c3acae5c44ac1e74d3f61da2767 https://github.com/galaxyproject/galaxy/commit/11244ac2ee3d6c3acae5c44ac1e74... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-02 (Wed, 02 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/grid/grid-template.js M static/maps/mvc/grid/grid-template.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 M static/scripts/bundled/login.bundled.js.map M static/scripts/mvc/grid/grid-template.js Log Message: ----------- Escape grid messages Commit: 2626eec1ab893371ea9e2d9ea723bbd1edf9c86a https://github.com/galaxyproject/galaxy/commit/2626eec1ab893371ea9e2d9ea723b... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-03 (Thu, 03 Aug 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: ----------- Use regular anchors for masthead routes Commit: 88b8016b4638e1da23826b9241df1da617ea6245 https://github.com/galaxyproject/galaxy/commit/88b8016b4638e1da23826b9241df1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-03 (Thu, 03 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/workflow/workflow-forms.js M client/galaxy/scripts/mvc/workflow/workflow-view.js M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/binary.py M lib/galaxy/datatypes/proteomics.py M lib/galaxy/jobs/actions/post.py M lib/galaxy/managers/tags.py M static/maps/mvc/workflow/workflow-forms.js.map M static/maps/mvc/workflow/workflow-view.js.map M static/scripts/mvc/workflow/workflow-forms.js M static/scripts/mvc/workflow/workflow-view.js Log Message: ----------- Merge branch 'dev' into revise_page Commit: 8f056c2bbc78040c790255c874b6c321c4ba5b97 https://github.com/galaxyproject/galaxy/commit/8f056c2bbc78040c790255c874b6c... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 Aug 2017) Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/mvc/user/user-preferences.js M config/datatypes_conf.xml.sample A config/user_preferences_extra_conf.yml.sample M doc/source/admin/special_topics/grt.rst M lib/galaxy/config.py M lib/galaxy/dataset_collections/matching.py M lib/galaxy/datatypes/interval.py M lib/galaxy/datatypes/molecules.py M lib/galaxy/datatypes/mothur.py M lib/galaxy/datatypes/sequence.py M lib/galaxy/datatypes/sniff.py M lib/galaxy/datatypes/tabular.py M lib/galaxy/datatypes/text.py M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/command_factory.py M lib/galaxy/jobs/rule_helper.py M lib/galaxy/jobs/runners/util/cli/__init__.py M lib/galaxy/jobs/runners/util/cli/shell/local.py M lib/galaxy/jobs/runners/util/cli/shell/rsh.py M lib/galaxy/managers/workflows.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/s3_multipart_upload.py M lib/galaxy/tools/__init__.py M lib/galaxy/tools/execute.py M lib/galaxy/tools/parser/interface.py M lib/galaxy/tools/parser/output_objects.py M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/parser/yaml.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/xsd/galaxy.xsd M lib/galaxy/web/base/controller.py M lib/galaxy/web/base/interactive_environments.py M lib/galaxy/web/base/pluginframework.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/api/users.py M lib/galaxy/webapps/galaxy/controllers/async.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/workflow/extract.py M lib/tool_shed/metadata/metadata_generator.py M lib/tool_shed/util/workflow_util.py M lib/tool_shed/utility_containers/utility_container_manager.py R scripts/grt.py R scripts/grt.yml.sample A scripts/grt/export.py A scripts/grt/grt.yml.sample A scripts/grt/upload.py M static/maps/galaxy.js.map 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/galaxy.js M static/scripts/layout/menu.js M static/scripts/mvc/user/user-preferences.js M templates/galaxy_client_app.mako M templates/user/login.mako M templates/user/register.mako M templates/webapps/galaxy/history/display_structured.mako M templates/webapps/galaxy/workflow/build_from_current_history.mako M templates/webapps/tool_shed/repository/common.mako M test/api/test_tools.py A test/functional/tools/identifier_source.xml M test/functional/tools/samples_tool_conf.xml M test/shed_functional/base/twilltestcase.py A test/unit/test_remote_shell.py M test/unit/tools/test_parsing.py M test/unit/tools/test_toolbox.py M test/unit/tools_support.py M tox.ini Log Message: ----------- Merge branch 'dev' into revise_page Commit: cfa3220d9f2d257b94795b6f63592459d3011f30 https://github.com/galaxyproject/galaxy/commit/cfa3220d9f2d257b94795b6f63592... Author: guerler <aysam.guerler@gmail.com> Date: 2017-08-09 (Wed, 09 Aug 2017) Changed paths: M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js M lib/galaxy/managers/tags.py M lib/galaxy/model/__init__.py M lib/galaxy/model/mapping.py A lib/galaxy/model/migrate/versions/0135_add_library_tags.py M lib/galaxy/tools/actions/upload_common.py M lib/galaxy/tools/parameters/grouping.py M lib/galaxy/web/base/controller.py M lib/galaxy/webapps/galaxy/api/lda_datasets.py M lib/galaxy/webapps/galaxy/api/library_contents.py M lib/galaxy/webapps/galaxy/controllers/library_common.py M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-foldertoolbar-view.js.map M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-foldertoolbar-view.js Log Message: ----------- Merge branch 'dev' into revise_page Commit: 5e43fcef3c94e9b3f6d700fc5258067d0547e30d https://github.com/galaxyproject/galaxy/commit/5e43fcef3c94e9b3f6d700fc52580... Author: John Chilton <jmchilton@gmail.com> Date: 2017-08-10 (Thu, 10 Aug 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/scripts/galaxy.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/page.js A client/galaxy/scripts/layout/router.js M client/galaxy/scripts/mvc/grid/grid-template.js M client/galaxy/scripts/mvc/grid/grid-view.js M lib/galaxy/web/base/controller.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/history.py M lib/galaxy/webapps/galaxy/controllers/root.py M static/maps/galaxy.js.map M static/maps/layout/menu.js.map M static/maps/layout/page.js.map A static/maps/layout/router.js.map M static/maps/mvc/grid/grid-template.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/bundled/login.bundled.js M static/scripts/bundled/login.bundled.js.map M static/scripts/galaxy.js M static/scripts/layout/menu.js M static/scripts/layout/page.js A static/scripts/layout/router.js M static/scripts/mvc/grid/grid-template.js M static/scripts/mvc/grid/grid-view.js M templates/admin/user/reset_password.mako M templates/admin/user/user.mako Log Message: ----------- Merge pull request #4341 from guerler/revise_page Admin user grid conversion Compare: https://github.com/galaxyproject/galaxy/compare/429771820200...5e43fcef3c94