Code

Reservationlink#61

Code

Open

vioif wants to merge 48 commits intobitmakerlabs:masterbitmakerlabs/seatyourself:masterfrom pkosta8:reservationlinkpkosta8/seatyourself:reservationlinkCopy head branch name to clipboard

+952-86

Commits

Commits on Jan 23, 2018

• added controllers (reservation, restaurant and user)

  vioif

  committed
  b188b65

• added sessions controller androutes (user, reservation and resturant)

  vioif

  committed
  aef70b8

• html create1

  pkosta8

  committed
  85901ef

• html create1.1

  pkosta8

  committed
  96825a7

• views added folders (rsv, rst, session and user)

  vioif

  committed
  54fd0bd

• Merge branch 'master' of https://github.com/pkosta8/seatyourself

  pkosta8

  committed
  8ff26f0

Commits on Jan 24, 2018

• fixed controllers and now users view function is working

  vioif

  committed
  9bcc79d

• Merge pull request #1 from pkosta8/irenea_seatyourself

  Show description for c862648
  vioif

  authored
  c862648

• restaurant views current, form, edit

  pkosta8

  committed
  534f2dd

• Merge branch 'master' of https://github.com/pkosta8/seatyourself

  pkosta8

  committed
  8470f96

• fixed master views application made files plural ie. restaurants

  vioif

  committed
  cb468a6

• added info into sessions controller and views session controller. Both functions are not working yet

  vioif

  committed
  326743b

• application controller def current user

  vioif

  committed
  79ae8db

• reservation controller made nothing in reservations view yet

  vioif

  committed
  589e8a1

• added models (ie. rst, rsv, owner, user) fixed resevations controller

  vioif

  committed
  95de2d1

• restaurant controller, viewform_restaurants, modelrestaurants migraterestaurants

  pkosta8

  committed
  707e541

• Merge pull request #2 from pkosta8/irenea_seatyourself

  Show description for 5e5e980
  pkosta8

  authored
  5e5e980

• rename folder form_restaurants

  pkosta8

  committed
  49e5206

• resevation page functioning

  vioif

  committed
  fed055d

• added opentime closetime , renamed index to new, new schema

  pkosta8

  committed
  557c407

• Merge pull request #3 from pkosta8/paulseatyourself

  Show description for 6e1a561
  pkosta8

  authored
  6e1a561

• modified resevation time and now able to rollback migrations

  vioif

  committed
  225fa8b

• changed reservations time and date slot

  vioif

  committed
  2844dfb

• added schema back

  vioif

  committed
  b89e948

• controller time and index

  pkosta8

  committed
  1a460f2

• Merge branch 'paulseatyourself'

  pkosta8

  committed
  9204e93

Commits on Jan 25, 2018

• time update field restaurants controller

  pkosta8

  committed
  560b20c

• working new restaurants page+save+redirect index

  pkosta8

  committed
  8fb4457

• added users index and fixed up resevationd controller removed S in reservations index

  vioif

  committed
  ec0c917

• Merge pull request #4 from pkosta8/user2

  Show description for 0e5d916
  vioif

  authored
  0e5d916

• Merge pull request #6 from pkosta8/c

  Show description for 4f2b20c
  vioif

  authored
  4f2b20c

• r updated on new.html restaurant

  pkosta8

  committed
  5a25c0a

• Merge pull request #7 from pkosta8/c

  Show description for d316404
  pkosta8

  authored
  d316404

• working render index.of db restaurants

  pkosta8

  committed
  5bb3cf4

• Merge pull request #8 from pkosta8/rest.index.all

  Show description for affbdfd
  pkosta8

  authored
  affbdfd

• users now directed to index page and sessions contorl is still not functioning

  vioif

  committed
  2f4b9b6

• Merge pull request #9 from pkosta8/sessions1

  Show description for 7a643f8
  vioif

  authored
  7a643f8

• fixed sessions controller and sessions view working

  vioif

  committed
  f1d8ca2

• Merge pull request #10 from pkosta8/sessions2

  Show description for b4ac528
  vioif

  authored
  b4ac528

• sessions controller functioning now when logged in

  vioif

  committed
  98ffda6

• edited reservation page number field and time field

  vioif

  committed
  5c59f1c

• Merge pull request #11 from pkosta8/reservation

  Show description for 703708f
  vioif

  authored
  703708f

• links on restaurant name to reservations new path

  pkosta8

  committed
  7c5c7a4

• Merge pull request #12 from pkosta8/rest.index.links2

  Show description for f2cd639
  pkosta8

  authored
  f2cd639

• deleted files

  vioif

  committed
  2d6174e

• Merge branch 'master' of https://github.com/pkosta8/seatyourself

  vioif

  committed
  46f7044

• reservations now link to restaurant page

  vioif

  committed
  bdbef30

Commits on Jan 26, 2018

• reservations now link to individual restaurants

  vioif

  committed
  8fddd33