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

Paulseatyourself #55

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

Paulseatyourself #55

wants to merge 26 commits into from

Conversation

pkosta8
Copy link

@pkosta8 pkosta8 commented Jan 24, 2018

restaurants new views edit current

vioif and others added 26 commits January 23, 2018 15:53
@vioif
added controllers (reservation, restaurant and user)
b188b65
@vioif
added sessions controller androutes (user, reservation and resturant)
aef70b8
@pkosta8
html create1
85901ef
@pkosta8
html create1.1
96825a7
@vioif
views added folders (rsv, rst, session and user)
54fd0bd
@pkosta8
Merge branch 'master' of https://github.com/pkosta8/seatyourself
8ff26f0
@vioif
fixed controllers and now users view function is working
9bcc79d
@vioif
Merge pull request #1 from pkosta8/irenea_seatyourself
c862648 
fixed controllers and now users view function is working
@pkosta8
restaurant views current, form, edit
534f2dd
@pkosta8
Merge branch 'master' of https://github.com/pkosta8/seatyourself
8470f96
@vioif
fixed master views application made files plural ie. restaurants
cb468a6
@vioif
added info into sessions controller and views session controller. Bot…
326743b 
…h functions are not working yet
@vioif
application controller def current user
79ae8db
@vioif
reservation controller made nothing in reservations view yet
589e8a1
@vioif
added models (ie. rst, rsv, owner, user) fixed resevations controller
95de2d1
@pkosta8
restaurant controller, viewform_restaurants, modelrestaurants migrate…
707e541 
…restaurants
@pkosta8
Merge pull request #2 from pkosta8/irenea_seatyourself
5e5e980 
Irenea seatyourself
@pkosta8
rename folder form_restaurants
49e5206
@vioif
resevation page functioning
fed055d
@pkosta8
added opentime closetime , renamed index to new, new schema
557c407
@pkosta8
Merge pull request #3 from pkosta8/paulseatyourself
6e1a561 
restaurant controller, viewform_restaurants, modelrestaurants migrate…
@vioif
modified resevation time and now able to rollback migrations
225fa8b
@vioif
changed reservations time and date slot
2844dfb
@vioif
added schema back
b89e948
@pkosta8
controller time and index
1a460f2
@pkosta8
Merge branch 'paulseatyourself'
9204e93
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.
2 participants
@pkosta8 @vioif