Skip to content
Permalink
Branch: master
Commits on Apr 22, 2017
  1. Filter by rating (#180)

    hermzz authored and RyanNoelk committed Apr 22, 2017
    * Sets timezones for fixture dates, and ratings
    
    * Allows API to filter by rating, with unit tests
    
    * Frontend filters by rating
    
    * Fixes
Commits on Mar 14, 2017
  1. Refactors /browse page (#140)

    hermzz authored and RyanNoelk committed Mar 14, 2017
    Refactors the code to make it a bit more React/Flux-like. Creates
    a BrowseActions class to generate dispatches and call the API.
    The Recipe and Filter (Course and Cuisine) stores listen to dispatches
    and updates the data after API calls.
  2. Translates grocery list strings to spanish (#164)

    hermzz authored and RyanNoelk committed Mar 14, 2017
Commits on Feb 23, 2017
  1. Merge pull request #142 from RyanNoelk/fix/json-header

    hermzz committed Feb 23, 2017
    Adding back json request in the api calls
  2. New logo and recipe images (#141)

    hermzz authored and RyanNoelk committed Feb 23, 2017
    Also makes the image in the recipe boxes clickable.
Commits on Feb 20, 2017
  1. Shows filter totals in browse sidebar (#137)

    hermzz authored and RyanNoelk committed Feb 20, 2017
    * Rather than matching cuisine and course filters by title
      we're matching them by slug, which will be url-safer.
    * No point in having a `?format=json` when we can just use
      the application type header
Commits on Feb 17, 2017
  1. Merge pull request #135 from RyanNoelk/fix/add-core-css

    hermzz committed Feb 17, 2017
    adding core css file and loading
  2. Rating fixes (#129)

    hermzz authored and RyanNoelk committed Feb 17, 2017
    * Stops from overwriting rating if no value is set
    
    When PATCH-ing the photo data there is no rating set
    and so the value gets set to the default 0. This isn't
    right, so let's let the ORM set the value to 0 when
    creating a recipe and otherwise leave it to whaveter
    it was before when updating if no rating is provided.
    
    * Checks to make sure we're uploading an image
    
    When editing a recipe that already has a photo the data.photo
    field is populated with the URL of the image. If we're actually
    uploading an image it'll be a "File" object instead.
    
    * Limits rating value when creating recipes
  3. About page and credits (#126)

    hermzz authored and RyanNoelk committed Feb 17, 2017
    * Removes about page
    
    * Points footer credit to GitHub repo
Commits on Feb 16, 2017
Commits on Feb 15, 2017
Commits on Feb 13, 2017
Commits on Feb 10, 2017
  1. Loads Bootstrap as SASS (#115)

    hermzz authored and RyanNoelk committed Feb 10, 2017
Commits on Feb 8, 2017
  1. Redesigns the recipe page (#112)

    hermzz authored and RyanNoelk committed Feb 8, 2017
Commits on Feb 5, 2017
Commits on Feb 2, 2017
  1. Merge pull request #100 from hermzz/refactor-formcomponents

    hermzz committed Feb 2, 2017
    Refactors recipe form components
  2. Merge pull request #102 from hermzz/fix-recipe-sidebar-content-loading

    hermzz committed Feb 2, 2017
    Fixes loading of recipe content after clicking sidebar link
Commits on Feb 1, 2017
  1. Fixes DJANGO_SECRET_KEY typo (#107)

    hermzz authored and RyanNoelk committed Feb 1, 2017
  2. Makes tags optional (#103)

    hermzz authored and RyanNoelk committed Feb 1, 2017
Commits on Jan 31, 2017
Commits on Jan 30, 2017
  1. Shows default image in the frontend (#91)

    hermzz authored and RyanNoelk committed Jan 30, 2017
    * Shows default image in the frontend
    
    * Removes api/base/management folder
Commits on Jan 27, 2017
Commits on Jan 26, 2017
  1. Merge pull request #88 from RyanNoelk/feature/recipe-ing-reorder

    hermzz committed Jan 26, 2017
    Reordering ingredient list
Commits on Jan 25, 2017
Commits on Jan 24, 2017
  1. Allows access to `node` for docker support (#84)

    hermzz authored and RyanNoelk committed Jan 24, 2017
    Using docker we need to allow access from the `node` container.
Commits on Jan 23, 2017
  1. Removes edit() from RecipeActions (#75)

    hermzz authored and RyanNoelk committed Jan 23, 2017
Commits on Jan 20, 2017
  1. Translates edit recipe button (#68)

    hermzz authored and RyanNoelk committed Jan 20, 2017
Commits on Jan 18, 2017
Older
You can’t perform that action at this time.