Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Kayla Ecker - Caret #36

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Kayla Ecker - Caret #36

wants to merge 24 commits into from

Commits on Oct 30, 2017

  1. initial setup, including env

    Kayla Ecker authored and Kayla Ecker committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    b01d48b View commit details
    Browse the repository at this point in the history

  2. bundle install

    Kayla Ecker authored and Kayla Ecker committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    f4e8591 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. added controller for recipe

    Kayla Ecker authored and Kayla Ecker committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    c7d2e72 View commit details
    Browse the repository at this point in the history

  2. changed position of dotenv in gemfile

    Kayla Ecker authored and Kayla Ecker committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    8f65994 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from KaylaEcker/view 

    View
    @kaylaeckergoog
    kaylaeckergoog authored Oct 31, 2017
    Configuration menu
    Copy the full SHA
    a57d45b View commit details
    Browse the repository at this point in the history

  4. added httparty to bundle

    Kayla Ecker authored and Kayla Ecker committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    ee1770f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. added api and show

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    3f5c5d4 View commit details
    Browse the repository at this point in the history

  2. added background image and white text

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    fbabb1a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'api' of https://github.com/KaylaEcker/api-muncher into … 

    …styling
    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    3458d21 View commit details
    Browse the repository at this point in the history

  4. added white to links

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    702462b View commit details
    Browse the repository at this point in the history

  5. recipe now opens in a new tab

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    27cf2c1 View commit details
    Browse the repository at this point in the history

  6. added gem for pagination

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    b90bbcc View commit details
    Browse the repository at this point in the history

  7. paginate pages

    Kayla Ecker authored and Kayla Ecker committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    f385556 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2017

  1. background on main page updated to fit

    Kayla Ecker authored and Kayla Ecker committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    d55da21 View commit details
    Browse the repository at this point in the history

  2. added flash and footer

    Kayla Ecker authored and Kayla Ecker committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    7dee581 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2017

  1. re-ordered things. need a designer.

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    739571b View commit details
    Browse the repository at this point in the history

  2. added christmas background to detract from blandness of site

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    9b322da View commit details
    Browse the repository at this point in the history

  3. changed footer so it stays on bottom of all pages

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    c039e2b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/KaylaEcker/api-muncher

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    439643b View commit details
    Browse the repository at this point in the history

  5. attempt to deploy heroku

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    c9163b7 View commit details
    Browse the repository at this point in the history

  6. beginner testing/yml

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    38ee209 View commit details
    Browse the repository at this point in the history

  7. passing tests for controller/recipe

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    564257d View commit details
    Browse the repository at this point in the history

  8. testing for wrapper passing

    Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    545f303 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from KaylaEcker/testing 

    Testing
    @kaylaeckergoog
    kaylaeckergoog authored Nov 6, 2017
    Configuration menu
    Copy the full SHA
    e44dde4 View commit details
    Browse the repository at this point in the history