-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ampers: Selam and Kaitlin #18
base: master
Are you sure you want to change the base?
Commits on Apr 2, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 16bd55a - Browse repository at this point
Copy the full SHA 16bd55aView commit details
Commits on Apr 3, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 4153fda - Browse repository at this point
Copy the full SHA 4153fdaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0d10a3e - Browse repository at this point
Copy the full SHA 0d10a3eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 006b41a - Browse repository at this point
Copy the full SHA 006b41aView commit details -
added controller for drivers and associated routes, then texted data …
…population in index: whoot whoot
Configuration menu - View commit details
-
Copy full SHA for aa45de1 - Browse repository at this point
Copy the full SHA aa45de1View commit details -
connected foreign keys in driver, passenger, and trips models. Tested…
… access across schema: pass.
Configuration menu - View commit details
-
Copy full SHA for 9916439 - Browse repository at this point
Copy the full SHA 9916439View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6b2cab5 - Browse repository at this point
Copy the full SHA 6b2cab5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 99fc620 - Browse repository at this point
Copy the full SHA 99fc620View commit details -
Configuration menu - View commit details
-
Copy full SHA for 88f8a77 - Browse repository at this point
Copy the full SHA 88f8a77View commit details -
added logic to calculate total charged to passenger and display it in…
… the passenger show view
Configuration menu - View commit details
-
Copy full SHA for 74ae9eb - Browse repository at this point
Copy the full SHA 74ae9ebView commit details -
added nav menu with links to all passengers/all drivers/create new pa…
…ssenger/create new driver. Also re-added route for trips after git push error.
Configuration menu - View commit details
-
Copy full SHA for a1bff77 - Browse repository at this point
Copy the full SHA a1bff77View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7020ccd - Browse repository at this point
Copy the full SHA 7020ccdView commit details -
Configuration menu - View commit details
-
Copy full SHA for d4aeb16 - Browse repository at this point
Copy the full SHA d4aeb16View commit details -
added links for delete and edit of a passenger from passenger details…
…, and updated delete controller method name and view name to destroy
Configuration menu - View commit details
-
Copy full SHA for 25ac83d - Browse repository at this point
Copy the full SHA 25ac83dView commit details -
Addlinks to edit and delete a driver. Also added the ability to see a…
…ll trips associated with a specific driver and their passenger. Finally, added the method within the driver controller to calculate the amount earned.
Configuration menu - View commit details
-
Copy full SHA for ee08d52 - Browse repository at this point
Copy the full SHA ee08d52View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7746fd4 - Browse repository at this point
Copy the full SHA 7746fd4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8848d77 - Browse repository at this point
Copy the full SHA 8848d77View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e4a293 - Browse repository at this point
Copy the full SHA 2e4a293View commit details -
added ability to create a new passenger and view the edit form
Configuration menu - View commit details
-
Copy full SHA for ff6fcc0 - Browse repository at this point
Copy the full SHA ff6fcc0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4d58fa2 - Browse repository at this point
Copy the full SHA 4d58fa2View commit details -
Configuration menu - View commit details
-
Copy full SHA for dd9b8f6 - Browse repository at this point
Copy the full SHA dd9b8f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c1c7b6 - Browse repository at this point
Copy the full SHA 1c1c7b6View commit details
Commits on Apr 4, 2018
-
Configuration menu - View commit details
-
Copy full SHA for fcf3493 - Browse repository at this point
Copy the full SHA fcf3493View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1fa07b0 - Browse repository at this point
Copy the full SHA 1fa07b0View commit details -
added confirmation display message to user after delete is select for…
… a passenger, driver, or trip. Also added validation on input to forms for the passenger and driver.
Configuration menu - View commit details
-
Copy full SHA for 0373fd5 - Browse repository at this point
Copy the full SHA 0373fd5View commit details -
implemented method to find average rating for a driver in drivers mod…
…el and added it to drivers#show view
Configuration menu - View commit details
-
Copy full SHA for 4f643f1 - Browse repository at this point
Copy the full SHA 4f643f1View commit details -
Configuration menu - View commit details
-
Copy full SHA for c121cce - Browse repository at this point
Copy the full SHA c121cceView commit details -
added delete functionality to trips through nested routes that redire…
…ct app to the driver or passenger that deleted the trip
Configuration menu - View commit details
-
Copy full SHA for 627f243 - Browse repository at this point
Copy the full SHA 627f243View commit details -
Configuration menu - View commit details
-
Copy full SHA for 09a9cad - Browse repository at this point
Copy the full SHA 09a9cadView commit details
Commits on Apr 5, 2018
-
added edit functionality to trip that allows you to edit an existing …
…rating and add a rating to a newly created trip that hasn't yet been set
Configuration menu - View commit details
-
Copy full SHA for 929bab4 - Browse repository at this point
Copy the full SHA 929bab4View commit details -
added functionality that allows trip's rating to be edited only throu…
…gh a passenger path and add a partial view of the form directly in the trip details page rather than a completely separate view
Configuration menu - View commit details
-
Copy full SHA for 73a8860 - Browse repository at this point
Copy the full SHA 73a8860View commit details -
cleaned up a little of the trip code for the edit and fixed the code …
…so that partial for rating edits can appear without turning the rating to nil
Configuration menu - View commit details
-
Copy full SHA for 8545bb5 - Browse repository at this point
Copy the full SHA 8545bb5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3f16a1d - Browse repository at this point
Copy the full SHA 3f16a1dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 42c33fc - Browse repository at this point
Copy the full SHA 42c33fcView commit details -
added validation to the forms and error messages for passengers and d…
…rivers, and started on a validation for trips
Configuration menu - View commit details
-
Copy full SHA for 174f55f - Browse repository at this point
Copy the full SHA 174f55fView commit details -
Configuration menu - View commit details
-
Copy full SHA for f76246e - Browse repository at this point
Copy the full SHA f76246eView commit details -
finished resolving merge conflicts for merge of delete_and_form_valid…
…ation branch to master
Configuration menu - View commit details
-
Copy full SHA for 03f3482 - Browse repository at this point
Copy the full SHA 03f3482View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1e22ab - Browse repository at this point
Copy the full SHA d1e22abView commit details -
Configuration menu - View commit details
-
Copy full SHA for 70a1a9c - Browse repository at this point
Copy the full SHA 70a1a9cView commit details -
added driver status to drivers schema and the ability for driver to b…
…e available/unavailable.
Configuration menu - View commit details
-
Copy full SHA for 6a47e8a - Browse repository at this point
Copy the full SHA 6a47e8aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9379912 - Browse repository at this point
Copy the full SHA 9379912View commit details -
made it so only available drivers are chosen when creating a new trip…
… and handled message if no drivers are available
Configuration menu - View commit details
-
Copy full SHA for f680add - Browse repository at this point
Copy the full SHA f680addView commit details -
Configuration menu - View commit details
-
Copy full SHA for 94ef523 - Browse repository at this point
Copy the full SHA 94ef523View commit details
Commits on Apr 6, 2018
-
Configuration menu - View commit details
-
Copy full SHA for ce25891 - Browse repository at this point
Copy the full SHA ce25891View commit details -
finished the designs for the homepage, passengers and drivers index p…
…ages, and the trip details page
Configuration menu - View commit details
-
Copy full SHA for 1106ac6 - Browse repository at this point
Copy the full SHA 1106ac6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6334114 - Browse repository at this point
Copy the full SHA 6334114View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bf888e - Browse repository at this point
Copy the full SHA 6bf888eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 25874c7 - Browse repository at this point
Copy the full SHA 25874c7View commit details -
Configuration menu - View commit details
-
Copy full SHA for c750204 - Browse repository at this point
Copy the full SHA c750204View commit details -
Configuration menu - View commit details
-
Copy full SHA for d19b337 - Browse repository at this point
Copy the full SHA d19b337View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5afad62 - Browse repository at this point
Copy the full SHA 5afad62View commit details -
Configuration menu - View commit details
-
Copy full SHA for 133b90c - Browse repository at this point
Copy the full SHA 133b90cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d6266d - Browse repository at this point
Copy the full SHA 8d6266dView commit details