aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-03Joined sample names in primary_samples and all_samples with commas because th......* 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 zsloan
2020-10-29Merge pull request #473 from zsloan/reaper_bootstrap_fix...Reaper bootstrap fixzsloan
2020-10-29Fixed issue with single-chromosome mapping after the bootstrap fix and fixed ......* wqflask/wqflask/marker_regression/display_mapping_results.py - Cast self.qtlresults 'chr' as a string since the comparison between it and the chromosome names was faililng due to numeric chromosomes being int type + used a list comprehension that converts None to an empty string when creating a comma-joined string from the list of mapping output files zsloan
2020-10-29Merge branch 'testing' of github.com:genenetwork/genenetwork2 into reaper_boo...zsloan
2020-10-29Merge pull request #469 from BonfaceKilz/bug/fix-cookies-verification...Bug/Fix cookie verification bugBonfaceKilz
2020-10-29Merge pull request #471 from BonfaceKilz/bug/replace-map-on-strip-method...Bug/Replace map on strip with a list comprehension that calls strip()BonfaceKilz
2020-10-28Merge pull request #470 from zsloan/mapping_chr_view_fix...Fixed error when zooming into a chromosome when mappingzsloan
2020-10-28A non-string being used as a paramter in HT.Link caused an error after the Py......* wqflask/wqflask/marker_regression/display_mapping_results.py - cast theGO["snpCount"] as a string zsloan
2020-10-29Replace map on strip with a list comprehension that calls strip()...* scripts/maintenance/readProbeSetSE_v7.py: In Python3 you can't map string.strip on a list of strings. Instead use a list comprehension and apply strip() on each element of the list. * wqflask/wqflask/marker_regression/plink_mapping.py: Ditto. * wqflask/wqflask/snp_browser/snp_browser.py: Ditto. BonfaceKilz
2020-10-28Use latin-1 encoding when converting hmac secret to bytes...* wqflask/utility/hmac.py (hmac_creation): Use latin-1 when serializing the hmac secret. This ensures that the behaviour of *verify_cookie* remains the same as in the python2 tip. BonfaceKilz
2020-10-28Add new test for hmac_creation with latin-1 secret...* wqflask/tests/utility/test_hmac.py (test_hmac_creation_with_cookie): New test. For this test, use a secret that behaves differently when encoded to either utf-8 or latin-1. BonfaceKilz
2020-10-28Add tests for cookie verificationBonfaceKilz
2020-10-28Merge pull request #468 from zsloan/export_fix...Fixed trait page export issue caused by Scrollerzsloan
2020-10-28Fixed trait page export to work with Scroller + added metadata for non-Pheno......* wqflask/wqflask/show_trait/export_trait_data.py - Added metadata for non-Phenotype traits and column headers (which didn't previously exist) * wqflask/wqflask/static/new/javascript/show_trait.js - Changed export_sample_table_data to use DataTables API instead of just selecting from the DOM with JQuery zsloan
2020-10-27Merge pull request #467 from zsloan/gsearch_encoding_fix...Remaining gsearch encoding fix for ProbeSet descriptionzsloan
2020-10-27Cast ProbeSet description as binary to fix encoding issue on global search page...* wqflask/wqflask/gsearch.py - Cast ProbeSet description as binary zsloan
2020-10-27Merge pull request #466 from zsloan/show_trait_attributes_fix...Fix issue where attribute values were displayed in the wrong columnszsloan
2020-10-27Get the "first_attr_start_pos" from a samplelist instead of from each individ......* wqflask/base/webqtlCaseData.py - Removed code getting first_attr_start_pos * wqflask/wqflask/show_trait/SampleList.py - Added code getting first_attr_start_pos and assigning it to all samples + removing one unnecessary sort * wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - Fixed issue that was causing the N column to not be displayed zsloan
2020-10-27Cast post and pre-publication descriptions into binary...* wqflask/wqflask/gsearch.py (GSearch): There's an exception thrown when the decode method is called on that description string. If the casting is absent, and the decode statements are removed, the some characters get broken. BonfaceKilz
2020-10-27Merge pull request #465 from Alexanderlacuna/test-branch...add test for trait_dataBonfaceKilz
2020-10-27switch from single quote to double quoteAlexanderlacuna
2020-10-27address failuresAlexanderlacuna
2020-10-27added changes to fileAlexanderlacuna
2020-10-27modified to use pep8 standardsAlexanderlacuna
2020-10-27Merge pull request #422 from BonfaceKilz/build/python3-migration...Build/python3 migrationBonfaceKilz
2020-10-26Merge pull request #463 from BonfaceKilz/feature/add-load-metrics-to-footer...Add page load metrics to footerBonfaceKilz
2020-10-26modified test fileAlexanderlacuna
2020-10-26Add page load metrics to footer...* wqflask/wqflask/__init__.py (before_request): New function. Add method for calculating total request_time to global context. * wqflask/wqflask/templates/base.html: - Display total server load time. - Display total page rendering time, and add js functionality to calculate it. BonfaceKilz
2020-10-23Fixed bootstrap results when using interval mapping for the full genome view;......* wqflask/wqflask/marker_regression/display_mapping_results.py - Fixed bootstrap results by iterating through qtlresults instead of self.genotype (the latter didn't have intervals added, resulting in the bootstrap result positions being wrong) zsloan
2020-10-23Merge pull request #462 from zsloan/fix_export_error...Fixed trait export for situations where there's no authors/title/journalzsloan
2020-10-23Fixed trait export for situations where there's no authors/title/journalzsloan
2020-10-22Merge pull request #460 from zsloan/move_styling_to_css...Move styling to csszsloan
2020-10-22Merge pull request #461 from zsloan/mapping_y_axis_fix...Mapping y axis fixzsloan
2020-10-21Removed code setting the maximum tick value to 1.15* the max LRS/LOD if permu...zsloan
2020-10-21Ensured all Y axis ticks in the mapping figure are below the top of the figur......* wqflask/wqflask/marker_regression/display_mapping_results.py - Set LRS_LOD_Max (the top tick value) as the maximum value between the significant value (if permutations are used) and the max LRS/LOD value; previously it would set it as the significant value * 1.1 if the significant value exists and is higher than the max LRS/LOD value. zsloan
2020-10-20Fixing typo in JS code where "attribute_start_pos" said "attribute_start_post"zsloan
2020-10-20Fixed some problems with the previous attempt at resolving conflicts before m...zsloan
2020-10-20Merge branch 'testing' into move_styling_to_csszsloan
2020-10-20Added classes to replace styling in show_trait_edit_data.html to show_trait.c......* wqflask/wqflask/static/new/css/show_trait.css - Moved show_trait_edit_data.html styling to this file and changes padding for the checkbox table cell to better center it; for some reason text-align: center wasn't working and it specifically needed left-padding * wqflask/wqflask/static/new/javascript/show_trait.js - Replaced underscores with - in class names * wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js - Replaced underscores with - in class names zsloan
2020-10-20Replaced _ with - in class names (though this change will end up being unnece......* wqflask/wqflask/templates/show_trait.html - Replaced underscores with - in class names zsloan
2020-10-20Replaced one class name with a more generic "inline-div" since there are othe...zsloan
2020-10-20Made class names consistently use - instead of _ in show_trait_edit_data.html...* wqflask/wqflask/templates/show_trait_edit_data.html - replaced underscores with - zsloan
2020-10-20Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-10-20Update how pbkdf2.pbkdf2_hex is used when encrypting pass...* wqflask/wqflask/user_login.py (encode_password): - Remove unused local variable "salt". - Pass "hashfunc" as a string. - Apply Pep-8. BonfaceKilz
2020-10-20Add tests for encoding password...* wqflask/tests/wqflask/test_user_login.py: New tests. BonfaceKilz
2020-10-20Update pbkdf2...* wqflask/wqflask/pbkdf2.py: Remove unnecessary pbkdf2 usage docs--- it already exists in python3 stdlib--- and "__main__" section which runs the test. (imports): Delete unused imports. Add safe_str_cmp. (pbkdf2_hex): Use hashlib.pbkdf2_hmac. (safe_str_cmp): Replace with werkzeug.security.safe_str_cmp (test): Delete it. Tests moved to test_pbkdf2.py. BonfaceKilz
2020-10-20Add pbkdf2 tests...* wqflask/tests/wqflask/test_pbkdf2.py: New tests. BonfaceKilz
2020-10-20Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-10-19Merge pull request #442 from zsloan/scroller_testing...Added scroller to trait page and changed sample tables to use itzsloan
2020-10-19Merge branch 'testing' into scroller_testingzsloan