opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 15:45:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
58,283 Commits 62 Branches 243 Tags
2547da5586e217decbc604b75c7026464ee72e52
Commit Graph
58283 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dannon 2547da5586 Merge pull request #12528 from bernt-matthias/topic/n-col-assert 
Various extensions and improvements for asserts
 2022-01-25 08:42:05 -05:00
Dannon 6256b9777d Merge pull request #13237 from ic4f/dev_13144 
Hide form fields and button upon successful submission of bug report
 2022-01-25 08:24:45 -05:00
DannonandMarius van den Beek 780f15e8d5 Apply suggestions from code review 
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
 2022-01-25 08:24:31 -05:00
Marius van den Beek a68b716743 Merge pull request #13178 from bernt-matthias/topic/stdio/exit-code-parsing 
Fix stdio parsing
 2022-01-25 12:40:02 +01:00
Marius van den Beek 99edd864ac Merge pull request #13238 from simonbray/patch-2 
Change display_in_upload to true for PHAR datatype
 2022-01-25 10:51:54 +01:00
Simon Bray a8e85bf0e8 change display_in_upload to true for PHAR datatype 2022-01-25 09:21:47 +01:00
Sergey Golitsynskiy 1e19468dc9 Hide form fields and button upon success 2022-01-24 23:16:05 -05:00
Dannon 6df67a9038 Merge pull request #13228 from itisAliRH/Remove-jquery.complexify-from-everywhere 
Remove `jquery.complexify` from everywhere
 2022-01-24 23:06:36 -05:00
Alireza Heidari f23f5d9cc7 Remove toolshed password strength from register and change password 2022-01-25 02:49:03 +03:30
root aca6e818ce Merge branch 'Remove-jquery.complexify-from-everywhere' of https://github.com/itisAliRH/galaxy into Remove-jquery.complexify-from-everywhere 2022-01-24 22:36:21 +00:00
Marius van den Beek 98734112e7 Merge pull request #12900 from galaxyproject/dependabot/pip/lib/galaxy/dependencies/tensorflow-2.5.2 
Bump tensorflow from 2.5.1 to 2.5.2 in /lib/galaxy/dependencies
 2022-01-24 20:34:41 +01:00
Alireza Heidari 98d2a34acc Update change_password.mako 2022-01-24 23:04:25 +03:30
Alireza Heidari c41b890a19 Replace check password strength in toolshed register 2022-01-24 23:04:25 +03:30
Alireza Heidari 04ed8f123c Replace check password strength in toolshed change_password 2022-01-24 23:04:25 +03:30
Alireza Heidari ad3fd44655 Remove and unload jquery.complexify package 2022-01-24 23:04:25 +03:30
Dannon b69e656b12 Merge pull request #13219 from wm75/patch-1 
Enable display of BAM data without sequence info
 2022-01-24 14:21:02 -05:00
Dannon 27dda51c3b Merge pull request #13233 from davelopez/field_slider_dynamic_step 
Add dynamic step to FormNumber range slider
 2022-01-24 14:12:29 -05:00
Dannon 976cbebe6c Merge pull request #13159 from davelopez/fix_libraries_non_admin_permissions 
Assorted Data Libraries fixes
 2022-01-24 13:50:07 -05:00
John Chilton e31571482d Merge pull request #13235 from mvdbeek/bump_default_milestone_22_05 
Bump default milestone
 2022-01-24 12:53:41 -05:00
Marius van den Beek 1bb557c74a Merge pull request #13003 from galaxyproject/dependabot/pip/lib/galaxy/dependencies/python-ldap-3.4.0 
Bump python-ldap from 3.2.0 to 3.4.0 in /lib/galaxy/dependencies
 2022-01-24 18:49:44 +01:00
Marius van den Beek 5df80bd0b7 Merge pull request #13171 from ic4f/dev_sa20warning 
Enable setting SQLALCHEMY_WARN_20
 2022-01-24 18:47:35 +01:00
Marius van den Beek 374219a912 Merge pull request #13226 from galaxyproject/dependabot/npm_and_yarn/client/nanoid-3.2.0 
Bump nanoid from 3.1.29 to 3.2.0 in /client
 2022-01-24 18:45:27 +01:00
Marius van den Beek def0cfde33 Merge pull request #13205 from galaxyproject/dependabot/npm_and_yarn/client/markdown-it-12.3.2 
Bump markdown-it from 12.2.0 to 12.3.2 in /client
 2022-01-24 18:23:16 +01:00
Marius van den Beek 0f4ffdaece Merge pull request #13217 from guerler/revise_scrolling 
Ensure that jQuery updates drop target locations during dragging
 2022-01-24 18:22:04 +01:00
