opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
38,526 Commits 63 Branches 246 Tags
4a155c7cbf2fdc2684237595764f013a2caac30c
Commit Graph
38526 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
guerler 4a155c7cbf Fix registration error message content 2019-01-29 16:34:27 -05:00
guerler 31d511b526 Merge branch 'dev' into registration_mako 2019-01-29 13:27:43 -05:00
Nicola Soranzo 064f25ed0b Merge pull request #7256 from dannon/fix_hotdata_access 
Fix hotdata method access;
 2019-01-29 18:06:16 +00:00
Nicola Soranzo acb256f54a Merge pull request #7279 from mvdbeek/fix_history_import_test 
Fix flakey history import metadata test
 2019-01-29 17:23:33 +00:00
Nicola Soranzo d9dd2e3cf1 Merge branch 'release_19.01' into dev 2019-01-29 15:51:44 +00:00
Mason 800e221c47 Removed commented code in RuleCollectionBuilder 2019-01-29 10:50:55 -05:00
Mason 86eff98fc3 Removed slice method on non-array property 2019-01-29 10:50:55 -05:00
Mason f132f3ecbc Restored hotData to computed, but removed unnecessary side-effects 2019-01-29 10:50:55 -05:00
Dannon Baker 96a25fbe31 Prefer const, none of these are reassigned. 2019-01-29 10:50:55 -05:00
Dannon Baker 53d2c3490a Fix hotdata method access; this still needs a lot of love/refactoring, but this makes it work again? 2019-01-29 10:50:55 -05:00
Nicola Soranzo 152e0012c7 Merge branch 'release_18.09' into release_19.01 2019-01-29 15:50:39 +00:00
Dannon 884c7962ce Merge pull request #7280 from nsoranzo/selenium_client_build 
Do not skip the client build in dockerized selenium tests
 2019-01-29 10:46:17 -05:00
Marius van den Beek c8b3d5e4c4 Merge pull request #7275 from jmchilton/1901_migrate_tools 
[18.09] Stop tool migrations checking by default...
 2019-01-29 15:29:22 +01:00
Nicola Soranzo 42052d6b8d Do not skip the client build in dockerized selenium tests 
This allows the removal of the `docker run` of `make
client-production-maps`, which was run on a docker image for the
wrong version of `node`.
 2019-01-29 13:37:06 +00:00
mvdbeek f05a3f9e58 Fix flakey history import metadata test 
We need to wait for the BAM dataset to be final before we can export.
(At least that solved it locally for me).
 2019-01-29 10:25:18 +01:00
John Chilton 8cb4ee92a6 Merge pull request #7262 from mvdbeek/fix_saving_imported_subworkflows 
Fix saving imported subworkflows
 2019-01-28 09:52:07 -05:00
John Chilton d83db6a537 Stop with tool migrations by default, they are not needed in modern Galaxies... 
... and even problematic in some ways.
 2019-01-27 15:48:16 -05:00
Nicola Soranzo 8c93a914d8 Merge pull request #7267 from dannon/toolshed-roup-detail-view-typo 
[19.01] Fix _.escape typo in toolshed group detail view
 2019-01-24 20:19:13 +00:00
Dannon Baker 12128ad49d Fix _.escape typo in toolshed group detail view 2019-01-24 13:37:24 -05:00
Dannon Baker 0b95564789 Merge remote-tracking branch 'upstream/release_19.01' into dev 2019-01-24 13:20:27 -05:00
Dannon Baker dc6ec1ed3d Merge remote-tracking branch 'upstream/release_18.09' into release_19.01 2019-01-24 13:19:59 -05:00
Dannon 6a660e9893 Merge pull request #7253 from mvdbeek/fix_install_in_manage_tools_grid 
[18.09] Fix install operation in installed_repository_grid
 2019-01-24 13:19:27 -05:00
Dannon 53017d6be4 Merge pull request #7255 from Nerdinacan/fix_logout_behavior_7249 
Changed logout behavior to automatically redirect home
 2019-01-24 10:22:39 -05:00
Nicola Soranzo 840d85dfb5 Merge branch 'release_19.01' into dev 2019-01-24 14:24:13 +00:00
Nicola Soranzo 7b08e98ffc Merge branch 'release_18.09' into release_19.01 2019-01-24 14:22:36 +00:00
Dannon f0bd2df6d4 Merge pull request #7265 from nsoranzo/release_18.09_sqlalchemy-migrate_0.12.0 
[18.09] Update sqlalchemy-migrate requirement to 0.12.0
 2019-01-24 08:54:29 -05:00
Dannon 84c2138794 Merge pull request #7266 from nsoranzo/occured 
Fix "occured" typo everywhere
 2019-01-24 07:50:06 -05:00
