Merge branch 'elasticsearch', remote-tracking branch 'origin/master' into elasticsearch
Merge branch 'master' of https://github.com/jessicayuen/CMPUT301T13 into elasticsearch
Merge branch 'master' of https://github.com/jessicayuen/CMPUT301T13 into elasticsearch
Implemeted EmailSender functionality and added class JSSEProvider
Used EmailSender in DisplayRecipeActivity and set user email settings in
Main
Added a line in the Manifest to support email and comments in Email
Sender
added ability to add ingredients
Merge branch 'master' of ssh://git@github.com/jessicayuen/CMPUT301T13.git
commented out a bug
Implemented functionality to display recipe information for
DisplayRecipeActivity (missing gallery still)
updated MIA.activity (cannot delete more than 1 ingredient at once)
added something
added changes to create recipe xml and found a bug
fixed the bug found
Fixed displaying information issues with DisplayRecipeActivity
fixed deletion functionality
Added TakePhotoActivity
Revert previous commit.... (Android has a built in intent for taking
pictures)
Updated UUID to be returned as string and initialized with bytes given
by name and author.
made general layout for SearchResultsActivity updated MIA.java and xml
for it