| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-05-06 | collection/view: bring buttons back | Artem Tarasov | |
| 2015-05-01 | Commented out imports of a few files that aren't used yet or stored in git | zsloan | |
| 2015-05-01 | Added Pjotr's latest pylmm changes | zsloan | |
| Added GEMMA and necessary plink-format genotype files in gemma directory Added the GEMMA genotype files to git LFS Removed some unnecessary/duplicated code from interval_mapping.py Separated GEMMA mapping code into its own file (will also do this for other methods) and fixed and issue that caused it to not run Added the table to the pair scan results page and wrote some code adding its attributes to each marker object, but it still isn't working yet | |||
| 2015-04-10 | Added git large file system (the .gitattributes files) and fixed an issue ↵ | zsloan | |
| where rat trait pages wouldn't work | |||
| 2015-04-06 | Added secure_server.py to gitignore and fixed conflicts for merging Lei's ↵ | zsloan | |
| new code | |||
| 2015-04-06 | Just committing a couple minor bug fixes to get code working after pulling ↵ | zsloan | |
| Pjotr's latest changes | |||
| 2015-04-06 | Merge branch 'master' of github.com:zsloan/genenetwork2 | zsloan | |
| 2015-04-06 | Removed the old news code before pulling over Lei's changes | zsloan | |
| Removed the SharingPage import from views since it doesn't exist anymore | |||
| 2015-04-06 | Merge pull request #3 from pjotrp/master | zsloan | |
| 0.50-gn2-pre1 | |||
| 2015-04-06 | Removed dataSharing directory and its files since they aren't being used, | zsloan | |
| but I should note that a couple of them were changed from GN1; I think that there was some attempt to implement this very early into GN2's development, but we'd probably be better off starting from scratch since a number of things have changed since then (such as the way we call queries) Removed the Singapore link from the mirrors section of the index page since it wasn't working | |||
| 2015-03-31 | Fixed some aesthetic issues on the main page and removed references to ↵ | zsloan | |
| TemplatePage | |||
| 2015-03-30 | Merge with zsloan master | Pjotr Prins | |
| 2015-03-27 | Changed HTMLPATH in webqtlConfig since I forgot to in the last commit (since ↵ | zsloan | |
| it used to point to the now-renamed 'web' directory). It obviously also needs to be renamed later, but I'll have to find every place that calls webqtlConfig.HTMLPATH first to do so. | |||
| 2015-03-27 | Removed everything from 'web' directory except genofiles and renamed the ↵ | zsloan | |
| directory to 'genotype_files' | |||
| 2015-03-26 | Removed several unused files from the base folder and their references in ↵ | zsloan | |
| other files | |||
| 2015-03-25 | Pair scan image now loads properly | zsloan | |
| 2015-03-24 | Merge branch 'master' of github.com:DannyArends/genenetwork2 | zsloan | |
| 2015-03-24 | Added pair scan to the marker_regression_page view | zsloan | |
| 2015-03-24 | Added back css directory/files | zsloan | |
| 2015-03-24 | Change back port location and home directory location; this should be in ↵ | zsloan | |
| external settings | |||
| 2015-03-24 | Updates to the templates | zsloan | |
| 2015-03-24 | Code updates to marker regression | zsloan | |
| 2015-03-24 | Removing the node.js + v8 code from the repository (this should be also ↵ | DannyArends | |
| removed in the history), this should not be here since its a dependency not code we want to maintain ourselves | |||
| 2015-03-23 | Minor update to get the pylmm code working on my instance of penguin | DannyArends | |
| 2015-03-23 | Updates to make GN2 work on my version of penguin (ports, and paths) | DannyArends | |
| 2015-03-23 | Adding my path to sys.path in pylmm | DannyArends | |
| 2015-03-23 | Merge branch 'master' of github.com:pjotrp/genenetwork2 | DannyArends | |
| 2015-03-20 | Merge branch 'master' of https://github.com/zsloan/genenetwork2 | Pjotr Prins | |
| 2015-03-19 | Removing mapmethod mapmodel from the coffeescript | DannyArends | |
| 2015-03-19 | testing some more | DannyArends | |
| 2015-03-19 | Print initial start_vars | DannyArends | |
| 2015-03-19 | Print wanted | DannyArends | |
| 2015-03-19 | Print for testing | DannyArends | |
| 2015-03-19 | Freaking comma ??? | DannyArends | |
| 2015-03-19 | Testing again | DannyArends | |
| 2015-03-19 | Updating the coffee script | DannyArends | |
| 2015-03-19 | Strungling with passing parameters | DannyArends | |
| 2015-03-19 | This is getting more and more annoying | DannyArends | |
| 2015-03-19 | This front to back passing of parameters is just weird | DannyArends | |
| 2015-03-19 | Name method is already taken | DannyArends | |
| 2015-03-19 | try last time, something is really weird between the front and the backend | DannyArends | |
| 2015-03-19 | Test/Debug | DannyArends | |
| 2015-03-19 | Adding the new options to views.py | DannyArends | |
| 2015-03-19 | Minor updates to the marker regression code for R/qtl, layout mostly | DannyArends | |
| 2015-03-19 | Receiving the chosen method and model in the python backend code | DannyArends | |
| 2015-03-19 | Adding the method and model option in the userinterface | DannyArends | |
| 2015-03-19 | Adding the method and model parameters of R/qtl so that we can have the user ↵ | DannyArends | |
| choose to use non-parametric QTL mapping, binary phenotypes, etc | |||
| 2015-03-18 | Begun adding pair scan option, fixed bug if no closest markers found | zsloan | |
| 2015-03-18 | Adding a fix to purge non-existing markers as covariates for the R/qtl analysis | zsloan | |
| 2015-03-18 | Merge branch 'pylmm0002' | Pjotr Prins | |
| Conflicts: wqflask/wqflask/my_pylmm/pyLMM/lmm.py | |||
 |
index : genenetwork2 | |
| GeneNetwork (2nd generation) |
| aboutsummaryrefslogtreecommitdiff |