Nicola Soranzo 9207b56eeb Fix "occured" typo everywhere 
Fix https://github.com/galaxyproject/galaxy/issues/7264
 2019-01-24 12:09:57 +00:00
Nicola Soranzo 687c99c009 Remove duplicated entry in `.gitignore` 2019-01-24 12:04:31 +00:00
Nicola Soranzo 3f02d30c50 Merge branch 'release_19.01' into dev 2019-01-24 12:03:01 +00:00
Nicola Soranzo f9ca90a228 Merge branch 'release_18.09' into release_19.01 2019-01-24 11:57:39 +00:00
Nicola Soranzo 1a4c1ec514 Merge pull request #7258 from mvdbeek/fix_workflow_uuid_access 
[18.09] Not all workflow outputs have a UUID
 2019-01-24 11:52:04 +00:00
Nicola Soranzo 5adfa81a8b Update sqlalchemy-migrate requirement to 0.12.0 
Fix https://github.com/galaxyproject/galaxy/issues/7159
 2019-01-24 10:56:43 +00:00
mvdbeek f2a454c776 Fix output uuid comparison 2019-01-24 11:25:37 +01:00
mvdbeek d95ba26a24 Fix saving imported subworkflows 
whose child-workflow is included more than once.
Fixes https://github.com/galaxyproject/galaxy/issues/7261 and probably https://github.com/galaxyproject/galaxy/issues/6032
 2019-01-23 20:00:11 +01:00
mvdbeek 35fe3bf716 Not all workflow outputs have a UUID 2019-01-23 16:00:50 +01:00
mvdbeek eb406cc210 Fix install operation in installed_repository_grid 
The incoming url keywords look like this:
```
operation=install&id=ebfb8f50c6abde6d?async=false&sort=name&page=1&show_item_checkboxes=true&advanced_search=false&operation=install&id=ebfb8f50c6abde6d
```
and the id parameter gets parsed into a list:
```
['ebfb8f50c6abde6d?async=false', 'ebfb8f50c6abde6d']
```

Obviously there's something wrong in the grid or mako,
but this works fine.

Fixes https://github.com/galaxyproject/galaxy/issues/5619
 2019-01-22 20:10:12 +01:00
Mason b123579a48 Changed logout behavior to automatically redirect home 2019-01-22 10:59:52 -08:00
Dannon 599f5d5a33 Merge pull request #7247 from nsoranzo/unneeded_conditional_reqs 
Remove unneeded conditional requirements
 2019-01-22 13:59:01 -05:00
John Chilton 920f07369d Merge pull request #7252 from mvdbeek/fix_shed_tool_conf_parsing 
[18.09] strip() text when parsing xml
 2019-01-22 13:56:01 -05:00
mvdbeek 31c71fbd6f strip() text when loading xml 
Should fix https://github.com/galaxyproject/galaxy/issues/7250.
 2019-01-22 11:30:49 +01:00
guerler d8cc0336b2 Merge branch 'dev' into registration_mako 2019-01-22 00:08:52 -05:00
Nicola Soranzo d5b306dd21 Remove OpenID auth from docs 
Follow-up on https://github.com/galaxyproject/galaxy/pull/7028 .
 2019-01-21 17:44:34 +00:00
Nicola Soranzo d0373c6a95 `make config-rebuild` 
Follow-up on https://github.com/galaxyproject/galaxy/pull/7028 .
 2019-01-21 17:43:14 +00:00
Nicola Soranzo be76285319 Remove unneeded conditional requirements 
They are already included in `requirements.txt` .

`ConditionalDependencies.check_python_openid()` was already removed in
commit f31d61b71c .
 2019-01-21 16:55:44 +00:00
Nicola Soranzo c58f9acf7f Merge branch 'release_19.01' into dev 2019-01-21 14:00:46 +00:00
Nicola Soranzo bdd340cf1c Merge pull request #7241 from mvdbeek/fix_workflow_save_as 
[19.01] Fix workflow save_as functionality
 2019-01-21 13:54:08 +00:00
Nicola Soranzo f24176d950 Merge pull request #7245 from nsoranzo/release_19.01 
Merge branch 'release_18.09' into release_19.01
 2019-01-21 12:38:09 +00:00
Nicola Soranzo b4e450cff0 Merge branch 'release_18.09' into release_19.01 2019-01-21 12:23:49 +00:00
Nicola Soranzoandmvdbeek 8862b9311b Use update_workflow_from_raw_description method 
not build_workflow_from_raw_description

Co-Authored-By: mvdbeek <m.vandenbeek@gmail.com>
 2019-01-21 11:58:25 +01:00