Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: e7f9714a29893177f479270f7017aec3a976d6df https://github.com/galaxyproject/galaxy/commit/e7f9714a29893177f479270f7017a... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-10 (Mon, 10 Jul 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 lib/galaxy/webapps/galaxy/buildapp.py A static/maps/mvc/dataset/dataset-edit-attributes.js.map M static/maps/mvc/dataset/dataset-li-edit.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 A static/scripts/mvc/dataset/dataset-edit-attributes.js M static/scripts/mvc/dataset/dataset-li-edit.js Log Message: ----------- Set up scripts for removing edit attributes mako of Dataset edit action Commit: 6a493ac3001cb0e3345355025ca4a79008ec8d36 https://github.com/galaxyproject/galaxy/commit/6a493ac3001cb0e3345355025ca4a... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-10 (Mon, 10 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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/mvc/dataset/dataset-edit-attributes.js Log Message: ----------- Adding tabs for different sections of edit dataset attributes view Commit: 19ede9b477f8c32d6915152869e73959dc10677c https://github.com/galaxyproject/galaxy/commit/19ede9b477f8c32d6915152869e73... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Updating edit attributes view Commit: 5e59549ddf47d12ed03326a65d5858a9d9ec030c https://github.com/galaxyproject/galaxy/commit/5e59549ddf47d12ed03326a65d585... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Adding messages to the actions Commit: 95032151fa56681148529eba2d27140db80b7c98 https://github.com/galaxyproject/galaxy/commit/95032151fa56681148529eba2d271... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Adding Convert tab to Dataset Edit Attributes page Commit: b3ae53c1e7f8de207aabeb55d96526be07c29752 https://github.com/galaxyproject/galaxy/commit/b3ae53c1e7f8de207aabeb55d9652... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-11 (Tue, 11 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Updating logic for extra fields like comments lines Commit: 7ba4f22b61aa248383d99dc2caf1ec747299539a https://github.com/galaxyproject/galaxy/commit/7ba4f22b61aa248383d99dc2caf1e... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-16 (Sun, 16 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Adding form builder for edit attributes tabs Commit: 3572bad66fd4b1d3899378d5493975c43751c67b https://github.com/galaxyproject/galaxy/commit/3572bad66fd4b1d3899378d549397... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Adding permissions tab Commit: 69934d9f02787a66082a6841e39406198905c936 https://github.com/galaxyproject/galaxy/commit/69934d9f02787a66082a6841e3940... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/galaxy.pages.js M client/galaxy/scripts/layout/menu.js M client/galaxy/scripts/layout/scratchbook.js M client/galaxy/scripts/mvc/dataset/data.js M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M client/galaxy/scripts/mvc/grid/grid-model.js M client/galaxy/scripts/mvc/grid/grid-view.js M client/galaxy/scripts/nls/ja/locale.js M client/galaxy/scripts/nls/locale.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/phyloviz.js M client/galaxy/scripts/viz/trackster.js M client/galaxy/scripts/viz/trackster/tracks.js M client/galaxy/scripts/viz/visualization.js A client/package-lock.json M config/galaxy.ini.sample M config/tool_conf.xml.main M lib/galaxy/dependencies/__init__.py M lib/galaxy/dependencies/conditional-requirements.txt M lib/galaxy/jobs/actions/post.py M lib/galaxy/managers/collections.py M lib/galaxy/managers/tags.py M lib/galaxy/model/__init__.py M lib/galaxy/objectstore/__init__.py A lib/galaxy/objectstore/pithos.py M lib/galaxy/tools/data/__init__.py M lib/galaxy/tools/imp_exp/__init__.py M lib/galaxy/tools/toolbox/base.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/history.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M scripts/runtime_stats.py M static/maps/galaxy.pages.js.map M static/maps/layout/menu.js.map M static/maps/layout/scratchbook.js.map M static/maps/mvc/dataset/data.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/mvc/grid/grid-model.js.map M static/maps/mvc/grid/grid-view.js.map M static/maps/nls/ja/locale.js.map M static/maps/nls/locale.js.map M static/maps/viz/circster.js.map M static/maps/viz/phyloviz.js.map M static/maps/viz/trackster.js.map M static/maps/viz/trackster/tracks.js.map M static/maps/viz/visualization.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.pages.js M static/scripts/layout/menu.js M static/scripts/layout/scratchbook.js M static/scripts/mvc/dataset/data.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/mvc/grid/grid-view.js M static/scripts/nls/ja/locale.js M static/scripts/nls/locale.js M static/scripts/viz/circster.js M static/scripts/viz/phyloviz.js M static/scripts/viz/trackster.js M static/scripts/viz/trackster/tracks.js M static/scripts/viz/visualization.js R templates/webapps/galaxy/history/list_published.mako M templates/webapps/galaxy/page/editor.mako R templates/webapps/galaxy/page/select_items_grid.mako R templates/webapps/galaxy/tracks/add_to_viz.mako R templates/webapps/galaxy/tracks/add_tracks.mako R templates/webapps/galaxy/tracks/history_datasets_select_grid.mako R templates/webapps/galaxy/tracks/history_select_grid.mako R templates/webapps/galaxy/tracks/library_datasets_select_grid.mako Log Message: ----------- Merging with dev Commit: 9604fb3844bcf936bd73581d7adefabd7f99f491 https://github.com/galaxyproject/galaxy/commit/9604fb3844bcf936bd73581d7adef... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M lib/galaxy/security/__init__.py M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Resolve the save permission issue Commit: 44d24c39f7873ea86d21d56c15565f041fbaab20 https://github.com/galaxyproject/galaxy/commit/44d24c39f7873ea86d21d56c15565... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Add form builder for the attributes tab Commit: 212ffc7476551568136391e9bfd2c34d84269731 https://github.com/galaxyproject/galaxy/commit/212ffc7476551568136391e9bfd2c... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/model/metadata.py M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Add metadata fields Commit: 90247d7432ac7942797a574c3e241316d18f5bcf https://github.com/galaxyproject/galaxy/commit/90247d7432ac7942797a574c3e241... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M lib/galaxy/model/metadata.py M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Build inputs in controller Commit: 9853625e905c14fd9b9fd706a0c7a174da9135e0 https://github.com/galaxyproject/galaxy/commit/9853625e905c14fd9b9fd706a0c7a... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-20 (Thu, 20 Jul 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/layout/menu.js A client/galaxy/scripts/mvc/grid/grid-shared.js R client/galaxy/scripts/mvc/page/page-list.js M client/galaxy/scripts/viz/circster.js M client/galaxy/scripts/viz/trackster.js M client/package-lock.json A config/plugins/visualizations/unipept/README.md A config/plugins/visualizations/unipept/config/unipept.xml A config/plugins/visualizations/unipept/static/style.css A config/plugins/visualizations/unipept/static/tooltip.css A config/plugins/visualizations/unipept/static/unipept-visualizations.es5.js A config/plugins/visualizations/unipept/static/unipept-visualizations.es5.js.map A config/plugins/visualizations/unipept/static/unipept_viz.js A config/plugins/visualizations/unipept/templates/glyphicons-86-repeat.png A config/plugins/visualizations/unipept/templates/unipept.mako M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/page.py M lib/galaxy/webapps/galaxy/controllers/visualization.py M static/maps/layout/menu.js.map A static/maps/mvc/grid/grid-shared.js.map R static/maps/mvc/page/page-list.js.map M static/maps/viz/circster.js.map M static/maps/viz/trackster.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 A static/scripts/mvc/grid/grid-shared.js R static/scripts/mvc/page/page-list.js M static/scripts/viz/circster.js M static/scripts/viz/trackster.js M templates/webapps/galaxy/requests/common/common.mako R templates/webapps/galaxy/visualization/list.mako Log Message: ----------- Merge with def Commit: 9c83253c41645ec253e8320604c9b9ae5254412c https://github.com/galaxyproject/galaxy/commit/9c83253c41645ec253e8320604c9b... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-23 (Sun, 23 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Changes for setting values of select box in metadata Commit: ac6ad5aabac9ca34baf8d0ebede25073e2fa7bae https://github.com/galaxyproject/galaxy/commit/ac6ad5aabac9ca34baf8d0ebede25... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-23 (Sun, 23 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Update the help text Commit: a302dee11e4f66244992655c51dbf8affa1a88e8 https://github.com/galaxyproject/galaxy/commit/a302dee11e4f66244992655c51dbf... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-23 (Sun, 23 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Correct the indentations and spacings Commit: f4ffef05ce501f8f40efb4461c678d7a3b1ca01d https://github.com/galaxyproject/galaxy/commit/f4ffef05ce501f8f40efb4461c678... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-23 (Sun, 23 Jul 2017) Changed paths: R templates/webapps/galaxy/dataset/edit_attributes.mako Log Message: ----------- Removing the edit attributes mako file Commit: 315fd58fcac02097efc42dac7e2db68fa6bd6db3 https://github.com/galaxyproject/galaxy/commit/315fd58fcac02097efc42dac7e2db... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-23 (Sun, 23 Jul 2017) Changed paths: M lib/galaxy/webapps/galaxy/controllers/dataset.py Log Message: ----------- Fixing build fail comments Commit: 8fa3b2b97a07c2b9a6c015aec56445c2d049bfd0 https://github.com/galaxyproject/galaxy/commit/8fa3b2b97a07c2b9a6c015aec5644... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-25 (Tue, 25 Jul 2017) Changed paths: M client/galaxy/scripts/apps/analysis.js M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M lib/galaxy/webapps/galaxy/controllers/dataset.py M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Fixing PR review comments Commit: f8e6fcaebc8b7968daba841fd172636bf37e3858 https://github.com/galaxyproject/galaxy/commit/f8e6fcaebc8b7968daba841fd1726... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-30 (Sun, 30 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-edit-attributes.js M static/maps/mvc/dataset/dataset-edit-attributes.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-edit-attributes.js Log Message: ----------- Removing unsued self vars and using just Backbone.Model Commit: 2f5b26e8b6dcb47b5ca69466b6510fa58bea1f7c https://github.com/galaxyproject/galaxy/commit/2f5b26e8b6dcb47b5ca69466b6510... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-30 (Sun, 30 Jul 2017) Changed paths: 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/webapps/tool_shed/buildapp.py M lib/galaxy/workflow/modules.py Log Message: ----------- Merge branch 'dev' of https://github.com/bgruening/galaxy into edit_attributes_mako Commit: 8502a6854a363eca1f8180e25f11f322d4a094f4 https://github.com/galaxyproject/galaxy/commit/8502a6854a363eca1f8180e25f11f... Author: anuprulez <anup.rulez@gmail.com> Date: 2017-07-31 (Mon, 31 Jul 2017) Changed paths: M client/galaxy/scripts/mvc/dataset/dataset-li-edit.js M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/fr/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/mvc/dataset/dataset-li-edit.js M static/scripts/nls/fr/locale.js Log Message: ----------- Updating the dataset id Commit: bd0f804085bf1fa467001554dd8e51ad999aa261 https://github.com/galaxyproject/galaxy/commit/bd0f804085bf1fa467001554dd8e5... Author: Marius van den Beek <m.vandenbeek@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 lib/galaxy/model/metadata.py M lib/galaxy/security/__init__.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/galaxy/controllers/dataset.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 pull request #4334 from bgruening/edit_attributes_mako Replacing Edit Attributes Mako by JavaScript Compare: https://github.com/galaxyproject/galaxy/compare/2659718a6d71...bd0f804085bf