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

Added "find" option that allows for regex searching in recipebook #123

Merged
merged 16 commits into from
Oct 17, 2020
Merged

Added "find" option that allows for regex searching in recipebook #123

merged 16 commits into from
Oct 17, 2020

Commits on Sep 28, 2020

  1. Updated herms.cabal to reflect LTS-16.14 resolver, and changed resolv… 

    …er in stack.yaml
    @dreamsmasher
    dreamsmasher committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    bdfb2ae View commit details
    Browse the repository at this point in the history

  2. Changed resolver to LTS-16.16, updated dependencies in Cabal file

    @dreamsmasher
    dreamsmasher committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    31c9aa5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/dreamsmasher/herms into m… 

    …aster
    @dreamsmasher
    dreamsmasher committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    1908324 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2020

  1. Removed redundant Data.Monoid imports

    @dreamsmasher
    dreamsmasher committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    781c89b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/LuxMiranda/herms into master

    @dreamsmasher
    dreamsmasher committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    92e4fb5 View commit details
    Browse the repository at this point in the history

  3. Modified showRecipe to default to Just 1 when no serving size is 

    specified. Previously, view [recipe] -s was required even though it's an optional
argument. I'm not sure if this was on purpose or not, but it's more
useful to have a default parameter when listing recipes.
    @dreamsmasher
    dreamsmasher committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    33f4c08 View commit details
    Browse the repository at this point in the history

  4. find functions work with regex!

    @dreamsmasher
    dreamsmasher committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    298b954 View commit details
    Browse the repository at this point in the history

  5. Added spanish and english documentation for find

    @dreamsmasher
    dreamsmasher committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    f80d692 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. todo: fix the Parser Command function that calls find

    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    4926231 View commit details
    Browse the repository at this point in the history

  2. Find option successfully added

    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    d6c6391 View commit details
    Browse the repository at this point in the history

  3. Fixed arguments for find function.

    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    f2515e0 View commit details
    Browse the repository at this point in the history

  4. Cleaned up config file that I used for testing, whoops

    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    25f35be View commit details
    Browse the repository at this point in the history

  5. Added haddock documentation, fixed small formatting issues. Addresses… 

    … code review LuxMiranda#123
    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    1fdcd1e View commit details
    Browse the repository at this point in the history

  6. Fixed formatting for more obvious diffs

    @dreamsmasher
    dreamsmasher committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    65c7f44 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. Modified .travis.yml and herms.cabal to remove 8.2.2 support. We're l… 

    …iving in the future now
    @dreamsmasher
    dreamsmasher committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    2f59d68 View commit details
    Browse the repository at this point in the history

  2. Generated new .travis.yml with haskell-ci

    @dreamsmasher
    dreamsmasher committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    c719c61 View commit details
    Browse the repository at this point in the history