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

Time structure #84

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

Time structure #84

wants to merge 61 commits into from

Conversation

ndelforno
Copy link

No description provided.

d-ang1993 and others added 30 commits October 10, 2018 15:44
@d-ang1993
[Munch] created the skeleton which has the model, association, and co…
8f42f15 
…ntroller section
@d-ang1993
[Munch] Sign-up page controller, view created, and b-crypt installed,…
de7cd5e 
… and password added to user
@d-ang1993
[Munch] removed column owner within users table
bead93a
@Kevintudiep
Added restaurant index page from seeds
2f47590
@d-ang1993
[Munch] completed log-in controller and view
67a11ec
@ndelforno
Merge pull request #1 from DangAsian/session_user
f153b6e 
Session user
@ndelforno
Merge pull request #2 from DangAsian/Index_layout
4a4b506 
Added restaurant index page from seeds
@Kevintudiep
added name column to restaurants
0c0ac2c
@ndelforno
home login and signup button done
af9d88a
@Kevintudiep
Changed Index page to show list restaurants, added individual show pa…
8e76789 
…ge for each restaurant
@ndelforno
[munch] initialize current_user added log out
77b5dc4
@ndelforno
Merge pull request #3 from DangAsian/layout_creation
697355e 
Layout creation
@ndelforno
Merge pull request #4 from DangAsian/adding_show_page
ff19159 
Changed Index page to show list restaurants, added individual show pa…
@Kevintudiep
created restaurant show, edit, create methods in restaurant controlle…
9102bca 
…r and added said views
@Kevintudiep
Added destroy method in restaurant controller
a3fda88
@gitmamhub
reservation party time form
be501dd
@ndelforno
Merge pull request #5 from DangAsian/restaurant_create
354b00f 
Restaurant create
@ndelforno
Changed index layout
04a9504
@ndelforno
Displayed list of restaurants in user profile
d621596
@ndelforno
Edit restaurant from profile page
b66cd6c
@gitmamhub
[Munch] added the reservation form:
547af17
@ndelforno
Merge pull request #6 from DangAsian/RO_managment
19997c2 
Ro managment
@d-ang1993
Merge branch 'master' into reservation
6e428a6
@d-ang1993
Merge pull request #7 from DangAsian/reservation
60a3f50 
Reservation
@Kevintudiep
Deleted overlapping migration for adding column
8b1c1e3
@Kevintudiep
Added delete function on User show page, link to profile on layout
d1ceaed
@d-ang1993
completed finding the total sum
5b13ed1
@Kevintudiep
Added list of reservations into profile
642d5b3
@ndelforno
Merge pull request #8 from DangAsian/link_to_user_profile_and_delete_…
ab7e9d0 
…restaurant

Link to user profile and delete restaurant
@Kevintudiep
added min and max party to schema, added to new and edit form
2763afb
ndelforno and others added 30 commits October 11, 2018 17:18
@ndelforno
nothing
edbd5df
@ndelforno
resolved conflict
94077ea
@ndelforno
Validation added and errors messages added + partial view created
0b21b4d
@d-ang1993
[Munch] CAN'T RENDER THE SHOW PAGE FOR RESERVATIONS!
c92cea4
@ndelforno
Displayed resrvation made in profile
7f8e4e6
@ndelforno
Merge pull request #10 from DangAsian/validation_and_errors_messages
de2af2f 
Validation and errors messages
@ndelforno
Merge branch 'master' into reservation_complete
16bef6f
@ndelforno
Merge pull request #11 from DangAsian/reservation_complete
a31a561 
Reservation complete
@Kevintudiep
added css layout
6ba5202
@Kevintudiep
resolved conflict
bc87b0b
@ndelforno
displayed restaurant name on reservations made
938b8f1
@ndelforno
Merge pull request #12 from DangAsian/reservation_details
7717638 
displayed restaurant name on reservations made
@ndelforno
general push
10c7475
@Kevintudiep
slight change in css
b589065
@Kevintudiep
test
64a33ca
@d-ang1993
Completed the user
b5b1d37
@d-ang1993
Merge pull request #13 from DangAsian/reservation_user
31d1e95 
Completed the user
@ndelforno
Merge branch 'master' of https://github.com/DangAsian/seatyourself
f29b583
@ndelforno
Blocked reservations for visitors + redirect to same pages after logg…
204c4cb 
…in + errors messages displayed for sign up
@d-ang1993
[Munch] All Reservation completed except for past dates, included all…
8cff9fb 
… date into when picking a reservation
@ndelforno
errors messges on login done
1244d8a
@ndelforno
Merge pull request #14 from DangAsian/errors_message_login
d27b26d 
Errors message login
@Kevintudiep
added css to header,footre and index
f669b33
@ndelforno
Merge branch 'master' into css_test
c962afc
@ndelforno
Merge pull request #15 from DangAsian/css_test
45cfcce 
Css test
@d-ang1993
[Munch] Reservation is complete git branchgit branch! GO TEAMWORK
c683b3f
@d-ang1993
Merge branch 'master' into reservation_user
09eed07
@d-ang1993
Merge pull request #16 from DangAsian/reservation_user
944d305 
Reservation user
@ndelforno
changed on time
a1efc04
@ndelforno
Merge branch 'master' into time_structure
9c7ee46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ndelforno @d-ang1993 @Kevintudiep @gitmamhub