Skip to content

Reyna/search filter#6

Open
reynabiyo20 wants to merge 53 commits into
LaunchCodeLiftoffProjects:masterfrom
mthreec1983:Reyna/Search-filter
Open

Reyna/search filter#6
reynabiyo20 wants to merge 53 commits into
LaunchCodeLiftoffProjects:masterfrom
mthreec1983:Reyna/Search-filter

Conversation

@reynabiyo20

Copy link
Copy Markdown
Collaborator

Hi! Kindly review this branch- (filter by category) . Thank you for your help :)

Oksana999 and others added 30 commits December 7, 2020 13:47
Starting to work on saving recipes for users
# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/templates/fragments.html
# Conflicts:
#	src/main/resources/templates/recipes/display.html
Oksana999 and others added 21 commits December 21, 2020 23:38
# Conflicts:
#	src/main/java/org/launchcode/recipeapp/controllers/RecipeController.java
#	src/main/java/org/launchcode/recipeapp/models/UserRecipe.java
#	src/main/resources/static/css/rating.css
#	src/main/resources/templates/fragments.html
#	src/main/resources/templates/recipes/display.html
…rch-filter

# Conflicts:
#	src/main/java/org/launchcode/recipeapp/AuthenticationFilter.java
#	src/main/java/org/launchcode/recipeapp/controllers/HomeController.java
#	src/main/java/org/launchcode/recipeapp/models/Recipe.java
#	src/main/resources/templates/fragments.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants