Code

Ampers: Lily, Alex#16

Code

Open

brownav wants to merge 98 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom brownav:masterbrownav/rideshare-rails:masterCopy head branch name to clipboard

+2,219

Commits

Commits on Apr 2, 2018

• inital diagram drawn

  lillers1122

  committed
  6dfcc12

  Copy full SHA for 6dfcc12

• rails new created

  brownav

  committed
  c1b64d4

  Copy full SHA for c1b64d4

Commits on Apr 3, 2018

• updated ERB

  lillers1122

  committed
  7264516

  Copy full SHA for 7264516

• created models and migrated

  brownav

  committed
  e59493c

  Copy full SHA for e59493c

• fixed migration references

  brownav

  committed
  05859a2

  Copy full SHA for 05859a2

• model relationships created

  lillers1122

  committed
  89bf9c0

  Copy full SHA for 89bf9c0

• basic routes created with resources

  lillers1122

  committed
  3efd859

  Copy full SHA for 3efd859

• controllers created

  lillers1122

  committed
  379b025

  Copy full SHA for 379b025

• blueprint methods for controllers

  brownav

  committed
  ee60988

  Copy full SHA for ee60988

• params added for controllers

  lillers1122

  committed
  0aec5ac

  Copy full SHA for 0aec5ac

• fixed controllers, have html views

  brownav

  committed
  89ce107

  Copy full SHA for 89ce107

• routes troubleshooting

  brownav

  committed
  46fde58

  Copy full SHA for 46fde58

• driver views updated, trip index basic links set up

  lillers1122

  committed
  da7c79f

  Copy full SHA for da7c79f

• trips/index basic html/css done; links work

  lillers1122

  committed
  21e5b9f

  Copy full SHA for 21e5b9f

• background color

  brownav

  committed
  dc3b2c9

  Copy full SHA for dc3b2c9

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

  brownav

  committed
  02b7688

  Copy full SHA for 02b7688

• driver list page populated

  brownav

  committed
  b0762c8

  Copy full SHA for b0762c8

• passenger index page mapped out; applicatiion css reformatted

  lillers1122

  committed
  f9f053f

  Copy full SHA for f9f053f

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

  lillers1122

  committed
  4ebd15f

  Copy full SHA for 4ebd15f

• table created for passenger show page, passenger controller updated to be able to show all driver data

  lillers1122

  committed
  4cb920d

  Copy full SHA for 4cb920d

• driver trips basic display

  brownav

  committed
  8a7d234

  Copy full SHA for 8a7d234

Commits on Apr 4, 2018

• driver show has passenger show links

  brownav

  committed
  12d8370

  Copy full SHA for 12d8370

• changed display of trip cost for passenger show

  lillers1122

  committed
  d994ac3

  Copy full SHA for d994ac3

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

  lillers1122

  committed
  2367401

  Copy full SHA for 2367401

• nested trip into driver and passenger

  brownav

  committed
  069765b

  Copy full SHA for 069765b

• formatted trip show

  lillers1122

  committed
  3f0d1d1

  Copy full SHA for 3f0d1d1

• drivers/id/trips/id and passengers/id/trips/id working, not linked

  lillers1122

  committed
  69cbdba

  Copy full SHA for 69cbdba

• link for driver trip

  brownav

  committed
  24abbef

  Copy full SHA for 24abbef

• fixed driver show merge

  brownav

  committed
  146ad0e

  Copy full SHA for 146ad0e

• trip id links from driver and passenger work now; yay

  lillers1122

  committed
  dbb0fd7

  Copy full SHA for dbb0fd7

• passenger form, new and edit pages drafted

  lillers1122

  committed
  c2502c2

  Copy full SHA for c2502c2

• form and partials for adding and editing driver

  brownav

  committed
  ea08eab

  Copy full SHA for ea08eab

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

  lillers1122

  committed
  39b1569

  Copy full SHA for 39b1569

• oops, passenger form

  lillers1122

  committed
  8babb90

  Copy full SHA for 8babb90

• pushing up driver _form

  brownav

  committed
  6f62a29

  Copy full SHA for 6f62a29

• passenger information + edit button linked on show page

  lillers1122

  committed
  7adfe12

  Copy full SHA for 7adfe12

Commits on Apr 5, 2018

• delete and show changes

  lillers1122

  committed
  431f18a

  Copy full SHA for 431f18a

• driver deletes

  brownav

  committed
  1e93f9e

  Copy full SHA for 1e93f9e

• resolving passengers show driver link

  brownav

  committed
  5832b14

  Copy full SHA for 5832b14

• deleted passenger is displayed as removed

  brownav

  committed
  d485921

  Copy full SHA for d485921

• added edit trip form

  brownav

  committed
  95d7071

  Copy full SHA for 95d7071

• trip delete works; controller and view updated

  lillers1122

  committed
  5c4e5ab

  Copy full SHA for 5c4e5ab

• driver input validation

  brownav

  committed
  0d24d63

  Copy full SHA for 0d24d63

• validation of passenger

  lillers1122

  committed
  465f366

  Copy full SHA for 465f366

• html error messages added for driver, passenger, trip

  brownav

  committed
  ca49181

  Copy full SHA for ca49181

• resolving merge conflicts

  lillers1122

  committed
  bcc2b80

  Copy full SHA for bcc2b80

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

  lillers1122

  committed
  5863d19

  Copy full SHA for 5863d19

