Code

Sockets-Bita&Tatiana#18

Code

Open

Bitaman wants to merge 70 commits intoAda-C11:masterAda-C11/ride-share-rails:masterfrom Bitaman:masterBitaman/ride-share-rails:masterCopy head branch name to clipboard

+2,817-187

Commits

Commits on Apr 15, 2019

• ran rails new

  tatsqui

  committed
  d1d269e

  Copy full SHA for d1d269e

• added trip, driver, passenger models

  tatsqui

  committed
  ae77cb1

  Copy full SHA for ae77cb1

• Remove spurious model tests

  Bitaman

  committed
  3f95135

  Copy full SHA for 3f95135

Commits on Apr 16, 2019

• Added seed to database

  tatsqui

  committed
  913259b

  Copy full SHA for 913259b

• added relationships to models

  Bitaman

  committed
  5f44638

  Copy full SHA for 5f44638

• Merge branch 'master' of https://github.com/Bitaman/ride-share-rails

  Bitaman

  committed
  d2b8ac1

  Copy full SHA for d2b8ac1

• Remove spurious model tests

  tatsqui

  committed
  37cbb9b

  Copy full SHA for 37cbb9b

• initialized Drivers controller

  tatsqui

  committed
  2587513

  Copy full SHA for 2587513

• Merge branch 'master' of https://github.com/Bitaman/ride-share-rails

  Bitaman

  committed
  9d656ea

  Copy full SHA for 9d656ea

• added index,show and new actions for passenger

  Bitaman

  committed
  9ebb4ef

  Copy full SHA for 9ebb4ef

• added the index and show erb files for passenger

  Bitaman

  committed
  277a39d

  Copy full SHA for 277a39d

• added actions to driver and resources to routes

  tatsqui

  committed
  d760234

  Copy full SHA for d760234

• minor changes and created database

  Bitaman

  committed
  ae6cdbd

  Copy full SHA for ae6cdbd

• Merge branch 'master' of github.com:Bitaman/ride-share-rails

  Show description for f9f7194
  tatsqui

  committed
  f9f7194

  Copy full SHA for f9f7194

• fixed some problems with the erb files,run the rails server and confirmed that the pages load correctly

  Bitaman

  committed
  7bafa85

  Copy full SHA for 7bafa85

• added code for standard driver views and form partial

  tatsqui

  committed
  cb657e2

  Copy full SHA for cb657e2

• wrote initial tests for driver#index and #show

  tatsqui

  committed
  220f5ba

  Copy full SHA for 220f5ba

• added total spending and validations to the passenger and edited the erb files

  Bitaman

  committed
  3e9b544

  Copy full SHA for 3e9b544

• accepted the changes

  Bitaman

  committed
  e6dac01

  Copy full SHA for e6dac01

• added the add link for drivers and passengers and handle the error massege display

  Bitaman

  committed
  512a409

  Copy full SHA for 512a409

• added error checking for form and method for update

  tatsqui

  committed
  a333842

  Copy full SHA for a333842

Commits on Apr 17, 2019

• added tests for driver

  tatsqui

  committed
  e803e86

  Copy full SHA for e803e86

• wrote descriptions for last two tests for update

  tatsqui

  committed
  723fc1b

  Copy full SHA for 723fc1b

• fixed bug in driver#update

  tatsqui

  committed
  937572a

  Copy full SHA for 937572a

• tests for driver#update complete and green

  tatsqui

  committed
  6966ae9

  Copy full SHA for 6966ae9

• added succesful test for driver#new

  tatsqui

  committed
  e953dfa

  Copy full SHA for e953dfa

• added driver#create tests, green

  tatsqui

  committed
  8eadff8

  Copy full SHA for 8eadff8

• edited driver#create test - removed render

  tatsqui

  committed
  8effcd2

  Copy full SHA for 8effcd2

• added tests driver#destroy

  tatsqui

  committed
  2e6eea5

  Copy full SHA for 2e6eea5

• rufo linter changes

  tatsqui

  committed
  bb329e4

  Copy full SHA for bb329e4

• added homepages controller

  tatsqui

  committed
  b0b7d7c

  Copy full SHA for b0b7d7c

• added test for passenger controller

  Bitaman

  committed
  ed1732b

  Copy full SHA for ed1732b

