aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-12Replaced redis_user_id with user_id since there's no real need for the first ↵zsloan
if things are working correctly
2020-05-12Added change for F2s in r/qtl and fixed minor issue in save_user in redis_toolszsloan
2020-05-07Fixed blatseq issue and geno correlation issueblatseq_fixzsloan
2020-05-07Committing current progress on group manager + a minor fix in dataset.pyzsloan
2020-05-06Added function for getting trait data type, plus added mapping scale changes ↵itp_covariate_testingzsloan
to Danny's partially fixed R/qtl code
2020-05-06Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-05-06Merge pull request #389 from DannyArends/testingzsloan
Fixed covariates in r/qtl mapping
2020-05-06Commiting a few minor changes plus returning rqtl_mapping.py to the same as ↵zsloan
on testing branch before merging Danny's changes and testing them
2020-05-06Disable saving of RDataDanny Arends
2020-05-06Fix the covariate, added debug, more output to track what it is doingDanny Arends
2020-05-04Committing some changes for testing covariateszsloan
2020-05-04Working on covariate mapping, making sure the addcovars are numericDanny Arends
2020-05-01Aesthetic table changes to view collection and correlation result pagesproductionzsloan
2020-04-30Fixed the way it gets the N displayed on the loading pagezsloan
2020-04-29Changed a lot about how mapping scale is read and gave the option to change ↵zsloan
mapping scale when both scales are available
2020-04-29Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-29Fixed issue with global search when description field is emptyzsloan
2020-04-29Merge pull request #385 from DannyArends/testingzsloan
Fixing loading of the ITP data as a 4way cross
2020-04-29Adding some debug, so we have some info in the outputDanny Arends
2020-04-29Fixing loading of the ITP data as a 4way cross, worked on ↵Danny Arends
http://gn2-test3.genenetwork.org/
2020-04-28Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-28Added some metadata to the trait exportzsloan
2020-04-28Redis settingPjotr Prins
2020-04-28Remove old menu filePjotr Prins
2020-04-28Merge with conflictsPjotr Prins
2020-04-28Track requests and check for attribute so at least we get the right error:penguin2Pjotr Prins
GeneNetwork penguin2:genenetwork2:2.11-rc2-penguin2-0bca65695 http://gn2-test3.genenetwork.org/ ( 1:31PM UTC Apr 28, 2020) MISCONF Redis is configured to save RDB snapshots, but is currently not able to persist on disk. Commands that may modify the data set are disabled. Please check Redis logs for details about the error. (error) File "/home/wrk/opt/genenetwork2/lib/python2.7/site-packages/redis/connection.py", line 717, in read_response
2020-04-28settings: force SERVER_PORT to align with environment variablePjotr Prins
2020-04-28Added a script for a default runnerPjotr Prins
2020-04-28menuPjotr Prins
2020-04-27Added timeout for when/if it does the REST API query, so it doesn't hang ↵zsloan
indefinitely
2020-04-27Made change that should allow dataset structure to be loaded from Redis ↵zsloan
instead of the JSON file without breaking things
2020-04-26Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingPjotr Prins
2020-04-26Updated menuPjotr Prins
2020-04-26Merge master and testingmasterPjotr Prins
2020-04-26Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-26Updated default_settings to include default GN2 base urlzsloan
2020-04-26Removed the code that was still writing the database menu JSONzsloan
2020-04-26Merge pull request #382 from genenetwork/acentenoPjotr Prins
Acenteno
2020-04-26URL for finding servicesArthur Centeno
2020-04-26Merge branch 'stable' of https://github.com/genenetwork/genenetwork2 into stableArthur Centeno
2020-04-24Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
2020-04-24Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-24Replaced hard-coded instances of GN2 urls with ones pulled from settings filezsloan
2020-04-24Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
2020-04-24Merge pull request #381 from acenteno/testingzsloan
Add colleagues - credits link
2020-04-24Made a fix that should prevent the issue where new datasets cause an error ↵zsloan
when they're in search results
2020-04-23Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
2020-04-23Changed Trait to Marker for the stats table when the trait is a genotype traitzsloan
2020-04-23Fixed issue where covariates weren't being passed when zooming in or remappingzsloan
Added loading paage for zooming/remapping Added temporary option for checking mapping scale in .geno files
2020-04-23Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-22 21:46:57 +0000