Commit Graph
3561 Commits
Author SHA1 Message Date
Nicola Soranzo eba3fb4b35 Fix common_startup.sh for galaxy tarballs
Do not assume git is installed and the `.git` directory is present.

Fix https://github.com/galaxyproject/galaxy/issues/5466
2018-02-08 11:52:24 -05:00
Dannon Baker f0a8243f7d Client-format post-merge 2018-02-05 13:06:29 -05:00
Dannon Baker 0704d63d0b Merge remote-tracking branch 'jmchilton/1801_hdca_delete' into release_18.01 2018-02-05 13:06:01 -05:00
Martin Cech b28fb7e4d7 change the history icon-btn selector to work with dropdowns 2018-02-04 20:10:36 -05:00
Martin Cech 3512096a14 remove unused classes and aria 2018-02-02 13:53:26 -05:00
Martin Cech 8019afb8b5 fix typo 2018-02-02 13:34:17 -05:00
Martin Cech 55b6d601a8 add empty href to links so the cursor is right 2018-02-02 13:32:56 -05:00
Dannon Baker a392b5750a Ensure jobStateSummariesCollection exists; events can fire during deletion actions causing this event to fail 2018-02-02 09:01:35 -05:00
John Chilton ab3d53c5ce More options for collection deletion.
Delete button now a drop down menu (like dropdown for downloading metadata files).

- Top option just deletes the collection.
- Second option deletes the collection and attempts to delete the datasets contained within it.
- The third option deletes the collection and attempts to purge the datasets within it.
2018-02-01 23:20:59 -05:00
Evgeny Anatskiy 9b4465efd3 fix webhook's property name 2018-02-01 12:22:14 -05:00
Dannon Baker fa0ba22f97 Fix webhook filtering, make it a bit more defensive. Minor other tweaks. 2018-02-01 12:18:02 -05:00
Dannon Baker 22b0b2f2e9 Minor tweaks/fixes while trying to sort out qunit test failures related to webhook changes. 2018-02-01 12:18:02 -05:00
Dannon Baker 3b7daece04 Delay interpolation of webhook url template; Galaxy won't exist as a configured object necessarily when this is imported. 2018-02-01 12:18:02 -05:00
Dannon Baker 57c1fc7804 Client formatting of webhooks changes. 2018-02-01 12:18:02 -05:00
Evgeny Anatskiy ada76931d8 add weighted random webhook pick 2018-02-01 12:18:01 -05:00
Evgeny Anatskiy 6070bf07e1 simplify Webhooks' structure 2018-02-01 12:18:01 -05:00
Nicola Soranzo 5b23c0e87d Merge branch 'release_17.09' into release_18.01
Conflicts:
	client/galaxy/scripts/mvc/workflow/workflow-node.js
	config/galaxy.ini.sample
	static/maps/mvc/workflow/workflow-node.js.map
	static/scripts/mvc/workflow/workflow-node.js
