aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-09merge testingAlexander Kabui
2020-12-09Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexander Kabui
replace-images
2020-12-09Merge pull request #520 from Alexanderlacuna/replace-plotlyBonfaceKilz
Replace plotly lib
2020-12-09Merge branch 'testing' into replace-plotlyBonfaceKilz
2020-12-09Merge pull request #519 from Alexanderlacuna/replace-ckeditorBonfaceKilz
Replace ckeditor
2020-12-09Merge branch 'testing' into replace-ckeditorBonfaceKilz
2020-12-09Merge pull request #517 from Alexanderlacuna/replace-jszipBonfaceKilz
Replace jszip lib
2020-12-09Merge branch 'testing' into replace-jszipBonfaceKilz
2020-12-09Merge pull request #516 from Alexanderlacuna/replace-jscolorBonfaceKilz
Replace jscolor lib
2020-12-09Merge branch 'testing' into replace-jscolorBonfaceKilz
2020-12-09Merge pull request #515 from Alexanderlacuna/replace-datatableBonfaceKilz
Replace datatable libs
2020-12-09Merge branch 'testing' into replace-datatableBonfaceKilz
2020-12-09Merge pull request #514 from Alexanderlacuna/replace-colorboxBonfaceKilz
Replace colorbox lib
2020-12-09Merge branch 'testing' into replace-colorboxBonfaceKilz
2020-12-08Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-12-08Added hover text for BNW buttonszsloan
2020-12-08Merge pull request #511 from Alexanderlacuna/replace-nouisliderBonfaceKilz
Replace nouislider lib
2020-12-08Merge branch 'testing' into replace-nouisliderBonfaceKilz
2020-12-08Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-12-08Show the total number of markers in the mapping results table instead of ↵zsloan
just the trimmed number
2020-12-08Merge pull request #510 from Alexanderlacuna/replace-purescript-genome-browserBonfaceKilz
Replace purescript genome browser
2020-12-08resolve conflictAlexander Kabui
2020-12-08Merge branch 'testing' into replace-purescript-genome-browserBonfaceKilz
2020-12-08Merge pull request #506 from Alexanderlacuna/replace-cytoscapeBonfaceKilz
Replace cytoscape,cytoscape-panzoom,cytoscape-qtip libs
2020-12-08Merge branch 'testing' into replace-cytoscapeBonfaceKilz
2020-12-08add d3-tip.css to mechanical robAlexander Kabui
2020-12-08replace d3-tip css in templatesAlexander Kabui
2020-12-08remove duplicate libsAlexander Kabui
2020-12-08remove duplicate lib in templates/base.htmlAlexander Kabui
2020-12-08add jszip to mechanical robAlexander Kabui
2020-12-08add jquery.colorbox-min.js to mechanical robAlexander Kabui
2020-12-08add jquery.datatables css to mechanical robAlexander Kabui
2020-12-08add datatablejquery to mechanical robAlexander Kabui
2020-12-08scroller.dataTables.min.js to mechanical robAlexander Kabui
2020-12-08add jscolor to mechanical robAlexander Kabui
2020-12-08add datatable images to mechanical robAlexander Kabui
2020-12-08add plotly.min.js to mechanical robAlexander Kabui
2020-12-08replace plotly js in templatesAlexander Kabui
2020-12-08add nouislider.js to mechanical-robAlexander Kabui
2020-12-08add nouislider.min.css to mechanical-robAlexander Kabui
2020-12-08add purescript-genetics-browser.cssAlexander Kabui
2020-12-08add purescript-genetics-browser.js to mechanical robAlexander Kabui
2020-12-08add ckeditor to mechanical robAlexander Kabui
2020-12-07Merge pull request #508 from zsloan/feature/toggle_cols_trait_pagezsloan
Added option to toggle columns on show_trait page, including case att…
2020-12-07Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-12-07Fixed issue where the correlation scatterplot link wasn't being displayed ↵zsloan
after the recent correlation table changes Fixed issue where the Sample p(r/rho) sort wasn't sorting using scientific notation, which resulted in the initial sort being bad
2020-12-07Changed the logic in create_trait so that permissions should always be set, ↵zsloan
and added an assert that 'name' is passed instead of using if/else, since it should always be passed
2020-12-07add ↵Alexander Kabui
cytocape.min.js,cytoscape-panzoom.js,cytoscape.js-panzoom.css,cytoscape-qtip.js to mechanical rob
2020-12-07Merge branch 'replace-datatatable-jquery' into replace-datatable-scrollerAlexander Kabui
2020-12-07add buttons.datatables cssAlexander Kabui