changes
Merge branch 'master' of git://github.com/isenseDev/rSENSE into collapseBox
working on users page
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
changes
Merge branch 'master' of git://github.com/isenseDev/rSENSE
changed up some of the javascript on the experiment store page
Changes from last week
Changes from last week
Commented Experiments.js.coffee
commits from friday
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentStore
Almost fully implemented isotope stuff
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentStore
pre pull
Merge branch 'master' of git://github.com/isenseDev/rSENSE into HM_Toggle_Create
Created a new User, Experiment, and ExperimentSession and tested that all the default fields were set to their correct defaulted values. Additionally, I created an experiment, experiment session, and user fixture and tested that the fields in the fixtures were correctly set.
Modified fixture files to include valid data for testing for experiments, experiment sessions, and users.
Toggles visibilty of create data set box when deleting fields
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentStore