Code

Maruna branch#21

Code

Open

marikoja wants to merge 74 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom marikoja:maruna-branchmarikoja/rideshare-rails:maruna-branchCopy head branch name to clipboard

+2,270

Commits

Commits on Apr 2, 2018

• created new rails application

  marikoja

  committed
  269b061

  Copy full SHA for 269b061

• created conroller

  marikoja

  committed
  711f7f4

  Copy full SHA for 711f7f4

• created a model for drivers

  aruna79

  committed
  3af64a3

  Copy full SHA for 3af64a3

Commits on Apr 3, 2018

• create a trip and passenger model

  aruna79

  committed
  b0e3605

  Copy full SHA for b0e3605

• created all models

  aruna79

  committed
  34628d0

  Copy full SHA for 34628d0

• added routes

  marikoja

  committed
  cc8ee48

  Copy full SHA for cc8ee48

• added methods new, create and edit

  marikoja

  committed
  5457e30

  Copy full SHA for 5457e30

• added index and show methods

  aruna79

  committed
  ee4bd4a

  Copy full SHA for ee4bd4a

• resolving conflict

  aruna79

  committed
  b7e576b

  Copy full SHA for b7e576b

• added methods destroy and private book_params

  marikoja

  committed
  7752536

  Copy full SHA for 7752536

• added index code

  marikoja

  committed
  8026825

  Copy full SHA for 8026825

• added show view

  aruna79

  committed
  2266204

  Copy full SHA for 2266204

• updated routes, and controller

  marikoja

  committed
  78d84b6

  Copy full SHA for 78d84b6

• added code in layout

  aruna79

  committed
  625709c

  Copy full SHA for 625709c

• updated from RidesController to Trips controller

  marikoja

  committed
  945d33f

  Copy full SHA for 945d33f

• created a passengers controller

  aruna79

  committed
  24d8a4a

  Copy full SHA for 24d8a4a

• created drivers controller and updated routes

  marikoja

  committed
  55a3a45

  Copy full SHA for 55a3a45

• created passengers controller

  aruna79

  committed
  9367f2a

  Copy full SHA for 9367f2a

• updated routes

  aruna79

  committed
  d47b578

  Copy full SHA for d47b578

• added application layout

  aruna79

  committed
  0824978

  Copy full SHA for 0824978

• added driver routes and index

  marikoja

  committed
  f80cb9e

  Copy full SHA for f80cb9e

• Merge branch 'master' of https://github.com/marikoja/rideshare-rails

  Show description for 2fddfd3
  marikoja

  committed
  2fddfd3

  Copy full SHA for 2fddfd3

Commits on Apr 4, 2018

• added passenger show page

  aruna79

  committed
  db63232

  Copy full SHA for db63232

• updated form view

  aruna79

  committed
  2097b93

  Copy full SHA for 2097b93

• migration for add references

  aruna79

  committed
  cb73dcb

  Copy full SHA for cb73dcb

• updated for driver: show, model, index

  marikoja

  committed
  4b7aba3

  Copy full SHA for 4b7aba3

• resolved merge conflict

  marikoja

  committed
  18e3fc0

  Copy full SHA for 18e3fc0

• added table to driver show

  marikoja

  committed
  406baa3

  Copy full SHA for 406baa3

• created partial for edit and new

  marikoja

  committed
  3e837d7

  Copy full SHA for 3e837d7

• added rating and earning cacluations

  marikoja

  committed
  4fa1178

  Copy full SHA for 4fa1178

• added total_cost method in passenger model

  aruna79

  committed
  daef810

  Copy full SHA for daef810

• Merge branch 'master' of https://github.com/marikoja/rideshare-rails

  Show description for 29c9a67
  aruna79

  committed
  29c9a67

  Copy full SHA for 29c9a67

• added class method for random driver to driver controller

  marikoja

  committed
  ac5ad1f

  Copy full SHA for ac5ad1f

• working on adding a new trip

  aruna79

  committed
  f1002a5

  Copy full SHA for f1002a5

• Merge branch 'master' of https://github.com/marikoja/rideshare-rails

  Show description for 9cc5824
  aruna79

  committed
  9cc5824

  Copy full SHA for 9cc5824

• created nested routes

  aruna79

  committed
  0fbded8

  Copy full SHA for 0fbded8

• fixed path for adding request trip

  aruna79

  committed
  c41639a

  Copy full SHA for c41639a