mvdbeek 64e017e929 Bump default milestone 2022-01-24 18:17:46 +01:00
davelopez 6c94839fc0 Add test for dynamic step 2022-01-24 17:37:10 +01:00
davelopez 6fc42c621a Set FormNumber slider step dynamically 
The default step for the slider is always 1, so when dealing with a different precision float number the slider needs to adapt its step to be more usable
 2022-01-24 17:36:11 +01:00
mvdbeek 64d395862e Merge branch 'release_21.09' into dev 2022-01-24 09:28:08 +01:00
Marius van den Beek f2c6666fc4 Merge pull request #13174 from mvdbeek/fix_display_in_upload_false_connections 
[21.09] Fix workflow connections for outputs that are not displayed in uploads
 2022-01-24 09:17:12 +01:00
Alireza Heidari e48b5d30a3 Update change_password.mako 2022-01-23 20:18:58 +03:30
Alireza Heidari a232e2edfe Replace check password strength in toolshed register 2022-01-23 17:50:54 +03:30
Alireza Heidari ca47d97cb5 Replace check password strength in toolshed change_password 2022-01-23 17:50:35 +03:30
Alireza Heidari 716c462665 Remove and unload jquery.complexify package 2022-01-23 17:49:35 +03:30
Marius van den Beek 15e1158cc4 Merge pull request #13227 from mvdbeek/drop_unnecessary_tests 
[21.09] Skip non-Selenium tests if only lib/galaxy_test/selenium is touched
 2022-01-23 13:43:55 +01:00
mvdbeek 31f0cb4263 Don't sort array in place, fixes infinite update loop 2022-01-23 13:43:06 +01:00
mvdbeek f7fde81b9c Print exception 2022-01-23 13:43:06 +01:00
mvdbeek f66b67346e Drop indented, fenced galaxy blocks from test 
https://github.com/galaxyproject/galaxy/issues/13181
 2022-01-23 10:48:22 +01:00
mvdbeek 036dddc991 Wait for data and datatype before rendering HistoryDatasetsDisplay 2022-01-23 10:48:22 +01:00
mvdbeek 65b3157c02 Search datatype before selecting it 
We now return more datatypes in the list, so bam fell out of the intial
items that select2 displays without scrolling.
 2022-01-23 10:48:22 +01:00
mvdbeek bb2c6ba481 Fix workflow connections for outputs that are not displayed in uploads 
and apply the same fix for tool recommendations.

Fixes https://github.com/galaxyproject/galaxy/issues/13173
 2022-01-23 10:48:21 +01:00
mvdbeek 6c7f4b0702 Skip api tests if lib/galaxy_test/selenium is touched 
(and other unrelated test).
 2022-01-23 10:42:34 +01:00
mvdbeek f6ce2f6f5a Merge branch 'release_21.09' into dev 2022-01-22 16:35:43 +01:00
Marius van den Beek 59393dc133 Merge pull request #13216 from mvdbeek/fix_unique_constraint_exceptions 
[21.09] Handle unique tag name constraints
 2022-01-22 16:26:47 +01:00
dependabot[bot] 11356cb0eb Bump nanoid from 3.1.29 to 3.2.0 in /client 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.29 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.29...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-22 00:44:56 +00:00
Dannon c12360d67e Merge pull request #13225 from galaxyproject/dependabot/npm_and_yarn/client/log4js-6.4.0 
Bump log4js from 6.3.0 to 6.4.0 in /client
 2022-01-21 19:44:05 -05:00
dependabot[bot] 94bafc5381 Bump log4js from 6.3.0 to 6.4.0 in /client 
Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/log4js-node/log4js-node/releases)
- [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/log4js-node/log4js-node/compare/v6.3.0...v6.4.0)

---
updated-dependencies:
- dependency-name: log4js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-21 23:22:14 +00:00
Dannon 296b31e524 Merge pull request #13193 from davelopez/fix_wf_invocation_name_overflow 
[21.09] Fix workflow invocation name overflow
 2022-01-21 15:42:18 -05:00
Aysam Guerler 17b034378f Merge pull request #13221 from mvdbeek/dev 
Merge release_21.09 into dev
 2022-01-21 12:56:58 -05:00
John Chilton 4ead1a5569 Merge pull request #13204 from dannon/fix-tool-id-routing 
Bugfix for allowing +'s in tool urls
 2022-01-21 11:37:42 -05:00
mvdbeek f0baddd905 Merge branch 'release_21.09' into dev 2022-01-21 16:38:36 +01:00