aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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/testing...Fixing loading of the ITP data as a 4way crosszsloan
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 http://gn2-test3.ge...Danny Arends
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:... 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 penguin2Pjotr Prins
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 inde...zsloan
2020-04-27Made change that should allow dataset structure to be loaded from Redis inste...zsloan
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/acenteno...AcentenoPjotr Prins
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/testing...Add colleagues - credits linkzsloan
2020-04-24Made a fix that should prevent the issue where new datasets cause an error wh...zsloan
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 remapping...Added loading paage for zooming/remapping Added temporary option for checking mapping scale in .geno files zsloan
2020-04-23Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
2020-04-23Removed a line that was excluding Macaque from the drop-downs (and thus from ...zsloan
2020-04-23IgnorestablePjotr Prins
2020-04-23Merge branch 'stable' of github.com:genenetwork/genenetwork2 into stableGN2 Website
2020-04-23DocsPjotr Prins
2020-04-22Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
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 in...GN2 should now work when Redis is empty zsloan
2020-04-21Update base.html...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.acenteno
2020-04-21Update views.py...Add credits linkacenteno
2020-04-21Create credits.html...Colleagues credit pageacenteno
2020-04-21Update base.html...Fix footer colleagues link to creditsacenteno
2020-04-21Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEADGN2
2020-04-21Merge pull request #380 from acenteno/testing...Arrange tutorials new position and update ppt link to version 7zsloan
2020-04-21Update tutorials.html...Updated to v7acenteno
2020-04-21Update base.html...Change position to tutorials linkacenteno