• updated create method for adding new trip

  aruna79

  committed
  eb32115

  Copy full SHA for eb32115

• Changed driver calculations from view to model

  marikoja

  committed
  5d5147b

  Copy full SHA for 5d5147b

Commits on Apr 5, 2018

• added forms view

  aruna79

  committed
  82adf8f

  Copy full SHA for 82adf8f

• partials for edit view

  aruna79

  committed
  b331210

  Copy full SHA for b331210

• added index.html

  aruna79

  committed
  2ac74f3

  Copy full SHA for 2ac74f3

• updated show method

  aruna79

  committed
  a808260

  Copy full SHA for a808260

• show view for trips

  aruna79

  committed
  188225a

  Copy full SHA for 188225a

• added some styles

  aruna79

  committed
  044ff2c

  Copy full SHA for 044ff2c

• made changes to application.html

  aruna79

  committed
  cd0cae0

  Copy full SHA for cd0cae0

• still need to fix the show page for new trip

  aruna79

  committed
  52df1b3

  Copy full SHA for 52df1b3

• logic for aggregate driver data

  marikoja

  committed
  8b9649a

  Copy full SHA for 8b9649a

• Merge branch 'master' of https://github.com/marikoja/rideshare-rails

  Show description for 299321d
  marikoja

  committed
  299321d

  Copy full SHA for 299321d

• fixed the errors in new trip

  aruna79

  committed
  c589fb5

  Copy full SHA for c589fb5

• Merge branch 'master' of https://github.com/marikoja/rideshare-rails

  Show description for 9b1c968
  marikoja

  committed
  9b1c968

  Copy full SHA for 9b1c968

• new branch with alot of clusters

  marikoja

  committed
  605ecc9

  Copy full SHA for 605ecc9

• added dependent to passenger model, delete passenger working

  marikoja

  committed
  9914515

  Copy full SHA for 9914515

• fixed driver delete

  marikoja

  committed
  eab0f9a

  Copy full SHA for eab0f9a

Commits on Apr 6, 2018

• fixed new driver validations

  marikoja

  committed
  33b68f4

  Copy full SHA for 33b68f4

• Removed links from all trips page

  marikoja

  committed
  c419211

  Copy full SHA for c419211

• fixed request trip to save new trip data

  marikoja

  committed
  7b6f1c2

  Copy full SHA for 7b6f1c2

• updated redirects, new passenger to passenger page, request trip to passenger page

  marikoja

  committed
  13556e1

  Copy full SHA for 13556e1

• passengers can rate trips

  marikoja

  committed
  a3caded

  Copy full SHA for a3caded

• updated trips controller

  aruna79

  committed
  29793fb

  Copy full SHA for 29793fb

• updated views

  aruna79

  committed
  2eb9bd0

  Copy full SHA for 2eb9bd0

• made changes to show view

  aruna79

  committed
  6bc7bde

  Copy full SHA for 6bc7bde

• added hidden fields to the form view

  aruna79

  committed
  489f972

  Copy full SHA for 489f972

• added some styling

  aruna79

  committed
  c7dbdf5

  Copy full SHA for c7dbdf5

• added images

  aruna79

  committed
  9736b0e

  Copy full SHA for 9736b0e

• still need to work on styling

  aruna79

  committed
  0b188bb

  Copy full SHA for 0b188bb

• ridsharerails now link to homepage/all rides page

  marikoja

  committed
  0edf898

  Copy full SHA for 0edf898

• updating redirect to link

  marikoja

  committed
  3590bf1

  Copy full SHA for 3590bf1

• made new changes

  aruna79

  committed
  8bc6c9f

  Copy full SHA for 8bc6c9f

• space

  marikoja

  committed
  d5a3426

  Copy full SHA for d5a3426

• space

  marikoja

  committed
  fcc2471

  Copy full SHA for fcc2471

• Merge branch 'maruna-branch' into aru-branch

  aruna79

  authored
  8b9390a

  Copy full SHA for 8b9390a

• Merge pull request #2 from marikoja/aru-branch

  Show description for 6ddcd7c
  aruna79

  authored
  6ddcd7c

  Copy full SHA for 6ddcd7c

Commits on Apr 7, 2018

• final refactoring

  marikoja

  committed
  6bb8e44

  Copy full SHA for 6bb8e44