aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-26Add functions to help handle github loginMuriithi Frederick Muriuki
* Add functions to help with the github OAuth2 login process
2018-03-26Add elasticsearch_tools moduleMuriithi Frederick Muriuki
* Collect variables and functions for using the elasticsearch system in a separate module.
2018-03-26Add client_id and client_secret configurationsMuriithi Frederick Muriuki
* Provide the OAuth2 client_id and client_secret values in configuration variables.
2018-03-26Add template elements for OAuth loginMuriithi Frederick Muriuki
* Add html elements that will be used to prompt users to login with either GitHub or ORCID.
2018-03-26Add configuration variables for external servicesMuriithi Frederick Muriuki
* Add configuration variables for GitHub and ORCID which will be used by the system to allow users to login.
2018-03-16Just undoing tabulator changes so I can push other changeszsloan
2018-03-15Changed appearance of mapping and correlation options on trait pagezsloan
Fixed issue where changed sample values were not passed to qtlreaper mapping ("Interval Mapping") Loading factors and their plot are hidden in situations where there's some error with calculating principal components Added GEMMA description and changed order of descriptions for mapping options on trait page
2018-03-02Added option to display selected covariates for GEMMA mappingzsloan
Changed layout/appearance of mapping options Partially fixed issue with deleting collections Changes to correlation table still in progress; having trouble getting tabulator to load JSON
2018-02-26Merge /home/lei/gene into testingzsloan
2018-02-26Committing some in-progress changes related to loading correlation page from ↵zsloan
JSON
2018-02-23update corr scatterplot interfaceLei Yan
2018-02-14Added empty collection error page to git, since it wasn't on productionzsloan
2018-02-13Resolved conflictzsloan
2018-02-13Just committing very minor change to correlation table so I can pull other ↵zsloan
changes
2018-02-13Merge pull request #285 from pjotrp/testingzsloan
@zsloan: we should introduce full parameter checking and sensible defaults
2018-02-13@zsloan: we should introduce full parameter checking and sensible defaults ↵Pjotr Prins
for every page we work on. It will help bug tracking. Probably fixes #279
2018-02-12Changed code parsing GEMMA output to fix issue where it wasn't getting the ↵zsloan
correct p-values
2018-02-12Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2018-02-12Quick parallel correlation should work, though I'm not sure why the code ↵zsloan
suddenly decided to start running it when it wasn't in the past. Switched correlation table to tabulator
2018-02-12Merge pull request #277 from pjotrp/gn-productionzsloan
Gn production
2018-02-11Added gunicorn pid so we can not run twicePjotr Prins
2018-02-11Using eventlet workerszsloan
2018-02-10Fix env variable $GEMMA_WRAPPER_COMMANDPjotr Prins
2018-02-10Fixing GEMMA LOCOPjotr Prins
2018-02-10Fixed finding PATHs - one return statement!Pjotr Prins
2018-02-10Check for bimbam path and bail out if it is missingPjotr Prins
2018-01-31Merge pull request #275 from pjotrp/pjotrzsloan
Added cli swith and set timeout to 3 minutes for gunicorn-dev mode
2018-01-31Startup: longer timeout for gunicorn-dev modePjotr Prins
2018-01-31Startup: added -cli optionPjotr Prins
2018-01-30Merge pull request #274 from pjotrp/pjotrzsloan
Add gunicorn support
2018-01-30gunicorn dev and prod modes addedPjotr Prins
2018-01-29Fixed gunicorn examplePjotr Prins
2018-01-29Gunicorn worksPjotr Prins
2018-01-29startup script: adapting for gunicornPjotr Prins
2018-01-29Added checks in startup script, removed r-auwerx pathPjotr Prins
2018-01-29Bumped versionPjotr Prins
2018-01-24Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2018-01-24Added links for markers in mapping results table when genotypes exist in DBzsloan
Added more info to trait details for phenotype traits Changed order of mapping methods Fixed layout of mapping loading screen to hopefully be centered on different screen sizes Improved layout of some elements in mapping results page
2018-01-04Merge pull request #270 from pjotrp/testingzsloan
Merge some older commits
2017-12-20Added submit_bnw even though it isn't working yet, just so views.py doesn't ↵zsloan
throw an error
2017-12-20Fixed issue that caused Mb ticks to get out of alignment for mapping figurezsloan
2017-12-20Fixed the way PLINK outputs phenotype files (though there's still some ↵zsloan
problem preventing it from working) Added some code related to new plotly probability plot, though it's commented out until it looks how I want it to Added some code for adding the BNW link to GN2, though it's not working yet Updated dataset menu structure JSON file
2017-12-20VERSIONPjotr Prins
2017-12-20tools: find path for JS and gemma_wrapperPjotr Prins
2017-12-20Bring in some earlier work - mostly documentation and startup handlingPjotr Prins
2017-12-06Fixed drop-down group orderzsloan
2017-12-04Fixed drop-down scripts to more appropriately deal with BXD300 groups ↵zsloan
(though there's still a minor issue with a few datasets) Added some header data to mapping output file Fixed links in Network Group nodes/edges
2017-11-22Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2017-11-22Added option to export csv of full mapping resultszsloan
2017-11-21Merge pull request #258 from lyan6/masterzsloan
improved scatter plots