2018-01-31 10:38:53 +00:00
mvdbeek 74d57cfc1c Fix subworkflow creation
This fixes #5396. The problem was that we would override the content_id with an
undefined value. Broken in https://github.com/galaxyproject/galaxy/pull/5249.
2018-01-26 14:22:15 +01:00
Martin Cech 5defdc7919 Merge pull request #5364 from dannon/history_multipanel_fixes
History multipanel fixes
2018-01-25 10:51:27 -05:00
Martin Cech 091c5042d9 Merge pull request #5337 from dannon/tag_editor_constraint
Tag editor size constraint
2018-01-24 22:59:53 -05:00
Dannon Baker 541968bbd9 Swap to fat arrow functions, this reference in multipanel behavior handling. 2018-01-23 11:02:21 -05:00
Dannon Baker 4da1dad394 Fix for history multipanel view for when the 'current' history is
deleted and/or purged.  Several bits of refactoring, import cleanup, and
a start towards documenting globals in client files touched.
2018-01-23 10:31:18 -05:00
Dannon Baker 84ae5db0f1 Client formatting 2018-01-22 13:47:20 -05:00
Dannon Baker 0e0303743d Merge branch 'release_17.09' into dev 2018-01-22 13:46:47 -05:00
Dannon Baker 177aa2e7f9 Merge branch 'release_17.05' into release_17.09 2018-01-22 13:28:42 -05:00
Dannon Baker 7af6381e24 Disable galaxy tour 'path' navigation -- this style of tour nav behaves very poorly with Galaxy and it's pretty easy to get a tour completely *stuck* in reload loops from the user experience, forcing manual cache cleaning or the like to make Galaxy usable again. 2018-01-18 17:12:45 -05:00
Dannon Baker d51ea5d200 Constrain the select2 container for the tags display, instead of the outer box; this prevents the prompt from (in some cases) taking the space. 2018-01-18 15:35:38 -05:00
Dannon Baker 7434326006 Constrain tag editor height, minor refactoring. Will be removed with the conversion to a vue component that can pop out with a more flexible display. 2018-01-18 15:32:08 -05:00
Martin Cech bf2c9bab34 Merge pull request #5321 from mvdbeek/rerun_without_dependent_jobs
Add option to replace failed elements on job rerun
2018-01-17 16:42:37 -05:00
mvdbeek be4fba3566 Add option to replace failed elements on job rerun
Replacing failed collection elements was already possible when dependent jobs
were found (https://github.com/galaxyproject/galaxy/pull/5247).
This commit restructures the remapping so that remapping is possible when no
dependent jobs are available. This also simplifies the replacement of HDAs
between old and new jobs.
2018-01-17 16:51:24 +01:00
Martin Cech 69e35a2434 allow message to be modified on ldda
implements #5309
2018-01-15 15:58:51 -05:00
Dannon Baker 9cddf804fa Run client-format 2018-01-10 11:31:02 -05:00
Dannon Baker e88706c282 Prettier now supports Vue SFCs 2018-01-10 11:30:41 -05:00
Dannon Baker 823d07d41a Prettier upgrade to 1.10 2018-01-10 11:30:16 -05:00
Dannon Baker e2a662eb95 Client format 2018-01-10 10:52:14 -05:00
Dannon Baker 9c743f2b08 Merge remote-tracking branch 'istevenshen/dev' into dev 2018-01-10 10:51:20 -05:00
Dannon Baker a19596e3ea Fix dataset-model's edit url 2018-01-10 08:39:30 -05:00
steven 6e84fef4e0 Update locale.js
Add tool-panel and history-panel title translation.
2018-01-10 16:26:16 +08:00
Martin Cech 11f434af39 Merge pull request #5279 from dannon/dataset-error-cleanup
Dataset Error Interface Cleanup
2018-01-09 14:01:51 -05:00
Dannon Baker 5f3e11c02c A few minor tweaks to page rendering on dataset error interface 2018-01-08 17:11:08 -05:00
Dannon Baker 38e725ff66 Template formatting. 2018-01-08 17:01:38 -05:00
Dannon Baker 489f0a84df Cleanup in dataset-error.js, extra escaping. 2018-01-08 16:56:29 -05:00
Dannon Baker e694aee7a9 Formatting in webpack config. 2018-01-08 15:21:20 -05:00
Dannon Baker c71ab1df2d Fix firefox (worked in Chrome only) sourcemaps in dev mode. 2018-01-08 15:20:20 -05:00
Dannon Baker ac11236a0a Client format. 2018-01-08 09:27:23 -05:00
Dannon Baker 6cecafa6f3 Merge remote-tracking branch 'upstream/release_17.09' into dev 2018-01-08 09:21:16 -05:00
guerler 8602ecbfac Only collect required attributes of linked steps 2018-01-05 11:08:18 -05:00
Martin Cech bb29444edf Merge pull request #5128 from dannon/check_for_client_build
Client build check
2018-01-03 17:11:13 -05:00
mvdbeek d448001fe6 Also update tool_id when switching versions in workflow editor 2017-12-31 20:18:02 +02:00
mvdbeek 3d45cce423 Fix undefined variable 2017-12-31 18:06:50 +02:00