forked from CMPUT301W13T06/classproject
-
Notifications
You must be signed in to change notification settings - Fork 0
Elasticsearch #3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gptrinh
wants to merge
28
commits into
gptrinh:brianmerged
Choose a base branch
from
f2prateek:elasticsearch
base: brianmerged
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… available ASAP. Note: Recipe Class modified for the database support, the advanced features can be added later.
Database Added, comments will be added later I just wanted to make it av...
Pantry fragment
DbHelper: some comments added
Revert commits that break the build.
Clean up
View Pager in MainActivity
This also makes some changes to our model. Photos will be stored as Uri's. This way we can have multiple sources (say file or network location) with the same strucutre, and have the Uri's handle diffeeneitation betwene the two for us.
by Ethan, just refactored from https://github.com/ethanmykytiuk/classproject/blob/pantry-fragment/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java Couldn't figure out the rebasing.
Add Pantry list - by @ethanmykytiuk closes 43
Recipe Activity by @btrinh1
Also adds fest assertions.
Add Update Recipe
Refactor search by name
Add another test, making sure we get only results we want Test case for searching by multiple Ingredients
This lets us search recipes from ingredients in two ways : 1. Recipes that have ALL of the ingredients. 2. Recipes that have ANY of the ingredients.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.