• added index to homepages

  tatsqui

  committed
  4301db8

  Copy full SHA for 4301db8

• pulled

  tatsqui

  committed
  d7c5f83

  Copy full SHA for d7c5f83

• added average rating to driver and started homepages controller #index

  tatsqui

  committed
  e128037

  Copy full SHA for e128037

Commits on Apr 18, 2019

• editing driver details, driver show css and added rating method

  tatsqui

  committed
  463e11d

  Copy full SHA for 463e11d

• added the routes for trip and made the view for trip

  Bitaman

  committed
  76d6203

  Copy full SHA for 76d6203

• edit divide by zero

  tatsqui

  committed
  a8ce9e9

  Copy full SHA for a8ce9e9

• rufo linter

  tatsqui

  committed
  6bf53d6

  Copy full SHA for 6bf53d6

• added the request trip function

  Bitaman

  committed
  9b8258d

  Copy full SHA for 9b8258d

• merging to master

  Bitaman

  committed
  0060ffa

  Copy full SHA for 0060ffa

• merging

  Bitaman

  committed
  bf7864e

  Copy full SHA for bf7864e

• added dependency nullify to driver, passenger

  tatsqui

  committed
  ded467b

  Copy full SHA for ded467b

• added edit view form for trip and edited dependent keyword in pass/driver model

  tatsqui

  committed
  3f9be14

  Copy full SHA for 3f9be14

Commits on Apr 19, 2019

• writing tests for trips controller

  tatsqui

  committed
  38895e0

  Copy full SHA for 38895e0

• added the rate your trip option to passenger show page

  Bitaman

  committed
  fc63c86

  Copy full SHA for fc63c86

• "merging"

  tatsqui

  committed
  e503e50

  Copy full SHA for e503e50

• added completed trip action

  tatsqui

  committed
  0bb8849

  Copy full SHA for 0bb8849

• modified trip table in show

  tatsqui

  committed
  d0994e4

  Copy full SHA for d0994e4

• changed default font

  tatsqui

  committed
  1a2453b

  Copy full SHA for 1a2453b

• made index buttons cooler

  tatsqui

  committed
  90888c2

  Copy full SHA for 90888c2

• css centering headliner

  tatsqui

  committed
  c84fdc2

  Copy full SHA for c84fdc2

• edited passenger list table

  tatsqui

  committed
  e15820d

  Copy full SHA for e15820d

• width list tables, css background image

  tatsqui

  committed
  5123ec7

  Copy full SHA for 5123ec7

• fixed bug in .average_rating driver

  tatsqui

  committed
  13c1348

  Copy full SHA for 13c1348

• changed text in .average_rating

  tatsqui

  committed
  7669245

  Copy full SHA for 7669245

• more css edits

  tatsqui

  committed
  e0d47f2

  Copy full SHA for e0d47f2

• editing table styles and changing color scheme

  tatsqui

  committed
  767a961

  Copy full SHA for 767a961

• more css table mods

  tatsqui

  committed
  921aa8d

  Copy full SHA for 921aa8d

• tests for trips are passing

  Bitaman

  committed
  6955532

  Copy full SHA for 6955532

• Merge branch 'master' into bita_branch

  Bitaman

  committed
  6180cea

  Copy full SHA for 6180cea

• merge, editing show

  tatsqui

  committed
  3cf4fcc

  Copy full SHA for 3cf4fcc

• adding correct links to trip

  tatsqui

  committed
  162eedf

  Copy full SHA for 162eedf

• fixed the delete and edit links for trips and passengers

  Bitaman

  committed
  534df57

  Copy full SHA for 534df57

• changed trip#destroy redirect to root

  tatsqui

  committed
  1588d9c

  Copy full SHA for 1588d9c

• merge resolved

  tatsqui

  committed
  255fc96

  Copy full SHA for 255fc96

• updating gemfile

  tatsqui

  committed
  06fc3e6

  Copy full SHA for 06fc3e6

• finished testing

  Bitaman

  committed
  830dcbd

  Copy full SHA for 830dcbd

• Merge branch 'master' of https://github.com/Bitaman/ride-share-rails

  Bitaman

  committed
  c90d570

  Copy full SHA for c90d570

Commits on Apr 20, 2019

• adding photos

  tatsqui

  committed
  7bc4863

  Copy full SHA for 7bc4863