Code

Capacity#73

Code

Open

beewhoo wants to merge 43 commits intobitmakerlabs:masterbitmakerlabs/seatyourself:masterfrom Yumeee:capacityYumeee/seatyourself:capacityCopy head branch name to clipboard

+1,447-118

Commits

Commits on Jun 26, 2018

• Generate models for user, reservation, restaurant, and controllers for users, reservations, restaurants and sessions.

  Yumeee

  committed
  a8b62bf

  Copy full SHA for a8b62bf

• migration done

  Yumeee

  committed
  eab3be4

  Copy full SHA for eab3be4

• Make restaurants#index root. Methods added for restaurants_controller;

  Yumeee

  committed
  1f535ce

  Copy full SHA for 1f535ce

• Update method filled for restaurant_controller

  Yumeee

  committed
  237bf8a

  Copy full SHA for 237bf8a

• Log in added to views/layouts/application.html.erb. Fixed some methods in restaurants_controller

  Yumeee

  committed
  c53dbfa

  Copy full SHA for c53dbfa

• added active storage, made changes to edit view and controller for restaurants

  beewhoo

  committed
  e09da4e

  Copy full SHA for e09da4e

• Merge branch 'master' into bibekversion

  Yumeee

  authored
  21d6b5e

  Copy full SHA for 21d6b5e

• Merge pull request #1 from Yumeee/bibekversion

  Show description for 57b10f9
  Yumeee

  authored
  57b10f9

  Copy full SHA for 57b10f9

• Update with Active storage

  Yumeee

  committed
  2246413

  Copy full SHA for 2246413

Commits on Jun 27, 2018

• made changes to controller/views/model- table relationships completed- had a bug when uploading photos- so I played alot with restaurant controller..in the process I got rid of all the dry code you…

  Show description for 413c7e7
  beewhoo

  committed
  413c7e7

  Copy full SHA for 413c7e7

• fixed active record storage uploads- please do db:migrate

  beewhoo

  committed
  0ffdba7

  Copy full SHA for 0ffdba7

• Merge pull request #2 from Yumeee/form_restaurants

  Show description for 07f101a
  Yumeee

  authored
  07f101a

  Copy full SHA for 07f101a

• Edit typos and indentation of certain methods

  Yumeee

  committed
  95fb288

  Copy full SHA for 95fb288

• created reservation controller and added methods

  Israelistic

  committed
  60e1bd8

  Copy full SHA for 60e1bd8

• revert to origin and createra new conroller with menual pages

  Israelistic

  committed
  cdbf59b

  Copy full SHA for cdbf59b

• Create restaurants only if logged in. Edit restaurants only if user_id = current_user.id. Add neighbourhood and price_range columns.

  Yumeee

  committed
  1038b39

  Copy full SHA for 1038b39

• storage?!? dont know what this does

  beewhoo

  committed
  3e11a5d

  Copy full SHA for 3e11a5d

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

  beewhoo

  committed
  b54dbb7

  Copy full SHA for b54dbb7

• Edit form to make it prettier: radio buttons for price_range and select neighbourhood started.

  Yumeee

  committed
  cfef120

  Copy full SHA for cfef120

• merge-please

  beewhoo

  committed
  99b8c98

  Copy full SHA for 99b8c98

• added view edit,index,show, and from

  Israelistic

  committed
  bf10046

  Copy full SHA for bf10046

• Merge pull request #3 from Yumeee/bibek

  Show description for f825e79
  beewhoo

  authored
  f825e79

  Copy full SHA for f825e79

• Merge branch 'master' into haggai

  beewhoo

  authored
  5ce4ca1

  Copy full SHA for 5ce4ca1

• Merge pull request #4 from Yumeee/haggai

  Show description for 3a9820d
  beewhoo

  authored
  3a9820d

  Copy full SHA for 3a9820d

Commits on Jun 28, 2018

• completed reservation, added urls between pages. still need to work on saving time on reservation

  beewhoo

  committed
  20aaa72

  Copy full SHA for 20aaa72

• Merge pull request #5 from Yumeee/bibek

  Show description for fc22d88
  beewhoo

  authored
  fc22d88

  Copy full SHA for fc22d88

• fixed conflict

  Yumeee

  committed
  9551837

  Copy full SHA for 9551837

• Money signs with radio buttons

  Yumeee

  committed
  eabe8de

  Copy full SHA for eabe8de

• completed

  beewhoo

  committed
  57bb0c8

  Copy full SHA for 57bb0c8

• Drop bar for neighbourhood done

  Yumeee

  committed
  c1973d8

  Copy full SHA for c1973d8

• fixed drop down selection for neighbourhoods. Reservation times only available to select within the opening-closing times of the restaurant.

  Yumeee

  committed
  9024cd7

  Copy full SHA for 9024cd7

• added search function to welcome page

  beewhoo

  committed
  551fe81

  Copy full SHA for 551fe81

• Merge branch 'master' into bibek

  beewhoo

  authored
  46dcd90

  Copy full SHA for 46dcd90

• Merge pull request #6 from Yumeee/bibek

  Show description for c551e4d
  beewhoo

  authored
  c551e4d

  Copy full SHA for c551e4d

• css edits

  Yumeee

  committed
  8d0bd0f

  Copy full SHA for 8d0bd0f

• fixed merge

  Yumeee

  committed
  7d5aba5

  Copy full SHA for 7d5aba5

• fixed the edit reservation view

  Israelistic

  committed
  b413d6d

  Copy full SHA for b413d6d

• Fixed main_picture and uploads so that it isn't necessary to edit and update restaurant.

  Yumeee

  committed
  3183048

  Copy full SHA for 3183048

• add display all reservations to owner

  Israelistic

  committed
  368ee78

  Copy full SHA for 368ee78

• restaurant controller changed

  beewhoo

  committed
  f08bb7a

  Copy full SHA for f08bb7a

• merge master to haggai

  beewhoo

  committed
  c764ed0

  Copy full SHA for c764ed0

• Merge pull request #7 from Yumeee/haggaimprove

  Show description for fd08618
  beewhoo

  authored
  fd08618

  Copy full SHA for fd08618

Commits on Jun 30, 2018

• project complete

  beewhoo

  committed
  a1b4d80

  Copy full SHA for a1b4d80