aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'testing' of github.com:genenetwork/genenetwork2 into ↵BonfaceKilz
feature/add-glossary-page
2020-11-11Update image widthBonfaceKilz
2020-11-11Add basic markdown stylingBonfaceKilz
* wqflask/wqflask/static/new/css/markdown.css: New file. * wqflask/wqflask/templates/glossary.html: add markdown id to markdown container.
2020-11-10Changed logic for creating temp trait SampleList to account for both traits ↵zsloan
encoded as bytes and traits encoded as strings, since temp traits created before and after the Python 3 switchover will have different encoding
2020-11-10Fixed issue where strain values in bytes needed to be decoded when loading a ↵zsloan
Temp trait
2020-11-10Changed "BXD-Harvested" to "BXD-Longevity" since that group was renamed and ↵zsloan
using the wrong name was causing correlations to not work.
2020-11-10Add missing links and some markdown formatting(underline, bold)BonfaceKilz
* wqflask/wqflask/static/markdown/glossary.md: Update file.
2020-11-06Removed the page selection from the top of the table because it created an ↵zsloan
awkward gap between the column show/hide buttons and the table, and this table will be changed to use Scroller instead of paging soon regardless
2020-11-06Changed the show/hide column buttons to use DataTables API + a few other ↵zsloan
changes (for some reason none of my changes could be pushed from one of my local branches to origin/testing, so they're combined in this commit) - Fixed a couple column header glossary links to point to GN1 - Added trait_list.css for styling a couple elements common to similar pages (like correlations or view collection)
2020-11-06Added min-width for the divs containing the analysis tools and table ↵zsloan
options, since they would look weird if the window shrunk below a certain width Also made some indentation more consistent
2020-11-06Added new css file for pages that have trait list tables (not sure what else ↵zsloan
to call them, but pages like search results, view collection, and correlation results)
2020-11-06Increased the min-width for the show_trait page container div for all the ↵zsloan
accordion sections, since previously it could get too narrow and cause text to extend beyong the borders of each accordion area
2020-11-06After I changed some class names in the trait page to use - instead of _ (to ↵zsloan
keep naming consistent) I forgot to change the references in show_trait_mapping_tools.js (which broke the functionality of clicking a tab doing mapping)
2020-11-04Merge pull request #480 from zsloan/bug/correlation_sort_fixzsloan
Fix sorting on the Tissue and Literature r/rho columns in correlation page
2020-11-04Changed numeric-html sorting for the Tissue/Lit r columns to ↵zsloan
natural-minus-na so it deals with the "--" values * wqflask/wqflask/templates/correlation_page.html - Replaced numeric-html sorting with natural-minus-na for the lit/tissue r columns
2020-11-04Use new glossary link from glossary_blueprint in html templatesBonfaceKilz
2020-11-04Add missing imageBonfaceKilz
2020-11-04Add link markers to elements which are referenced from elsewhereBonfaceKilz
2020-11-04Update test_markdown_routesBonfaceKilz
* wqflask/tests/unit/wqflask/test_markdown_routes.py (test_render_markdown_when_fetching_locally): Fix failing test.
2020-11-04Add an edit link button to glossary pageBonfaceKilz
2020-11-04Wrap rendered content in div containerBonfaceKilz
2020-11-04Update glossary markdown fileBonfaceKilz
2020-11-04Merge pull request #475 from Alexanderlacuna/test-showtraitBonfaceKilz
Add more tests for show trait module
2020-11-04correct a typoAlexanderlacuna
2020-11-04remove extra whitespaceAlexanderlacuna
2020-11-04remove whitespace in line 119-120Alexanderlacuna
2020-11-04remove whitespaceAlexanderlacuna
2020-11-04remove whitespace and assertIsAlexanderlacuna
2020-11-04Use python3-genenetwork2 docker image on commit 0bf4ee6BonfaceKilz
2020-11-03Merge pull request #479 from zsloan/bug/haplotype_analyst_error_fixzsloan
Bug/haplotype analyst error fix
2020-11-03Changed the syntax for the "sort" function in the docstring of GeneralObject ↵zsloan
to be compatible with Python 3 syntax * wqflask/base/GeneralObject.py - edited docstring to be correct for Python 3
2020-11-03Fixed a sort used when doing the haplotype analysis to be compatible with ↵zsloan
Python 3 * wqflask/wqflask/marker_regression/display_mapping_results.py - The arguments for sort are different in Python 3, so it was changed to be compatible
2020-11-03Fix false-positive testsBonfaceKilz
* wqflask/tests/unit/wqflask/test_markdown_routes.py: (MockRequests404): Pass self in all properties. (MockRequests200): Ditto. (test_render_markdown): Rename to test_render_markdown_when_fetching_locally. (test_render_markdown_when_fetching_remotely): New test.
2020-11-03Merge pull request #478 from zsloan/loading_page_n_fixzsloan
Joined sample names in primary_samples and all_samples with commas be…
2020-11-03Joined sample names in primary_samples and all_samples with commas because ↵zsloan
this list was being split to get the N of samples; not sure why this was working before * wqflask/wqflask/show_trait/show_trait.py primary_samples and all_samples passed as hidden form inputs now have names split by commas so they can be counted correctly when displaying the N on the mapping loading screen
2020-11-03Delete fileBonfaceKilz
* wqflask/tests/integration/test_glossary.py: Delete it. Earlier renamed to test_markdown_routes.
2020-11-03Add basic tests for rendering_markdownBonfaceKilz
* wqflask/tests/unit/wqflask/test_markdown_routes.py: New tests.
2020-11-03Add basic structure for "/glossary" routes testBonfaceKilz
2020-11-03Update issue and PR templatesBonfaceKilz
* .github/ISSUE_TEMPLATE/bug_report.md: Provide explanations in commented out blocks. * .github/ISSUE_TEMPLATE/feature_request.md: Ditto. * .github/PULL_REQUEST_TEMPLATE.md: Ditto. * .github/ISSUE_TEMPLATE/user_story.md: Ditto.
2020-11-03Move logic for fetching md files to it's own functionBonfaceKilz
* wqflask/wqflask/markdown_routes.py (render_markdown): New function. (glossary): use render_markdown function.
2020-11-03Use python3-genenetwork2 on commit bdce85d in containerBonfaceKilz
* .github/workflows/main.yml: Update gn2 container.
2020-11-03Add simple md content in glossary.mdBonfaceKilz
2020-11-03Update glossary template with markdown contentBonfaceKilz
2020-11-03Rename glossary.py to markdown_routes.pyBonfaceKilz
Evary page with markdown content will have routes added in markdown_routes.py * markdown_routes.py: New file. * wqflask/wqflask/glossary.py: Delete it. * wqflask/wqflask/__init__.py: Update import.
2020-11-03Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexanderlacuna
test-showtrait
2020-11-03remove unnecessary commentsAlexanderlacuna
2020-11-03add pep8 formattingAlexanderlacuna
2020-11-03add tests for the get_categorical_variables functionAlexanderlacuna
2020-11-03Remove encoding header for fileBonfaceKilz
In python3 the default encoding is utf-8 so this is redundant.
2020-11-03Separate unittests from integration testsBonfaceKilz
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-26 20:06:06 +0000