opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
52,493 Commits 62 Branches 243 Tags
18f27e42faedf17a6733e2037c4a0bbefa1fbeaa
Commit Graph
9180 Commits
Author SHA1 Message Date
Martin Cech 18f27e42fa Merge pull request #11674 from dannon/analysis-confusion 
Swap 'Analyze Data' to home icon
 2021-03-22 20:19:09 +01:00
Dannon Baker 4a8f70ae9f Updated tooltip for 'home' to 'Tools and Current History' 2021-03-22 14:42:20 -04:00
Dannon 1f17e6cff6 Merge pull request #11682 from assuntad23/bugfix/11476/disabled-upload-button-explanation 
Bugfix/11476/disabled upload button explanation
 2021-03-19 16:27:55 -04:00
Assunta DeSanto e06bb0dfae updated to break validInput into smaller components and make validityErrorMessages more reactive 2021-03-19 14:18:28 -04:00
Marius van den Beek f4e1d2c6b3 Merge pull request #11607 from guerler/allow_workflow_import 
Allow workflow imports in pages
 2021-03-19 16:11:48 +01:00
John Chilton 1ed27ac609 Merge pull request #11637 from OlegZharkov/library_permissions 
Rewrite Library Permissions
 2021-03-19 10:41:36 -04:00
Marius van den Beek f69d6b5642 Merge pull request #11121 from dannon/client-testing-followup 
Client testing/linting updates and followup
 2021-03-19 15:15:42 +01:00
mvdbeek 3bd69f5791 Merge branch 'release_21.01' into dev 2021-03-19 12:51:38 +01:00
Assunta DeSanto 77ae7ac125 fixing linting issue 2021-03-18 22:21:56 -04:00
Assunta DeSanto 3d4741f099 adding bullet points for errors 2021-03-18 21:30:43 -04:00
Assunta DeSanto 28590c1842 adding validity error messages to Rule Builder 2021-03-18 18:45:23 -04:00
Dannon Baker 866e0f2d43 Drop unused title; leave tooltip 2021-03-18 16:07:39 -04:00
guerler 2abe2808fb Add option to download collections in markdown pages 2021-03-18 13:38:44 -04:00
Dannon Baker 2551f2e1d5 Smaller masthead icons, more in alignment with the text line height 2021-03-18 12:27:45 -04:00
Dannon Baker 8bd456190e Swap 'Analyze Data' to fa-home icon 2021-03-18 12:08:47 -04:00
mvdbeek b0a2918643 Fix reconnecting terminals 
Fixes https://github.com/galaxyproject/galaxy/issues/11658.
Broken in e49d6a3c46.

We only need to remove the inputTerminal from the Node when the
NodeInput is removed, not when the connection is destroyed.
This mirrors what we do for the NodeOutout now.
https://github.com/mvdbeek/galaxy/blame/d03c7af02a0ac456a3e22d3fbc90e434debb43fe/client/src/components/Workflow/Editor/NodeOutput.vue#L153
now.
 2021-03-18 10:05:13 +01:00
Dannon Baker 3a64108e15 lint 2021-03-17 22:26:16 -04:00
Assunta DeSanto b9f6d95c60 Merge branch 'client-testing-followup' into client-testing-followup 2021-03-17 20:38:05 -04:00
Assunta DeSanto 8f5591cea2 fixing failing selenium tests 2021-03-17 20:29:10 -04:00
mvdbeek 1a1621d00c Fix conditional and section parameters becoming runtime parameters 
This broke in 526fb05d5c, which fixed
cloned data inputs missing from the tool form.
The problem with this commit is that we now add the runtime value state
to non-data hidden inputs, which is not correct and breaks execution
of workflows with these inputs.

This fix is better since it does not change the input type, and instead
adds a new attribute. The tool form and its variants need to be
rewritten in vue ASAP, so we can stop these hacks.
 2021-03-17 19:09:48 +01:00
