Working on survey tables
Merge remote-tracking branch 'upstream/develop' into data_sharing
Modified consent service so that data sharing is implemented. It was already implemented on the DAO level, just not run through the service.
withdrawConsent did not return user, so we did not save this information to the session. Corrected this bug.
Added consent controller test. Updated consent controller to start data sharing by default when giving consent (this seems like desired behavior). Updated front end such that a user can now suspend and resume data sharing (as soon as a default study consent is added by Eric. Right now it doesnt actually work. But it does in theory).
Merge remote-tracking branch 'upstream/develop' into data_sharing
Added type property to all the models. The type property is the just the class name of the model (e.g. Study.javas type is "Study")
Saving off the machine; very much in progress.
added date model.
made some changes to dates. Created a date model, which accepts a timestamp and then reorganizes it into various shapes.
Made changes to implement the ISO 8601 standard. Still needs some work to get tests to pass again.
Fixed so all tests are now passing
changed the front end to send iso strings instead of longs for time.
made changes to front end to support new api about iso strings.
Merge branch 'add_type_prop_to_JSON' into develop
Merge branch 'data_sharing' into develop
completed merge.
After merging all recent features, had to fix the tests.
merged erics backfill and consent changes into my current branch.
fixed failing tests.