aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-18Merge /home/zas1024/geneLei Yan
2013-12-18Add a coffee script file for correlation scatter plot function.Lei Yan
2013-12-17Added the option to choose which method to use for the intervalZachary Sloan
mapping function (pyLMM or qtl reaper)
2013-12-12Put the code that rebuilds the bar chart into a functionZachary Sloan
Still need to fix issue where attribute colors don't stay with their associated samples/strains
2013-12-11Got sort by name/value buttons working and committing before tryingZachary Sloan
to put some of the d3 code into a function
2013-12-11Got color by trait working, but still need to add a legend and makeZachary Sloan
some other small changes (like removing samples that don't overlap with the selected trait) Tentatively removed jquery-ui from base.html; I'm not sure if we're still using this anywhere, but removing it doesn't seem to have had an impact on the trait page
2013-12-05Now trims selected trait's values by the samples of the primary trait andZachary Sloan
gets their distinct values Created function that creates a dictionary of distinct values and their corresponding colors
2013-12-05Interval map graph now works properlyZachary Sloan
Tried to export trait data for "color by trait" function
2013-11-27Clicking a trait in "color by trait" now gets all of its sample valuesZachary Sloan
that will be used to color the bar graph
2013-11-27Can now view trait list of a collection after clicking the collectionZachary Sloan
in the modal that pops up after clicking "Color by Trait" above the bar chart
2013-11-26Made some progress towards getting the traits inside a collection to display ↵Zachary Sloan
on hover
2013-11-25Added HSNIH.json to ignore due to its sizeZachary Sloan
2013-11-25Merge branch 'temp'Zachary Sloan
2013-11-25Got the interval mapping results into a tableZachary Sloan
2013-11-22Add color pickerLei Yan
2013-11-22Did some work towards getting the interval mapping page workingZachary Sloan
2013-11-21Added apt-get dist-upgrade to notesZachary Sloan
2013-11-20Merge /home/zas1024/geneLei Yan
2013-11-20Created a box plotZachary Sloan
Made the bar chart use a gradient if colored by something with more than 6 distinct values Put figures in tabs under the Charts/Figures part of the trait page
2013-11-14Can change the parameters of Sample Correlation ScatterplotLei Yan
2013-11-05Merge /home/zas1024/geneLei Yan
Conflicts: wqflask/wqflask/templates/correlation_page.html
2013-11-05Add Correlation Scatter plotLei Yan
2013-11-01In the process of opening a modal with the collection page insideZachary Sloan
2013-11-01In the process of adding the function to color bar chart by theZachary Sloan
values of a trait in your collection
2013-11-01Merge /home/sam/geneZachary Sloan
2013-11-01Made the extra attribute bar chart coloring continue to workZachary Sloan
when the user sorts and gave the option to revert to no coloring
2013-10-31Refactored login code and got remember me workingSam
2013-10-31Implemented superuser and switching users for debugging purposesSam
2013-10-30More work on collectionsSam
2013-10-30Got coloring by attribute working for the bar chartZachary Sloan
2013-10-30In process on view.html for user_collectionsSam
2013-10-30Progress on user collectionsSam
2013-10-25Began working on color coding bar chart by extra attributesZachary Sloan
2013-10-24Added a dynamically resortable bar chart to the trait pageZachary Sloan
Improved the look/feel of the correlation page somewhat
2013-10-23Adding new collections worksSam
2013-10-22Bunch of work on collections and user managementSam
2013-10-17Sample objects are now passed to js_data for drawing the correlationLei Yan
scatter plot
2013-10-17Merge /home/zas1024/geneLei Yan
Conflicts: wqflask/wqflask/views.py
2013-10-17Added file for the correlation scatterplot and added the @appLei Yan
to views.py Added the link to the corr plot page to the correlation page template
2013-10-16Added interval_mapping to views.pyZachary Sloan
Made some more changes to interval_mapping.py
2013-10-16security code cleanupSam
2013-10-15Merge /home/zas1024/geneSam
2013-10-15Password reset now works...but needs some error checking stillSam
2013-10-15Before getting rid of query_string in DecodeUserSam
2013-10-15Changed templates to call the header macroZachary Sloan
Correlation page now works with Non-BXD (or whatever group) or All Samples options
2013-10-15* Redid mail sending service to set a ping showing it's aliveSam
* Redid server so it wouldn't start unless mail service recently pinged * Wrote a bunch of forgot password code * Refactored sending email about verification and forgotten passwords
2013-10-11Merge /home/sam/geneLei Yan
2013-10-11Merge /home/sam/geneZachary Sloan
2013-10-11Small changes around logging inSam
2013-10-11Merge /home/lei/geneZachary Sloan
Conflicts: wqflask/maintenance/quick_search_table.py