Oleg Zharkov 6c331757c0 fix typo 2021-03-17 16:04:36 +02:00
Oleg Zharkov d7504a2cba make selenium tests happy 2021-03-17 15:46:00 +02:00
Oleg Zharkov 8aaeb1fad9 fix lint 2021-03-17 15:46:00 +02:00
Oleg Zharkov 3468192943 change routing 2021-03-17 15:46:00 +02:00
Oleg Zharkov 22bf4da9c3 remove debug stuff 2021-03-17 15:46:00 +02:00
Oleg Zharkov b2e2cbcf0b implement save changes 2021-03-17 15:46:00 +02:00
Oleg Zharkov ff4cb9975f add fields 2021-03-17 15:46:00 +02:00
Oleg Zharkov 01a55598ae PermissionsHeader component 2021-03-17 15:46:00 +02:00
Dannon Baker 4ba832c30e Pull Oleg's foldertopbar fix in, resolving conflicts. 2021-03-17 09:33:34 -04:00
Dannon Baker 8f83014579 Turns out we actually do use this, just for tests. Support setting initialValue as prop, keep mutable internal 2021-03-17 09:03:47 -04:00
Dannon Baker d698985e5c Fix and uncomment scratchbook test 2021-03-17 09:03:11 -04:00
Dannon 67d612aad5 Merge pull request #11638 from OlegZharkov/prop-fix 
Fix prop mutation in FolderTopBar
 2021-03-16 22:03:55 -04:00
Dannon Baker 40ffd89dac Swap activeTab to local data -- we never set this as a prop 2021-03-16 21:52:37 -04:00
Dannon Baker 2f2834e5dd Revert "Drop masthead function that mutated props -- fortunately never used. activeTab will eventually stem from routing" 
This reverts commit 8eced61066.

TODO: Rebase this out
 2021-03-16 21:38:25 -04:00
mvdbeek 4e58fcfbde Merge branch 'release_21.01' into dev 2021-03-16 19:13:50 +01:00
Dannon be29cabb58 Merge pull request #11625 from OlegZharkov/collections-fix-21.01 
[21.01] fix exporting datasets from library as collection
 2021-03-16 14:04:12 -04:00
mvdbeek c9a9d4ef0d Fix methods to use for creating paired and paired:list modals in library 2021-03-16 16:50:26 +01:00
Oleg Zharkov 69911726a3 remove empty line 2021-03-16 17:39:47 +02:00
Oleg Zharkov fcec57e669 prop fix 2021-03-16 17:37:18 +02:00
Dannon Baker 3ae00d18e6 Merge remote-tracking branch 'upstream/release_21.01' into dev 2021-03-16 11:25:32 -04:00
Dannon Baker 09eb967da7 Merge remote-tracking branch 'upstream/release_20.09' into release_21.01 2021-03-16 11:19:40 -04:00
Dannon Baker 54f9eb7b37 Minor eslint re-up on this branch; still passes as compatible with no 
new failing rules
 2021-03-16 10:24:49 -04:00
Dannon Baker 58ea37dcf1 Flag TODOs and use inline disable for existing remaining prop mutation -- I want to get this in ASAP to prevent more proliferation of this error 2021-03-16 10:21:47 -04:00
Dannon Baker 730780a968 post-merge cleanup 2021-03-16 09:59:43 -04:00
Nicola Soranzo c989963c81 Fix "Edit Dataset Tags" button title in Beta History Panel 
I noticed it today and @jmchilton already proposed this fix in
https://github.com/galaxyproject/galaxy/issues/10947#issuecomment-747775166
 2021-03-16 13:57:52 +00:00
Dannon Baker 50c8d88331 Merge remote-tracking branch 'upstream/dev' into client-testing-followup 2021-03-16 09:48:29 -04:00
Oleg Zharkov 93c86c71e8 tooltip bottom 2021-03-16 15:24:38 +02:00
Dannon 695e723aa2 Merge pull request #11614 from OlegZharkov/lib-route-refactor 
Front-end Library Routing refactor
 2021-03-15 21:29:44 -04:00
Oleg Zharkov 4d12dd0a8f wildcard on AnalysisRouter.js 2021-03-15 22:38:42 +02:00
Oleg Zharkov c7fd5fedb9 remove # 2021-03-15 22:25:53 +02:00