Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: a00f7f65136418a55b0b6cb4aeec9553b186e30c https://github.com/galaxyproject/galaxy/commit/a00f7f65136418a55b0b6cb4aeec9... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: A client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js R client/galaxy/scripts/apps/history-panel.js A client/galaxy/scripts/apps/panels/admin-panel.js A client/galaxy/scripts/apps/panels/history-panel.js A client/galaxy/scripts/apps/panels/tool-panel.js R client/galaxy/scripts/apps/tool-panel.js M client/webpack.config.js M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py 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: ----------- Insert admin app, redirect controller Commit: 6d19f595964403a9f6e65368ff644bafed6fc34c https://github.com/galaxyproject/galaxy/commit/6d19f595964403a9f6e65368ff644... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.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 Log Message: ----------- Prepare model structure for categories Commit: ee676aef4251cca9f7edd9bcd18d059b0857fbbc https://github.com/galaxyproject/galaxy/commit/ee676aef4251cca9f7edd9bcd18d0... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add tool shed related menu items Commit: dcf177f2123b7bcb3996b1b2be0ce18b939afad8 https://github.com/galaxyproject/galaxy/commit/dcf177f2123b7bcb3996b1b2be0ce... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add all admin panel links Commit: d131e1bd6cab451e97cf754c19eb1a19825a6dd8 https://github.com/galaxyproject/galaxy/commit/d131e1bd6cab451e97cf754c19eb1... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Convert definitions into collection Commit: b92099611c2199d55b6397a27f1bd93db975b02f https://github.com/galaxyproject/galaxy/commit/b92099611c2199d55b6397a27f1bd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Remove debug statement Commit: 25eb8850971520b367a272166521a6fa56e7b44c https://github.com/galaxyproject/galaxy/commit/25eb8850971520b367a272166521a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/managers/configuration.py M lib/galaxy/webapps/galaxy/controllers/admin.py M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add additional properties Commit: e64c195ffc1b43c79baefcab42b9ae6906c0c804 https://github.com/galaxyproject/galaxy/commit/e64c195ffc1b43c79baefcab42b9a... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Load initial page Commit: 7de2b6b6ed6676b5cbe105e2970512506c89f77a https://github.com/galaxyproject/galaxy/commit/7de2b6b6ed6676b5cbe105e297051... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/webapps/galaxy/controllers/admin.py M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add conditions and additional attributes Commit: 2c3b4993cddea5f3a5d2e78a1e9bd6c4cc796283 https://github.com/galaxyproject/galaxy/commit/2c3b4993cddea5f3a5d2e78a1e9bd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: R templates/webapps/galaxy/admin/index.mako Log Message: ----------- Remove admin index mako Commit: 0423dbc890fdfd67f6182c0ce825f43464e983f7 https://github.com/galaxyproject/galaxy/commit/0423dbc890fdfd67f6182c0ce825f... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: 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: ----------- Pack scripts Commit: f01c20fc7de459f787cc9ef45e8812b18c3d7ff2 https://github.com/galaxyproject/galaxy/commit/f01c20fc7de459f787cc9ef45e881... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/style/less/ui.less 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/style/blue/base.css Log Message: ----------- Fix style Commit: 866ddb4bcce355a36237762a34e68af863e87829 https://github.com/galaxyproject/galaxy/commit/866ddb4bcce355a36237762a34e68... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: 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: ----------- Repack scripts Commit: 8ab70efd00fb531659bad13066c79b599fb368f0 https://github.com/galaxyproject/galaxy/commit/8ab70efd00fb531659bad13066c79... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Fix style Commit: b51da23c10c4673ba729ace4e2fad2afb49aa200 https://github.com/galaxyproject/galaxy/commit/b51da23c10c4673ba729ace4e2fad... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/style/less/ui.less M static/style/blue/base.css Log Message: ----------- Remove unused css attribute Commit: 2399df09cc20033ceb1e25c80ca257e4746f61da https://github.com/galaxyproject/galaxy/commit/2399df09cc20033ceb1e25c80ca25... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/layout/panel.js M static/maps/layout/panel.js.map M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Remove unused parts, comments Commit: fe59e3aeb477a1a441287c49af918abea0aa5791 https://github.com/galaxyproject/galaxy/commit/fe59e3aeb477a1a441287c49af918... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M client/galaxy/style/less/ui.less M static/scripts/bundled/libs.bundled.js.map M static/style/blue/base.css Log Message: ----------- Fix overlapping css tags Commit: d2f9cee31b8e6c9ca729e6e27575285d8a8e7c76 https://github.com/galaxyproject/galaxy/commit/d2f9cee31b8e6c9ca729e6e275752... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/admin.py Log Message: ----------- Remove unused import Commit: b2b84a8e62ecd6365c0f3cfdaa5df013bd5aac59 https://github.com/galaxyproject/galaxy/commit/b2b84a8e62ecd6365c0f3cfdaa5df... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/mvc/tours.js M config/plugins/tours/core.history.yaml M lib/galaxy/managers/datasets.py M static/maps/mvc/tours.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tours.js M templates/show_params.mako Log Message: ----------- Merge branch 'dev' into admin_app Commit: 5ece2f0a53c0721a39d49991dcdcd24f84ca3a61 https://github.com/galaxyproject/galaxy/commit/5ece2f0a53c0721a39d49991dcdcd... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-15 (Mon, 15 May 2017) Changed paths: M client/galaxy/scripts/apps/admin.js Log Message: ----------- Remove spaces Commit: a476db0253d601360b6d6db321c806586f52a507 https://github.com/galaxyproject/galaxy/commit/a476db0253d601360b6d6db321c80... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: M client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/panels/admin-panel.js M lib/galaxy/web/base/controller.py M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add active view attribute, add monitoring ids Commit: 220fff9e9bf6fb88977f0f2d8a08436d264b17ef https://github.com/galaxyproject/galaxy/commit/220fff9e9bf6fb88977f0f2d8a084... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: M client/galaxy/scripts/apps/panels/admin-panel.js M static/scripts/bundled/libs.bundled.js.map Log Message: ----------- Add localization support for admin panel labels Commit: fc69a85100bdfafe3f3106f7941205aaba64c01d https://github.com/galaxyproject/galaxy/commit/fc69a85100bdfafe3f3106f794120... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: M client/galaxy/scripts/nls/locale.js M static/maps/nls/locale.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/nls/locale.js Log Message: ----------- add new translatable strings to the locale file Commit: 6218e99fee2a813376855d12b1d9849c2d280ef8 https://github.com/galaxyproject/galaxy/commit/6218e99fee2a813376855d12b1d98... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-05-16 (Tue, 16 May 2017) Changed paths: A client/galaxy/scripts/apps/admin.js M client/galaxy/scripts/apps/analysis.js R client/galaxy/scripts/apps/history-panel.js A client/galaxy/scripts/apps/panels/admin-panel.js A client/galaxy/scripts/apps/panels/history-panel.js A client/galaxy/scripts/apps/panels/tool-panel.js R client/galaxy/scripts/apps/tool-panel.js M client/galaxy/scripts/layout/panel.js M client/galaxy/scripts/nls/locale.js M client/galaxy/style/less/ui.less M client/webpack.config.js M lib/galaxy/managers/configuration.py M lib/galaxy/web/base/controller.py M lib/galaxy/web/base/controllers/admin.py M lib/galaxy/webapps/galaxy/controllers/admin.py M static/maps/layout/panel.js.map M static/maps/mvc/tours.js.map M static/maps/nls/locale.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/tours.js M static/scripts/nls/locale.js M static/style/blue/base.css R templates/webapps/galaxy/admin/index.mako Log Message: ----------- Merge pull request #4067 from guerler/admin_app Add admin app Compare: https://github.com/galaxyproject/galaxy/compare/3da8eb0d1384...6218e99fee2a