• cost rounded to 2 everywhere but edit form

  lillers1122

  committed
  26226ca

  Copy full SHA for 26226ca

• validates cost numericality

  brownav

  committed
  d79da83

  Copy full SHA for d79da83

• rating method for driver done + linked on driver show

  lillers1122

  committed
  7a7f99b

  Copy full SHA for 7a7f99b

• driver method to calculate total earnings

  brownav

  committed
  ccc7a52

  Copy full SHA for ccc7a52

• passenger paid method

  lillers1122

  committed
  ccc2e75

  Copy full SHA for ccc2e75

• merge resolve

  lillers1122

  committed
  6059c98

  Copy full SHA for 6059c98

• formatting edits to driver

  lillers1122

  committed
  d00825c

  Copy full SHA for d00825c

• added to passenger nav

  lillers1122

  committed
  416f329

  Copy full SHA for 416f329

• new trip added to passenger in routes

  lillers1122

  committed
  c36afbf

  Copy full SHA for c36afbf

• new trip for passenger fields

  brownav

  committed
  2c02ddf

  Copy full SHA for 2c02ddf

• new trip assigns random driver

  brownav

  committed
  8384123

  Copy full SHA for 8384123

• junk

  lillers1122

  committed
  73dd426

  Copy full SHA for 73dd426

• fixes?

  lillers1122

  committed
  fdd5915

  Copy full SHA for fdd5915

Commits on Apr 6, 2018

• date generated for new trip

  brownav

  committed
  4ccb009

  Copy full SHA for 4ccb009

• new trip basics work

  lillers1122

  committed
  385006e

  Copy full SHA for 385006e

• merge conflict fixed?

  lillers1122

  committed
  f542303

  Copy full SHA for f542303

• trip form hidden_field, trip controller redirect

  brownav

  committed
  1c40cc7

  Copy full SHA for 1c40cc7

• fixed trips controller merge issue

  brownav

  committed
  2200638

  Copy full SHA for 2200638

• Driver total earnings method accounts for nil now

  lillers1122

  committed
  889479a

  Copy full SHA for 889479a

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

  lillers1122

  committed
  6d255e9

  Copy full SHA for 6d255e9

• deals with dividing by zero error, bolds mini-headers for driver and passenger

  brownav

  committed
  2f10350

  Copy full SHA for 2f10350

• adjusted average rating; driver show route for trip

  lillers1122

  committed
  fde2968

  Copy full SHA for fde2968

• can't request trip while in progress

  lillers1122

  committed
  48d9034

  Copy full SHA for 48d9034

• trip rating by driver linked

  lillers1122

  committed
  e769e8a

  Copy full SHA for e769e8a

• random cost and fixed zero trips bug

  brownav

  committed
  87fd182

  Copy full SHA for 87fd182

• stashing commits

  lillers1122

  committed
  6c2dd36

  Copy full SHA for 6c2dd36

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

  lillers1122

  committed
  0a6f5f3

  Copy full SHA for 0a6f5f3

• removed space

  brownav

  committed
  3c87ecd

  Copy full SHA for 3c87ecd

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

  lillers1122

  committed
  bf74236

  Copy full SHA for bf74236

• cost formatting

  lillers1122

  committed
  983c822

  Copy full SHA for 983c822

• duplicate changes

  brownav

  committed
  6d8badf

  Copy full SHA for 6d8badf

• merge conflict resolved

  brownav

  committed
  5dedbd0

  Copy full SHA for 5dedbd0

• rate trip to finish

  lillers1122

  committed
  c436ed4

  Copy full SHA for c436ed4

• RATE TRIP

  lillers1122

  committed
  2e24729

  Copy full SHA for 2e24729

• cost formatting for trip#show

  brownav

  committed
  1454d30

  Copy full SHA for 1454d30

• stylistic changes to nav and font, deleted unused html sheets

  brownav

  committed
  aea75d9

  Copy full SHA for aea75d9

• home edits

  lillers1122

  committed
  66dbba3

  Copy full SHA for 66dbba3

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

  lillers1122

  committed
  79eab4f

  Copy full SHA for 79eab4f

• style changes

  brownav

  committed
  9d0998e

  Copy full SHA for 9d0998e

• table formatting

  lillers1122

  committed
  4307bd6

  Copy full SHA for 4307bd6

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

  lillers1122

  committed
  ddc8c32

  Copy full SHA for ddc8c32

• border color

  lillers1122

  committed
  c4e1d1a

  Copy full SHA for c4e1d1a

• style changes

  brownav

  committed
  1b5a5c8

  Copy full SHA for 1b5a5c8

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

  brownav

  committed
  6ee1fb8

  Copy full SHA for 6ee1fb8

• styling

  brownav

  committed
  a481d69

  Copy full SHA for a481d69

• emoji magic

  lillers1122

  committed
  b00457a

  Copy full SHA for b00457a

• cleaned nested routes

  brownav

  committed
  f060c8a

  Copy full SHA for f060c8a

• more emoji magic

  lillers1122

  committed
  0144b8b

  Copy full SHA for 0144b8b

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

  lillers1122

  committed
  0f46181

  Copy full SHA for 0f46181

• new passengers and drivers consistent

  lillers1122

  committed
  959538b

  Copy full SHA for 959538b

Commits on Jan 14, 2019

• Set theme jekyll-theme-cayman

  brownav

  committed
  ed7cbc1

  Copy full SHA for ed7cbc1