Permalink
Commits on Feb 18, 2019
  1. Merge branch 'bo/responsive-footer'

    brianogilvie committed Feb 18, 2019
    MailChimp CSS fix
  2. Merge branch 'master' of git.generalassemb.ly:brianogilvie/ladybird i…

    brianogilvie committed Feb 18, 2019
    …nto bo/responsive-footer
    
    merge upstream changes
  3. Merge pull request #48 from brianogilvie/si/mediaQ

    brianogilvie committed Feb 18, 2019
    Si/media q
  4. Merge pull request #50 from brianogilvie/sf/sams-new-feature

    brianogilvie committed Feb 18, 2019
    cocktails comp updated
  5. Merge pull request #46 from brianogilvie/sf/sams-new-feature

    brianogilvie committed Feb 18, 2019
    Sf/sams new feature- Cocktails up and running
  6. Update README.md

    brianogilvie committed Feb 18, 2019
  7. Merge branch 'master' of git.generalassemb.ly:brianogilvie/ladybird

    brianogilvie committed Feb 18, 2019
    merging upstream changes
Commits on Feb 17, 2019
  1. Update Food.js

    brianogilvie committed Feb 17, 2019
    removed console.log statements
  2. Merge branch 'master' of git.generalassemb.ly:brianogilvie/ladybird

    brianogilvie committed Feb 17, 2019
    merging upstream changes
  3. Update Menus.css

    brianogilvie committed Feb 17, 2019
  4. Merge pull request #43 from brianogilvie/oc/rendering-food-data

    brianogilvie committed Feb 17, 2019
    Oc/rendered food data
  5. Update Blurb.css

    brianogilvie committed Feb 17, 2019
  6. Merge pull request #42 from brianogilvie/sf/sams-new-feature

    brianogilvie committed Feb 17, 2019
    update about page
  7. made menutitles wrap

    brianogilvie committed Feb 17, 2019
  8. Merge pull request #37 from brianogilvie/si/axios

    brianogilvie committed Feb 17, 2019
    Sandi's axios calls with lots of changes from Brian
  9. Update Menus.js

    brianogilvie committed Feb 17, 2019
  10. Update Food.js

    brianogilvie committed Feb 17, 2019
  11. Update Wine.js

    brianogilvie committed Feb 17, 2019
    Fixed indentation
    Fixed axois calls to have propper route and proper use of async/await without `.then`
  12. Update Menus.js

    brianogilvie committed Feb 17, 2019
    Fixed state to contain nothing but active menu
    fixed indentation to make it readable