summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-12-14Merge pull request #30 from tuckerevans/recipe_card_cssHEADmastergatelyjm
2019-12-14Fix recipe cards are now three wide w/ max widthTucker Evans
2019-12-14Fix changes made for demoTucker Evans
2019-12-12Merge pull request #29 from tuckerevans/fixed-editTucker Evans
2019-12-12fixed stuffschencej
2019-12-12Merge pull request #28 from tuckerevans/elimTucker Evans
2019-12-12Merge pull request #27 from tuckerevans/cart_update_ingredientsschencej
2019-12-12Merge pull request #26 from tuckerevans/edit_pass_recipeschencej
2019-12-12added main pageschencej
2019-12-12Fix Ingredients can now be removed from cartTucker Evans
2019-12-12merged with masterschencej
2019-12-11got rid of commented linesschencej
2019-12-11added styling to cook pagesschencej
2019-12-11Fix use passService for recipe to editTucker Evans
2019-12-11Merge pull request #25 from tuckerevans/importsTucker Evans
2019-12-11Add routing and imports for shopping cartChris Undercoffer
2019-12-11Merge pull request #24 from tuckerevans/ingredient_addchrisundercoffer
2019-12-11Merge pull request #23 from tuckerevans/shoppingcartTucker Evans
2019-12-11Fix units form control nameTucker Evans
2019-12-11Fix adding ingredientsTucker Evans
2019-12-11add shoppingcart base functionalityChris Undercoffer
2019-12-10Fix add AddRecipeComponent to importsTucker Evans
2019-12-10Merge pull request #22 from tuckerevans/elimTucker Evans
2019-12-10Merge branch 'master' into elimTucker Evans
2019-12-10Fix removes testing value for timeLeft on step-cardTucker Evans
2019-12-10Revert steps.instructions -> step.instructionTucker Evans
2019-12-10fixed recipe pass serviceschencej
2019-12-10added ingredient scaling and styling to pre cook pageschencej
2019-12-10added funcitonality to cook-pageschencej
2019-12-10Merge pull request #21 from tuckerevans/top_barschencej
2019-12-10Merge branch 'master' into top_barschencej
2019-12-10Merge pull request #20 from tuckerevans/edit-pageschencej
2019-12-10Merge pull request #18 from tuckerevans/add_pageschencej
2019-12-10Merge pull request #17 from tuckerevans/backend_jsonschencej
2019-12-10Add edit-recipe form/pageTucker Evans
2019-12-10Fix blank tags/photos not added to RecipeTucker Evans
2019-12-10Fix intructions -> intruction for backend jsonTucker Evans
2019-12-10Add toolbar to main app templateTucker Evans
2019-12-09Merge pull request #19 from tuckerevans/elimTucker Evans
2019-12-09Fix array indexing of formData.stepsTucker Evans
2019-12-09Add routing to main page after sumbittingTucker Evans
2019-12-09Merge branch 'master' of https://github.com/tuckerevans/recipe_buddy into elimschencej
2019-12-09added pre cooking pageschencej
2019-12-09added additional functionality to cook pageschencej
2019-12-09made all data model member variables publicschencej
2019-12-09Fix ingredient unit type to be same across frontend & backendTucker Evans
2019-12-09Merge pull request #16 from tuckerevans/backend_readme_updateTucker Evans
2019-12-09Merge branch 'master' into shoppingcartChris Undercoffer
2019-12-09Merge pull request #14 from tuckerevans/add_pagechrisundercoffer
2019-12-09Fix backend readme to have correct JSON schemaTucker Evans