Kayla Ecker - Caret#36

Open

kaylaecker wants to merge 24 commits into

Ada-C8:masterfrom

kaylaecker:master

Commits on Oct 30, 2017

initial setup, including env

Kayla Ecker
authored and
Kayla Ecker
committed
bundle install

Kayla Ecker
authored and
Kayla Ecker
committed

Commits on Oct 31, 2017

added controller for recipe

Kayla Ecker
authored and
Kayla Ecker
committed
changed position of dotenv in gemfile

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #1 from KaylaEcker/view
kaylaeckergoog
authored
added httparty to bundle

Kayla Ecker
authored and
Kayla Ecker
committed

Commits on Nov 3, 2017

added api and show

Kayla Ecker
authored and
Kayla Ecker
committed
added background image and white text

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'api' of https://github.com/KaylaEcker/api-muncher into styling

Kayla Ecker
authored and
Kayla Ecker
committed
added white to links

Kayla Ecker
authored and
Kayla Ecker
committed
recipe now opens in a new tab

Kayla Ecker
authored and
Kayla Ecker
committed
added gem for pagination

Kayla Ecker
authored and
Kayla Ecker
committed
paginate pages

Kayla Ecker
authored and
Kayla Ecker
committed

Commits on Nov 5, 2017

background on main page updated to fit

Kayla Ecker
authored and
Kayla Ecker
committed
added flash and footer

Kayla Ecker
authored and
Kayla Ecker
committed

Commits on Nov 6, 2017

re-ordered things. need a designer.

Kayla Ecker
authored and
Kayla Ecker
committed
added christmas background to detract from blandness of site

Kayla Ecker
authored and
Kayla Ecker
committed
changed footer so it stays on bottom of all pages

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' of https://github.com/KaylaEcker/api-muncher

Kayla Ecker
authored and
Kayla Ecker
committed
attempt to deploy heroku

Kayla Ecker
authored and
Kayla Ecker
committed
beginner testing/yml

Kayla Ecker
authored and
Kayla Ecker
committed
passing tests for controller/recipe

Kayla Ecker
authored and
Kayla Ecker
committed
testing for wrapper passing

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #2 from KaylaEcker/testing
kaylaeckergoog
authored