aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-13Last commit didn't conflict for some reason, hopefully this one shouldzsloan
2018-04-13Resolved conflicts for pulling from testing branchzsloan
2018-04-12Merge pull request #315 from pjotrp/testingzsloan
README and docs
2018-04-12README and docsPjotr Prins
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-04Merge pull request #303 from pjotrp/testingzsloan
Minor edits and document on ES
2018-04-04Resolved conflict; previous commit didn't fully resolve itzsloan
2018-04-04Authentication: comments addedPjotr Prins
2018-04-04Resolved conflictszsloan
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-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
2018-03-30Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingPjotr Prins
2018-03-30Testing: removed test assertion (oops)Pjotr Prins
2018-03-30Fixes forgotten password error, see #257Pjotr Prins
2018-03-30Add --fail argument to test runnerPjotr Prins
2018-03-30Tests: all tests runPjotr Prins
2018-03-29Can now add markers to collection from mapping results pagezsloan
2018-03-29Resolved conflict in views.pyzsloan
2018-03-29Fixed box plots and got them to update with changed sample datazsloan
Removed fast correlation option because it doesn't work well with gunicorn Changed the type of logger from error to debug when logging which page is being visited in views.py
2018-03-29Merge pull request #297 from pjotrp/testingzsloan
Testing
2018-03-29Fixed gsearch blowout https://github.com/genenetwork/genenetwork2/issues/295Pjotr Prins
2018-03-29Type checking in its own filePjotr Prins
2018-03-29Search: improved regex and some debug infoPjotr Prins