aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-16Merge branch 'testing' of https://github.com/fredmanglis/genenetwork2 into ↵Pjotr Prins
testing
2018-04-16Remove statements that might be causing issuesMuriithi Frederick Muriuki
* I can't swear on this, but it seems the presence of these statements was causing elasticsearch to act weird.
2018-04-16login messages improvedPjotr Prins
2018-04-16Merge remote-tracking branch 'pjotrp/testing' into testingMuriithi Frederick Muriuki
2018-04-16Update mappings for Elasticsearch 6.2. Update loggerMuriithi Frederick Muriuki
* Update the indexes mappings to be compatible with the newer Elasticsearch 6.2.* series. Close the index before updating it, and reopen it after to help with the re-indexing of the data. * Update the error logger to include the exception that was thrown.
2018-04-16Docs on elasticsearch usePjotr Prins
2018-04-15Deactivate analysis of email_address fieldMuriithi Frederick Muriuki
* Prevent elasticsearch from analysing and tokenising the email_address field so as to avoid issue with getting back all email addresses with the same domain as the one being searched for.
2018-04-15Add tests for Forgot Password featureMuriithi Frederick Muriuki
* Add tests to ensure the "Forgot Password" feature works appropriately.
2018-04-15Use existing code. Delay after delete.Muriithi Frederick Muriuki
* Use existing code to get the elasticsearch connection. This should prevent tests from failing in case the way connections to elasticsearch are made change. * Delay a while after deleting to allow elasticsearch to re-index the data, thus preventing subtle bugs in the test.
2018-04-15Fix issue with indentationMuriithi Frederick Muriuki
* Ensure the return is at the correct indentation level so that it is executed correctly.
2018-04-13Check email provided on forgot passwordMuriithi Frederick Muriuki
* Ensure that the user actually provides an email address when they try to use the forgot password feature.
2018-04-13Fix logging in testsMuriithi Frederick Muriuki
* Use the LOG_LEVEL provided by the application settings to enable easy control of logging when running tests. It helps avoid a lot of verbosity when running tests.
2018-04-13Use single entry-point for testsMuriithi Frederick Muriuki
* Remove the run-integration-tests.py, and use the test-website.py as the entry point for all tests. This simplifies running the tests for the site.
2018-04-13Merge remote-tracking branch 'pjotrp/testing' into testingMuriithi Frederick Muriuki
2018-04-12README and docsPjotr Prins
2018-04-11Merge remote-tracking branch 'pjotrp/testing' into testingMuriithi Frederick Muriuki
2018-04-09Merge pull request #313 from pjotrp/testing-rm-TableToolszsloan
Remove TableTools.js
2018-04-07Dear @zsloan,Pjotr Prins
This patch removes TableTools. I don't think we use it. I have compared the look and feel of below pages and I see no difference. If that is correct we can simply ditch it by merging this PR. Note that if we are using such functionality this package is considered obsolete by the authors. According to https://datatables.net/extensions/tabletools/: This extension has now been retired and has been replaced by the Buttons and Select extensions. The documentation is retained for legacy reference only. New projects should use Buttons and Select in preference to TableTools. Moving Tabletools CSS --- a/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css +++ b/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css @@ -319,3 +319,8 @@ div.DTTT_collection a.DTTT_button { line-height: 20px; } +.no-sort::after { display: none!important; } +.no-sort { pointer-events: none!important; + cursor: default!important; +} + wqflask/wqflask/templates/correlation_matrix.html: <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" /> wqflask/wqflask/templates/collections/list.html: <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" /> wqflask/wqflask/templates/search_error.html: <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" /> wqflask/wqflask/templates/corr_scatterplot.html: <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" /> wqflask/wqflask/templates/pair_scan_results.html: <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" />
2018-04-06Merge pull request #311 from pjotrp/testing-rm-ValidationPluginzsloan
Testing rm validation plugin
2018-04-06Merge pull request #309 from pjotrp/testing-rm-bloatzsloan
Testing rm bloat
2018-04-06Removing use ValidationPlugin. See ↵Pjotr Prins
https://github.com/genenetwork/genenetwork2/issues/310
2018-04-06See #308.Pjotr Prins
Cytoscape and related is now loaded from Guix. Use the latest GN2_PROFILE.
2018-04-05Removed cytoscape - it is in GuixPjotr Prins
2018-04-05Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Muriithi Frederick Muriuki
testing
2018-04-04Merge pull request #303 from pjotrp/testingzsloan
Minor edits and document on ES
2018-04-04Authentication: comments addedPjotr Prins
2018-04-04ES: docPjotr Prins
2018-04-04Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2018-04-04Switched to plotly probability plotzsloan
Removed a variety of scripts that weren't being used on the trait page
2018-04-03Merge pull request #302 from pjotrp/testingzsloan
@acenteno added data upload scripts into main repo
2018-04-03@acenteno added data upload scripts into main repoPjotr Prins
2018-04-02Fixed link for staging serverzsloan
2018-04-02Fixed error that caused server to not start with new user codezsloan
2018-04-02Merge pull request #301 from pjotrp/testing-rm-bloatzsloan
Testing rm bloat (jqplot and ckeditor)
2018-04-02Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2018-04-02Just added link to staging branch to header barzsloan
2018-04-02Merge pull request #300 from pjotrp/testingzsloan
Testing
2018-04-02Version bumpPjotr Prins
Config files are store in https://github.com/genenetwork/gn-deploy-servers repo
2018-04-02Testing moved to PythonPjotr Prins
2018-04-02Testing moved to PythonPjotr Prins
2018-04-02Config files are store in https://github.com/genenetwork/gn-deploy-servers repoPjotr Prins
2018-04-02Remove filePjotr Prins
2018-04-02User manager no longer uses SQLPjotr Prins
2018-04-02js: rm ckeditor - need to replacePjotr Prins
2018-04-02js: removed jqplotPjotr Prins
2018-04-02user_session add outputPjotr Prins
2018-03-31Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Muriithi Frederick Muriuki
testing * Fix conflicts
2018-03-30Collections: use logging instead of print (@zsloan)Pjotr Prins
2018-03-30Fixes related to E-mail forgotten passwordPjotr Prins
2018-03-30Fixes related to E-mail forgotten passwordPjotr Prins