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

Reservation #80

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

Reservation #80

wants to merge 23 commits into from

Commits on Oct 10, 2018

  1. [Munch] created the skeleton which has the model, association, and co… 

    …ntroller section
    @d-ang1993
    d-ang1993 committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    8f42f15 View commit details
    Browse the repository at this point in the history

  2. [Munch] Sign-up page controller, view created, and b-crypt installed,… 

    … and password added to user
    @d-ang1993
    d-ang1993 committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    de7cd5e View commit details
    Browse the repository at this point in the history

  3. [Munch] removed column owner within users table

    @d-ang1993
    d-ang1993 committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    bead93a View commit details
    Browse the repository at this point in the history

  4. Added restaurant index page from seeds

    @Kevintudiep
    Kevintudiep committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    2f47590 View commit details
    Browse the repository at this point in the history

  5. [Munch] completed log-in controller and view

    @d-ang1993
    d-ang1993 committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    67a11ec View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from DangAsian/session_user 

    Session user
    @ndelforno
    ndelforno authored Oct 10, 2018
    Configuration menu
    Copy the full SHA
    f153b6e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from DangAsian/Index_layout 

    Added restaurant index page from seeds
    @ndelforno
    ndelforno authored Oct 10, 2018
    Configuration menu
    Copy the full SHA
    4a4b506 View commit details
    Browse the repository at this point in the history

  8. added name column to restaurants

    @Kevintudiep
    Kevintudiep committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    0c0ac2c View commit details
    Browse the repository at this point in the history

  9. home login and signup button done

    @ndelforno
    ndelforno committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    af9d88a View commit details
    Browse the repository at this point in the history

  10. Changed Index page to show list restaurants, added individual show pa… 

    …ge for each restaurant
    @Kevintudiep
    Kevintudiep committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    8e76789 View commit details
    Browse the repository at this point in the history

  11. [munch] initialize current_user added log out

    @ndelforno
    ndelforno committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    77b5dc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2018

  1. Merge pull request #3 from DangAsian/layout_creation 

    Layout creation
    @ndelforno
    ndelforno authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    697355e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from DangAsian/adding_show_page 

    Changed Index page to show list restaurants, added individual show pa…
    @ndelforno
    ndelforno authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    ff19159 View commit details
    Browse the repository at this point in the history

  3. created restaurant show, edit, create methods in restaurant controlle… 

    …r and added said views
    @Kevintudiep
    Kevintudiep committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    9102bca View commit details
    Browse the repository at this point in the history

  4. Added destroy method in restaurant controller

    @Kevintudiep
    Kevintudiep committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    a3fda88 View commit details
    Browse the repository at this point in the history

  5. reservation party time form

    @gitmamhub
    gitmamhub committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    be501dd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from DangAsian/restaurant_create 

    Restaurant create
    @ndelforno
    ndelforno authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    354b00f View commit details
    Browse the repository at this point in the history

  7. Changed index layout

    @ndelforno
    ndelforno committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    04a9504 View commit details
    Browse the repository at this point in the history

  8. Displayed list of restaurants in user profile

    @ndelforno
    ndelforno committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    d621596 View commit details
    Browse the repository at this point in the history

  9. Edit restaurant from profile page

    @ndelforno
    ndelforno committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    b66cd6c View commit details
    Browse the repository at this point in the history

  10. [Munch] added the reservation form:

    @gitmamhub
    gitmamhub committed Oct 11, 2018
    Configuration menu
    Copy the full SHA
    547af17 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #6 from DangAsian/RO_managment 

    Ro managment
    @ndelforno
    ndelforno authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    19997c2 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into reservation

    @d-ang1993
    d-ang1993 authored Oct 11, 2018
    Configuration menu
    Copy the full SHA
    6e428a6 View commit details
    Browse the repository at this point in the history