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

Log emotion #31

Merged
merged 9 commits into from
Oct 16, 2018
Merged

Log emotion #31

merged 9 commits into from
Oct 16, 2018

Commits on Oct 15, 2018

  1. Merge branch 'master' of github.com:actnforchildren/mental_health_app

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    0b5a49e View commit details
    Browse the repository at this point in the history

  2. creates emotion_log table with enum type for emotion #22

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    77a9ef4 View commit details
    Browse the repository at this point in the history

  3. creates seed file for dummy user with trusted adult

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    a3c00c3 View commit details
    Browse the repository at this point in the history

  4. creates basic session route for login/logout #6 #7

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    a4f5f78 View commit details
    Browse the repository at this point in the history

  5. removes unsed alias

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    35b448e View commit details
    Browse the repository at this point in the history

  6. creates basic auth plug to protect routes #6 #7

    @RobStallion
    RobStallion committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    49f339c View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. allows a user to record their emotions #29 #22

    @RobStallion
    RobStallion committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    ce14c70 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:actnforchildren/mental_health_app

    @RobStallion
    RobStallion committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    d42b4c7 View commit details
    Browse the repository at this point in the history

  3. resolve merge conflict

    @RobStallion
    RobStallion committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    4270bc4 View commit details
    Browse the repository at this point in the history