aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-29Merge branch 'cookie_sessions' of github.com:zsloan/genenetwork2 into ↵zsloan
development Conflicts: wqflask/base/data_set.py
2016-07-29Fixed a couple issues where you couldn't remove or add traits to user ↵zsloan
collections
2016-07-27Problem with phenotype traits should be fixed nowzsloan
2016-07-27Fixed problem with phenotype traits causing errorzsloan
Can now remove traits from collections and add to existing collections Fixed a few other minor collection bugs
2016-07-26Docs: genotypePjotr Prins
2016-07-21Doc: SNP handlingPjotr Prins
2016-07-20Changed anonymous collections to list of dictionaries instead of a ↵zsloan
dictionary of dictionaries Can now add collections, view list of collections, and view collections from the collection list with anonymous collections
2016-07-19Now correctly displays number of collections in top menu bar for non-logged ↵zsloan
in users
2016-07-18Merge branch 'cookie_sessions' of github.com:genenetwork/genenetwork2 into ↵zsloan
cookie_sessions
2016-07-18Now correctly displays existing collections in 'add to collection' dropdown menuzsloan
2016-07-18Merge pull request #171 from zsloan/cookie_sessionszsloan
Cookie sessions
2016-07-18Committing latest changes to anon collection stuff, but still need to fix ↵zsloan
some issues
2016-07-17Doc: genotype dataPjotr Prins
2016-07-16R/qtl: geno formatPjotr Prins
2016-07-16README: added infoPjotr Prins
2016-07-11Can now create a collection when not logged in (get to the view_collection ↵zsloan
page), though still need to fix the code that lets you change a collection or list collections
2016-07-08Docs: genotypingPjotr Prins
2016-07-06Committing current process on enabling multiple collections for users who ↵zsloan
aren't logged in, but doesn't work yet
2016-06-28Logger: disabled some noisy loggersPjotr Prins
2016-06-28Doc: Adding info on SQL usePjotr Prins
2016-06-26doc: ProbeFreeze and ProbeSetFreezePjotr Prins
2016-06-26gn_server: simplifyPjotr Prins
2016-06-26gn_server: simplifyPjotr Prins
2016-06-26gn_server: introduced one new query to fetch a dataset record and force ↵Pjotr Prins
fetch1 to return a tuple
2016-06-26Doc: info on JS wiring of tablesPjotr Prins
2016-06-26views: Reintroduce missing headersPjotr Prins
2016-06-26Resolve conflictsPjotr Prins
2016-06-24Removed function 'get_info' in trait.py that was never used and reomved ↵zsloan
'get_trait_info' call from search_result_page.py because its query was already being run
2016-06-24Fix redisPjotr Prins
2016-06-24Default to no-GN_SERVER for nowPjotr Prins
2016-06-24Log: and document SQL callsPjotr Prins
2016-06-23Logger: SQLPjotr Prins
2016-06-23Logger: SQLPjotr Prins
2016-06-23Logger: SQLPjotr Prins
2016-06-23Log: SQL queriesPjotr Prins
2016-06-23Add fetchall iteratorPjotr Prins
2016-06-23views: close db handlingPjotr Prins
2016-06-23Added fetching menu infoPjotr Prins
2016-06-23Removed dependency on dataset_menu_structure.jsonPjotr Prins
2016-06-23Logger: improved loggingPjotr Prins
2016-06-23Clean up database connector after sessionPjotr Prins
2016-06-23Logger: prettifyPjotr Prins
2016-06-23Fixed missing GN_SERVER_URLPjotr Prins
2016-06-23Fixed missing GN_SERVER_URLPjotr Prins
2016-06-23Pass GN_SERVER_URL into Javascript renderer of menuPjotr Prins
2016-06-23Settings: add GN_SERVER_URLPjotr Prins
2016-06-23Remove headersPjotr Prins
2016-06-23Added REST call for species_idPjotr Prins
2016-06-23Removed unused functionsPjotr Prins
2016-06-23DB: created fetch1 function which can do both SQL and GN_SERVERPjotr Prins