aboutsummaryrefslogtreecommitdiff
path: root/wqflask
AgeCommit message (Collapse)Author
2020-05-07Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Danny Arends
testing
2020-05-06Merge pull request #390 from BonfaceKilz/build/use-guix-datatables-dependencyPjotr Prins
Build/use guix datatables dependency
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-06Put in TODOs for MariaDB query and Design MatrixDanny Arends
2020-05-06Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
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-06Replace CSS dependencies for datatablesBonfaceKilz
2020-05-05Use GUIX javascript Datatables packageBonfaceKilz
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-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-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-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-26Removed the code that was still writing the database menu JSONzsloan
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 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-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-23Removed a line that was excluding Macaque from the drop-downs (and thus from ↵zsloan
the JSON file causing an error in the global search)
2020-04-22Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-22Fixed a variety of issues related to users registering and logging inzsloan
GN2 should now work when Redis is empty
2020-04-21Update base.htmlacenteno
At the end of this text in the footer, it should read ....Jintao Wang, Robert W. Williams, and colleagues. We need to add Saunak Sen in the list right by Pjotr Prins. The link at the end to "colleagues" is broken.
2020-04-21Update views.pyacenteno
Add credits link
2020-04-21Create credits.htmlacenteno
Colleagues credit page
2020-04-21Update base.htmlacenteno
Fix footer colleagues link to credits
2020-04-21Update tutorials.htmlacenteno
Updated to v7
2020-04-21Update base.htmlacenteno
Change position to tutorials link
2020-04-21Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-21Update tutorials.htmlacenteno
Fix the title header
2020-04-21Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-04-21Create tutorials.htmlacenteno
Link to the actual power point presentation