aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-26Add SMTP configuration variablesMuriithi Frederick Muriuki
* Add configuration variables to enable the system connect to the configured SMTP server to send out emails.
2018-03-26Fix conflictPjotr Prins
2018-03-26Fail safely if elasticsearch is down or unconfiguredMuriithi Frederick Muriuki
* If elasticsearch server is down, or the configuration variables are not provided at startup or in a configuration file, then do not allow the system to simply crash, but instead, inform the user that they cannot use the services that depend on elasticsearch to be running.
2018-03-26Set to None if no value providedMuriithi Frederick Muriuki
* Add a method to set the configuration variables to None if the configuration values are not provided at startup or in the configuration files. The system already checks for these values, and if they are absent, it simply fails to display the OAuth service as available for use to login.
2018-03-26Use elasticsearch rather than mysql for local accountsMuriithi Frederick Muriuki
* Register local accounts onto elasticsearch rather than mysql. * Login from the accounts on elasticsearch * Harmonise local and oauth2 logins to use the same code.
2018-03-26Add OAuth2 login code for ORCIDMuriithi Frederick Muriuki
* Add code to handle the login via ORCID
2018-03-26Update configurationsMuriithi Frederick Muriuki
* Have the authorisation URLs build up from the client id and client secret values.
2018-03-26Add code to enable OAuth2 loginMuriithi Frederick Muriuki
* Add some code to handle the login if the user chooses to login via GitHub or ORCID.
2018-03-26Delay after save for indexingMuriithi Frederick Muriuki
* Elasticsearch need a short delay after adding document for it to index the document for subsequent access.
2018-03-26Add more configuration variables.Muriithi Frederick Muriuki
* Add configurations for elasticsearch and github.
2018-03-26Add save_user() functionMuriithi Frederick Muriuki
* On successful login via OAuth2, save the details of the user in elasticsearch store, to avoid hitting the external provider for the basic details.
2018-03-26Add elasticsearch module to the pathMuriithi Frederick Muriuki
* Add some code to set up the path for the python-elasticsearch module.
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