[galaxyproject/galaxy] b79474: Merge pull request #2206 from dannon/master
Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b79474083b08860923f7f28fc1e7442b53f925db https://github.com/galaxyproject/galaxy/commit/b79474083b08860923f7f28fc1e74... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M client/galaxy/scripts/layout/page.js M client/galaxy/scripts/mvc/citation/citation-model.js M client/galaxy/scripts/mvc/history/multi-panel.js M client/galaxy/scripts/mvc/library/library-dataset-view.js M client/galaxy/scripts/mvc/library/library-folder-view.js M client/galaxy/scripts/mvc/library/library-library-view.js M config/tool_shed.ini.sample M lib/galaxy/dependencies/pinned-requirements.txt M lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh M lib/galaxy/jobs/runners/util/job_script/DEFAULT_JOB_FILE_TEMPLATE.sh M lib/galaxy/web/framework/helpers/grids.py M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/config.py M lib/galaxy/webapps/tool_shed/controllers/repository.py M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py M lib/galaxy/workflow/modules.py M lib/tool_shed/util/shed_util_common.py M static/maps/layout/page.js.map M static/maps/mvc/citation/citation-model.js.map M static/maps/mvc/history/multi-panel.js.map M static/maps/mvc/library/library-dataset-view.js.map M static/maps/mvc/library/library-folder-view.js.map M static/maps/mvc/library/library-library-view.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/citation/citation-model.js M static/scripts/mvc/history/multi-panel.js M static/scripts/mvc/library/library-dataset-view.js M static/scripts/mvc/library/library-folder-view.js M static/scripts/mvc/library/library-library-view.js M templates/webapps/galaxy/galaxy.panels.mako M templates/webapps/galaxy/workflow/run.mako M test/tool_shed/base/twilltestcase.py A test/tool_shed/functional/test_0310_hg_api_features.py R test/tool_shed/functional/test_0310_hg_push_from_api.py Log Message: ----------- Merge pull request #2206 from dannon/master Sanity check of master update. Commit: e77d3f009a8e2fb51e97f41b4c47e397c90cbcea https://github.com/galaxyproject/galaxy/commit/e77d3f009a8e2fb51e97f41b4c47e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-03 (Tue, 03 May 2016) Changed paths: M lib/galaxy/web/framework/middleware/remoteuser.py M lib/galaxy/web/framework/webapp.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/workflow/run.py M templates/webapps/galaxy/library/common/browse_library.mako M templates/webapps/galaxy/library/common/ldda_info.mako M test/tool_shed/base/twilltestcase.py Log Message: ----------- Merge branch 'release_16.01' Commit: e08dae34628d31f6685f9f7e031e2085c024f63b https://github.com/galaxyproject/galaxy/commit/e08dae34628d31f6685f9f7e031e2... Author: balto <balto_59@hotmail.fr> Date: 2016-05-09 (Mon, 09 May 2016) Changed paths: A lib/galaxy/webapps/reports/controllers/history.py A templates/webapps/reports/history_and_dataset_per_user.mako A templates/webapps/reports/history_and_dataset_type.mako M templates/webapps/reports/index.mako Log Message: ----------- Creation of the history category that contains two pages: history and dataset per type/user. Commit: cd2b61a3a1426cdd62f9af3fe506affa3c097688 https://github.com/galaxyproject/galaxy/commit/cd2b61a3a1426cdd62f9af3fe506a... Author: balto <balto_59@hotmail.fr> Date: 2016-05-09 (Mon, 09 May 2016) Changed paths: A lib/galaxy/webapps/reports/controllers/tools.py Log Message: ----------- Creation of the tools controller and each methods for each template. Commit: e4d8c7d88556a201a91ac21b67d08feecd57f819 https://github.com/galaxyproject/galaxy/commit/e4d8c7d88556a201a91ac21b67d08... Author: balto <balto_59@hotmail.fr> Date: 2016-05-10 (Tue, 10 May 2016) Changed paths: M templates/webapps/reports/index.mako A templates/webapps/reports/tool_error_messages.mako A templates/webapps/reports/tool_execution_time.mako A templates/webapps/reports/tool_execution_time_peer_month.mako A templates/webapps/reports/tools_and_job_state.mako A templates/webapps/reports/tools_and_job_state_peer_month.mako Log Message: ----------- Implementation of tools-related pages. Commit: fdd778f244b6f647aa8c56e133c3226bbed8ed72 https://github.com/galaxyproject/galaxy/commit/fdd778f244b6f647aa8c56e133c32... Author: balto <balto_59@hotmail.fr> Date: 2016-05-10 (Tue, 10 May 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/users.py A templates/webapps/reports/history_per_user.mako M templates/webapps/reports/index.mako Log Message: ----------- Implementation of a new page listing histories per users. Commit: 71fc940c8f048d3c3b4e929320bd895c2361e342 https://github.com/galaxyproject/galaxy/commit/71fc940c8f048d3c3b4e929320bd8... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-10 (Tue, 10 May 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/history.py Log Message: ----------- Gets reports/controllers/history.py up to passing style. Commit: a66800465614042b75c0f30217b0c1d9075aaed1 https://github.com/galaxyproject/galaxy/commit/a66800465614042b75c0f30217b0c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-05-10 (Tue, 10 May 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/history.py Log Message: ----------- Slight bit of extra import cleanup in reports/controllers/history Commit: 5c47820e01576854a111b54f220993415258ffc8 https://github.com/galaxyproject/galaxy/commit/5c47820e01576854a111b54f22099... Author: BalthazarPavot <balthazar.pavot@hotmail.fr> Date: 2016-07-07 (Thu, 07 Jul 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/history.py Log Message: ----------- Merge pull request #1 from dannon/dev_reports This brings the history file up to style guidelines and will fix the build. Commit: 3107cfed9d502ea9baf0cab14a19cbf3c8bdec61 https://github.com/galaxyproject/galaxy/commit/3107cfed9d502ea9baf0cab14a19c... Author: BalthazarPavot <balthazar.pavot@hotmail.fr> Date: 2016-07-07 (Thu, 07 Jul 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/tools.py Log Message: ----------- Update tools.py Commit: 12c65d4a6365e34660c78dab7bb43b2cf292eb61 https://github.com/galaxyproject/galaxy/commit/12c65d4a6365e34660c78dab7bb43... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/tools.py Log Message: ----------- fix import of and_ operator Commit: 28a990470738ac821a6a2851306dac9723767c12 https://github.com/galaxyproject/galaxy/commit/28a990470738ac821a6a2851306da... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/history.py M lib/galaxy/webapps/reports/controllers/tools.py M lib/galaxy/webapps/reports/controllers/users.py M templates/webapps/reports/history_and_dataset_per_user.mako M templates/webapps/reports/history_and_dataset_type.mako M templates/webapps/reports/history_per_user.mako M templates/webapps/reports/index.mako M templates/webapps/reports/tool_execution_time.mako R templates/webapps/reports/tool_execution_time_peer_month.mako A templates/webapps/reports/tool_execution_time_per_month.mako M templates/webapps/reports/tools_and_job_state.mako R templates/webapps/reports/tools_and_job_state_peer_month.mako A templates/webapps/reports/tools_and_job_state_per_month.mako Log Message: ----------- fix menu items to actually display new templates reword certain texts reorder imports and fix style remove unnecessary imports Commit: 295f3f93e1db89b13040b42c8945cd5491ccda02 https://github.com/galaxyproject/galaxy/commit/295f3f93e1db89b13040b42c8945c... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M templates/webapps/reports/history_and_dataset_per_user.mako M templates/webapps/reports/history_and_dataset_type.mako M templates/webapps/reports/history_per_user.mako M templates/webapps/reports/tool_execution_time.mako M templates/webapps/reports/tool_execution_time_per_month.mako M templates/webapps/reports/tools_and_job_state.mako M templates/webapps/reports/tools_and_job_state_per_month.mako Log Message: ----------- change css classes and html markup for new report pages Commit: 8483f2ce8bffbdee0ee9ffd65b7212ed8c54e8a4 https://github.com/galaxyproject/galaxy/commit/8483f2ce8bffbdee0ee9ffd65b721... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-07-26 (Tue, 26 Jul 2016) Changed paths: M lib/galaxy/webapps/reports/controllers/tools.py Log Message: ----------- Fix E731 Commit: b74fd63feff0c2c324009b9a48757ff146d69cdc https://github.com/galaxyproject/galaxy/commit/b74fd63feff0c2c324009b9a48757... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-07-27 (Wed, 27 Jul 2016) Changed paths: A lib/galaxy/webapps/reports/controllers/history.py A lib/galaxy/webapps/reports/controllers/tools.py M lib/galaxy/webapps/reports/controllers/users.py A templates/webapps/reports/history_and_dataset_per_user.mako A templates/webapps/reports/history_and_dataset_type.mako A templates/webapps/reports/history_per_user.mako M templates/webapps/reports/index.mako A templates/webapps/reports/tool_error_messages.mako A templates/webapps/reports/tool_execution_time.mako A templates/webapps/reports/tool_execution_time_per_month.mako A templates/webapps/reports/tools_and_job_state.mako A templates/webapps/reports/tools_and_job_state_per_month.mako Log Message: ----------- Merge pull request #2664 from dannon/dev_reports Reports: new pages and improvements Compare: https://github.com/galaxyproject/galaxy/compare/fa4085be548a...b74fd63feff0
participants (1)
-
GitHub