aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-11Merge branch 'pjotr-gn2' into testingPjotr Prins
2016-10-09Handle VERSION on different pagesPjotr Prins
2016-10-09Merge branch 'mechanize' into testingPjotr Prins
2016-10-09Revert on Zach tabs and trailing spacesPjotr Prins
2016-10-09Tests: change optionsPjotr Prins
2016-10-09CTL: show correct # of phenotypes also in results pagePjotr Prins
2016-10-09Add version informationPjotr Prins
2016-10-09Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloanPjotr Prins
2016-10-09Changed mirrors & affiliates on wqflask/wqflask/templates/index_page_orig.htmlPjotr Prins
2016-10-09Merge branch 'twitter' into pjotr-gn2Pjotr Prins
2016-10-09Merge branch 'testing' into twitterPjotr Prins
2016-10-09Changed mirrors & affiliates on wqflask/wqflask/templates/index_page_orig.htmlPjotr Prins
2016-10-09Added links to base.htmlPjotr Prins
2016-10-07Removed qtlreaper code from marker_regression and moved it to a separate file.zsloan
Fixed CTL template to display correct number of traits (previously it would display 1 fewer than you selected).
2016-10-07Make sure JS path existsPjotr Prins
2016-10-07Twitter: added news list to search pagePjotr Prins
2016-10-07Tweets on main page are workingPjotr Prins
2016-10-07Add JS path to TWITTER_POST_FETCHERPjotr Prins
2016-10-07Changed error outputPjotr Prins
2016-10-07Saner handling of TMPDIR and TEMPDIRPjotr Prins
Throw error when TMPDIRs are not writable
2016-10-07Startup script: add profile to the PATH and set LC_ALL to default to C ↵Pjotr Prins
(should be changed some day)
2016-10-06URLs: replaced non-functioning URLsPjotr Prins
2016-10-06Footer: updating URLsPjotr Prins
2016-10-06Do not open new page in browser on URLPjotr Prins
2016-10-06Removed dead URLPjotr Prins
2016-10-06URL: replaced dead Memphis URL with current GN2 machinePjotr Prins
2016-10-06URL: prevent opening new pagesPjotr Prins
2016-10-06URL: updated Amigo reference on front pagePjotr Prins
2016-10-06URLs: update GO database URL and removed opening new browser pagesPjotr Prins
2016-10-06Logger: add more granular debug messagesPjotr Prins
2016-10-06Merge branch 'master' of github.com:genenetwork/genenetwork2 into mechanizePjotr Prins
2016-10-06CTL requires 2 traits minimally. Also use traits/phenotypes consistentlyPjotr Prins
2016-10-05CTL now displays proper error if fewer than 4 traits are selected. Also, ↵zsloan
WGCNA previously incorrectly gave an error when fewer than 5 traits were selected instead of fewer than 4 (because it said '<= 4'). I also improved the formatting for the html for both CTl and WGCNA Analysis.
2016-10-05Show datasets only on debugPjotr Prins
2016-10-05Minor editPjotr Prins
2016-10-05Reverted on genotype selector on page show_trait_mapping_tools.html - ↵Pjotr Prins
pending the full PR
2016-10-05Tests: Mapping tests pass nowPjotr Prins
2016-10-05print statements should be loggerPjotr Prins
2016-10-05print statements should be loggerPjotr Prins
2016-10-05Testing: show --all optionPjotr Prins
2016-10-05Merge branch 'zsloan' into jsonPjotr Prins
2016-10-05Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloanPjotr Prins
2016-10-05Doc: on testing with Mechanical RobPjotr Prins
2016-10-04Fixed issue that caused adding to existing collections when not logged in to ↵zsloan
not work correctly. The problem was that it would get the collection name from the "new_collection" field instead of the "existing_collections" dropdown.
2016-10-04Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloanPjotr Prins
2016-10-03Merge branch 'master' of github.com:genenetwork/genenetwork2zsloan
2016-10-03Fixed problem that caused R/qtl with permutations to not work correctlyzsloan
2016-10-03Moved rqtl mapping code out of marker_regression and into its own file.zsloan
Later we will want to run all mapping methods outside of the web server, though
2016-10-03Use of GN2_PROFILEPjotr Prins
2016-10-03Config: supporting JSON OVERRIDESPjotr Prins