Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MVP RUBY RAILERS #269

Open
wants to merge 267 commits into
base: master
Choose a base branch
from
Open

MVP RUBY RAILERS #269

wants to merge 267 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Nov 7, 2023

  1. Login routes

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    22fec45 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from paolacalle/master 

    adding changes from master
    @paolacalle
    paolacalle authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    e123d22 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'login-redirect' into login

    @paolacalle
    paolacalle authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b338e7e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from paolacalle/login 

    added some ux changes to user, membership + navbar
    @paolacalle
    paolacalle authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    49dc453 View commit details
    Browse the repository at this point in the history

  5. Fixed error with missing amount

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    574e5ee View commit details
    Browse the repository at this point in the history

  6. fixed route to membership

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    ce081cf View commit details
    Browse the repository at this point in the history

  7. added bcyrpt for password encrpytion

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    1c46975 View commit details
    Browse the repository at this point in the history

  8. Allow users to either login or signup

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    5593b77 View commit details
    Browse the repository at this point in the history

  9. removed dijest attr and got the sign in to work with db

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    920e1a3 View commit details
    Browse the repository at this point in the history

  10. added required create user

    @paolacalle
    paolacalle committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    6829104 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'master' into login-redirect

    @paolacalle
    paolacalle authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    86c6f58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from paolacalle/login-redirect 

    Login redirect
    @paolacalle
    paolacalle authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    2c2c636 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. changed the rake files for stations and bikes to create the associati… 

    …on we want
    @paolacalle
    paolacalle committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    4c8dd0a View commit details
    Browse the repository at this point in the history

  2. validate rental fields, error flash not working

    @kemerson-ryan
    kemerson-ryan committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    b00d885 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. added changes to stations and bikes

    @paolacalle
    paolacalle committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    0d0daad View commit details
    Browse the repository at this point in the history

  2. removed uneeded station columns

    @paolacalle
    paolacalle committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    6ae4c28 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from paolacalle/rake-bikes-stations 

    Rake bikes stations
    @paolacalle
    paolacalle authored Nov 11, 2023
    Configuration menu
    Copy the full SHA
    7083587 View commit details
    Browse the repository at this point in the history

  4. User can now log in

    @paolacalle
    paolacalle committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    0f4367a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #9 from paolacalle/rake-bikes-stations 

    Rake bikes stations
    @paolacalle
    paolacalle authored Nov 11, 2023
    Configuration menu
    Copy the full SHA
    bb79c70 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from paolacalle/login 

    User can now login
some sign up form validation
stations and bikes association fixed
some UX for tables
created helper methods for alerts and notices
    @paolacalle
    paolacalle authored Nov 11, 2023
    Configuration menu
    Copy the full SHA
    67f82b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. flashesworking entrytypesvalidated formatallflash

    @kemerson-ryan
    kemerson-ryan committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    181d5e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into rentalpaymententrytypevalidation

    @paolacalle
    paolacalle authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    058f6cc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11 from paolacalle/rentalpaymententrytypevalidation 

    edited the flash errors
    @paolacalle
    paolacalle authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    4668230 View commit details
    Browse the repository at this point in the history

  4. Fixed double route error

    @paolacalle
    paolacalle committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    8005367 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. format of all lists the same, navbar logo + color

    @kemerson-ryan
    kemerson-ryan committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    6edb2ef View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. navbarlogo formatpaymentpage titletodo svgsizetodo

    @kemerson-ryan
    kemerson-ryan committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    069e696 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from paolacalle/somestyle 

    Somestyle
    @kemerson-ryan
    kemerson-ryan authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6024659 View commit details
    Browse the repository at this point in the history

  3. logout works

    @paolacalle
    paolacalle committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    1794057 View commit details
    Browse the repository at this point in the history

  4. changes to user controller

    @paolacalle
    paolacalle committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6bfeefb View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Fixed flash display and add simple css

    @paolacalle
    paolacalle committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    806c71c View commit details
    Browse the repository at this point in the history

  2. sort for all views

    @kemerson-ryan
    kemerson-ryan committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    fdcfa22 View commit details
    Browse the repository at this point in the history

  3. added search button and added some css

    @paolacalle
    paolacalle committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    657c591 View commit details
    Browse the repository at this point in the history

  4. rental has user, columns added for that

    @kemerson-ryan
    kemerson-ryan committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    0c2a6d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. trying to update association between rental/user

    @kemerson-ryan
    kemerson-ryan committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    ede0da9 View commit details
    Browse the repository at this point in the history

  2. has_bikeCantRentMultipleBikes at once. noreturnyet

    @kemerson-ryan
    kemerson-ryan committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    6ddda7d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #14 from paolacalle/morestyle

    @kemerson-ryan
    kemerson-ryan authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    009bff4 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. geolocation done working on calculating distance

    @paolacalle
    paolacalle committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    4d02f79 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. doesnt work. user/rental back&forth cant end renta

    @kemerson-ryan
    kemerson-ryan committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    150ef2a View commit details
    Browse the repository at this point in the history

  2. Flashes will now display errors and successes

    @kemerson-ryan
    kemerson-ryan committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    806e759 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #15 from paolacalle/rentalflashesdisplay

    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    713d64c View commit details
    Browse the repository at this point in the history

  4. Revert "Rentalflashesdisplay"

    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    a9ecffa View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from paolacalle/revert-15-rentalflashesdisplay 

    Revert "Rentalflashesdisplay"...merged schema
    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    69f6fac View commit details
    Browse the repository at this point in the history

  6. rental flashes worknow success and error displayed

    @kemerson-ryan
    kemerson-ryan committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    e2e120c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #17 from paolacalle:rentalflashesredo 

    rental flashes worknow success and error displayed
    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    91b6878 View commit details
    Browse the repository at this point in the history

  8. button class to style all of the buttons, placeholder in payments, va… 

    …lidations in rental, different form for rental period
    @chel48
    chel48 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    e6cf527 View commit details
    Browse the repository at this point in the history

  9. to actually display the errors and successes

    @kemerson-ryan
    kemerson-ryan committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    8bbf4ad View commit details
    Browse the repository at this point in the history

  10. Merge pull request #19 from paolacalle/layouthelpererrorsuccess

    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    46dd2ef View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into dropdowns_and_associations

    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    172bb81 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #18 from paolacalle/dropdowns_and_associations 

    Button styling class and rental period form adjustments
    @kemerson-ryan
    kemerson-ryan authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    1df4064 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Merge remote-tracking branch 'origin' into returnbike

    @kemerson-ryan
    kemerson-ryan committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    3ec8638 View commit details
    Browse the repository at this point in the history

  2. map basic

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ca3e199 View commit details
    Browse the repository at this point in the history

  3. nav

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    35bde84 View commit details
    Browse the repository at this point in the history

  4. added locations

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    f61e04d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into gelocation

    @paolacalle
    paolacalle authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    87e2390 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from paolacalle/gelocation 

    Gelocation
    @paolacalle
    paolacalle authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    7485cdf View commit details
    Browse the repository at this point in the history

  7. samll bug

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    5f4e327 View commit details
    Browse the repository at this point in the history

  8. edited flash visual stuff. next up:rentals/users

    @kemerson-ryan
    kemerson-ryan committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    04cb10c View commit details
    Browse the repository at this point in the history

  9. minor error in stations and navbar

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4505fdf View commit details
    Browse the repository at this point in the history

  10. added logic between station and bike

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    e209057 View commit details
    Browse the repository at this point in the history

  11. added connection from selcted bike to generate new rental

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    ef7cd13 View commit details
    Browse the repository at this point in the history

  12. added connection between station and location

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    892767c View commit details
    Browse the repository at this point in the history

  13. Half-functional. error with making 2nd+ rentals

    @kemerson-ryan
    kemerson-ryan committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    744bd51 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into returnbike

    @kemerson-ryan
    kemerson-ryan authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    f0cf8bd View commit details
    Browse the repository at this point in the history

  15. Merge pull request #21 from paolacalle/returnbike 

    Returnbike
    @kemerson-ryan
    kemerson-ryan authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    1e19b13 View commit details
    Browse the repository at this point in the history

  16. made compomonets center

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    0eddc4d View commit details
    Browse the repository at this point in the history

  17. made it so home page does not require login

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4d933df View commit details
    Browse the repository at this point in the history

  18. Displays rentalbike. bikestatus unchanged sttion

    @kemerson-ryan
    kemerson-ryan committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    a027030 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' into bikerentalassociation

    @kemerson-ryan
    kemerson-ryan authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    c92f785 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #22 from paolacalle/bikerentalassociation 

    Bikerentalassociation
    @kemerson-ryan
    kemerson-ryan authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    7e69bbb View commit details
    Browse the repository at this point in the history

  21. changes to sign up and login form

    @paolacalle
    paolacalle committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    4c5bf1a View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. blue buttons push

    @kemerson-ryan
    kemerson-ryan committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    5b9cdf6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from paolacalle/bluebuttons 

    blue buttons push
    @kemerson-ryan
    kemerson-ryan authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    54bef0d View commit details
    Browse the repository at this point in the history

  3. changes

    @paolacalle
    paolacalle committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d900731 View commit details
    Browse the repository at this point in the history

  4. small error

    @paolacalle
    paolacalle committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    6566f8a View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. getting rental hours and minutes and using them to create rental peri… 

    …od and return by is almost working, however doesn't save
    @chel48
    chel48 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    9d85784 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. QR code

    @paolacalle
    paolacalle committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    092cf22 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. auto-increment works. newrental bike param malfunc

    @kemerson-ryan
    kemerson-ryan committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    e98d3b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fixautoincrement

    @kemerson-ryan
    kemerson-ryan committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    323e2b4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25 from paolacalle/fixautoincrement 

    Fixautoincrement
    @kemerson-ryan
    kemerson-ryan authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    2e41532 View commit details
    Browse the repository at this point in the history

  4. bug fixed, added if statement for rental when none is created yet

    @paolacalle
    paolacalle committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    61713fe View commit details
    Browse the repository at this point in the history

  5. minor error with table; sort with rented at date, not id

    @paolacalle
    paolacalle committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    da15df9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #26 from paolacalle/fixing_rentals_bike_create 

    Fixing rentals bike create
    @paolacalle
    paolacalle authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6f0888f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #27 from paolacalle/qrcode 

    - generates a unique QR code for every opened rental
    @paolacalle
    paolacalle authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    0480e93 View commit details
    Browse the repository at this point in the history

  8. dedocking bikes and allowing to redock them

    @paolacalle
    paolacalle committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    2c46842 View commit details
    Browse the repository at this point in the history

  9. got rid of extra colors

    @kemerson-ryan
    kemerson-ryan committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    b6b6ba8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #28 from paolacalle:extracolors 

    Extracolors
    @kemerson-ryan
    kemerson-ryan authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    3e711f5 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. shows only the current users rental

    @kemerson-ryan
    kemerson-ryan committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    29c0c55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from paolacalle/listusersrentals 

    shows only the current users rental
    @kemerson-ryan
    kemerson-ryan authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    26d9269 View commit details
    Browse the repository at this point in the history

  3. user can now redock a bike at selected station

    @paolacalle
    paolacalle committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f3cec11 View commit details
    Browse the repository at this point in the history

  4. Started with mailer and user can now dock station at corresponding st… 

    …ation
    @paolacalle
    paolacalle committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    aba2861 View commit details
    Browse the repository at this point in the history

  5. got rid of extra colors

    @kemerson-ryan @paolacalle
    kemerson-ryan authored and paolacalle committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    e022cf2 View commit details
    Browse the repository at this point in the history

  6. shows only the current users rental

    @kemerson-ryan @paolacalle
    kemerson-ryan authored and paolacalle committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    5c8cf3d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #31 from paolacalle/fixing_rentals_bike_create 

    - User can dock at selected station
    @paolacalle
    paolacalle authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    93078df View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. memberships wip

    @okveery
    okveery committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f89c221 View commit details
    Browse the repository at this point in the history

  2. edited memberships controller and views, you can now sign up for a me… 

    …mbership
    @okveery
    okveery committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    299bfa0 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. just logger info

    @chel48
    chel48 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    e967656 View commit details
    Browse the repository at this point in the history

  2. merge with master

    @chel48
    chel48 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    4b6da06 View commit details
    Browse the repository at this point in the history

  3. rental is now saving after merge problems

    @chel48
    chel48 committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    4efbe99 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. stations&bikes cohesive...more to come

    @kemerson-ryan
    kemerson-ryan committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    382030a View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. homepage update not done, border to do

    @kemerson-ryan
    kemerson-ryan committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    723e7fb View commit details
    Browse the repository at this point in the history

  2. sticky navbar

    @kemerson-ryan
    kemerson-ryan committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    5c71325 View commit details
    Browse the repository at this point in the history

  3. header,footer,rentals formatted

    @kemerson-ryan
    kemerson-ryan committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f6dccd0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #32 from paolacalle/makepretty1 

    Makepretty1
    @kemerson-ryan
    kemerson-ryan authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    e9de166 View commit details
    Browse the repository at this point in the history

  5. title, and redid new rental page

    @kemerson-ryan
    kemerson-ryan committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    c1a5b9f View commit details
    Browse the repository at this point in the history

  6. Removing faulty migrations

    @paolacalle
    paolacalle committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    97d9792 View commit details
    Browse the repository at this point in the history

  7. working, but still has return by date field in the new rental form

    @chel48
    chel48 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    b5e371b View commit details
    Browse the repository at this point in the history

  8. Stations contains lat and long

    @paolacalle
    paolacalle committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    1a32605 View commit details
    Browse the repository at this point in the history

  9. Deleted extra js

    @paolacalle
    paolacalle committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f007ddf View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. User geo-location now updates station table

    @paolacalle
    paolacalle committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bd92ec7 View commit details
    Browse the repository at this point in the history

  2. search works with locations filetered using near

    @paolacalle
    paolacalle committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    a6bba21 View commit details
    Browse the repository at this point in the history

  3. Added a dynamic map

    @paolacalle
    paolacalle committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    1d3d8a0 View commit details
    Browse the repository at this point in the history

  4. Got the map to display stations

    @paolacalle
    paolacalle committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8699d92 View commit details
    Browse the repository at this point in the history

  5. pageheaderfix returnbikebuttonized formattednewren

    @kemerson-ryan
    kemerson-ryan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bd920e0 View commit details
    Browse the repository at this point in the history

  6. update return bike partial

    @kemerson-ryan
    kemerson-ryan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    d72dab3 View commit details
    Browse the repository at this point in the history

  7. homepage link box css, footer white

    @kemerson-ryan
    kemerson-ryan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    ed0cc31 View commit details
    Browse the repository at this point in the history

  8. home page link box touchup

    @kemerson-ryan
    kemerson-ryan committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    933e9a9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #33 from paolacalle/makepretty2

    @kemerson-ryan
    kemerson-ryan authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    39f1f85 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. small good changes

    @kemerson-ryan
    kemerson-ryan committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    208be9f View commit details
    Browse the repository at this point in the history

  2. form without extra stuff

    @chel48
    chel48 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    85d8bda View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into hours_and_minutes

    @chel48
    chel48 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    8467d2b View commit details
    Browse the repository at this point in the history

  4. Completed map

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    bae1717 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into DRY_stations_locations

    @paolacalle
    paolacalle authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3b64491 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34 from paolacalle/DRY_stations_locations 

    added css to map and station display
cleaned up station and location --> made it into one
created a button for user to select station
fixed geo-location from browser to work with the new format of station
fixed rake file for station
removed some dead code
    @paolacalle
    paolacalle authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    b7f2b5b View commit details
    Browse the repository at this point in the history

  7. Added a back button

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    8948156 View commit details
    Browse the repository at this point in the history

  8. added back button

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    80957de View commit details
    Browse the repository at this point in the history

  9. Fixed a small space issue

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    33739a8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #35 from paolacalle/DRY_stations_locations 

    allows users to go back without losing the "progress" they made throughout the station and bike selection
    @paolacalle
    paolacalle authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    b233c70 View commit details
    Browse the repository at this point in the history

  11. Added user as a marker

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    d19f2d5 View commit details
    Browse the repository at this point in the history

  12. Added user as a marker 

    Added user as a marker
    @paolacalle
    paolacalle authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    04947e4 View commit details
    Browse the repository at this point in the history

  13. Added num of docked bike in the popup

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    00b4efc View commit details
    Browse the repository at this point in the history

  14. Centeralize the map view to the user maker when using near me

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    b60da2b View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into hours_and_minutes

    @chel48
    chel48 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    93fc70a View commit details
    Browse the repository at this point in the history

  16. got rid of the primary color in the nav

    @paolacalle
    paolacalle committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    b26f69d View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' into hours_and_minutes

    @chel48
    chel48 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    558a2f3 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. navbar color

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    e5c0663 View commit details
    Browse the repository at this point in the history

  2. Rename Email Address To Email In Users

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    d296dab View commit details
    Browse the repository at this point in the history

  3. about us page and link to button change

    @kemerson-ryan
    kemerson-ryan committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    131e535 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into makepretty3

    @kemerson-ryan
    kemerson-ryan authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    a33a8d0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #37 from paolacalle/makepretty3 

    Makepretty3
    @kemerson-ryan
    kemerson-ryan authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    4cc25f0 View commit details
    Browse the repository at this point in the history

  6. Incoperated devise

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    417654d View commit details
    Browse the repository at this point in the history

  7. basic sign in and sign out works

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    ac9bb47 View commit details
    Browse the repository at this point in the history

  8. Correctly redirects user

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    34a71ef View commit details
    Browse the repository at this point in the history

  9. Combined user and regristation logic

    @paolacalle
    paolacalle committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    ca08ddb View commit details
    Browse the repository at this point in the history

  10. membership and payment are connected

    @okveery
    okveery committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    5a05b62 View commit details
    Browse the repository at this point in the history

  11. memberships and payments work asf

    @okveery
    okveery committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    ca9f777 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. fixed the current_user not being saved using devise

    @paolacalle
    paolacalle committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    e7e3a9d View commit details
    Browse the repository at this point in the history

  2. Fixed navbar

    @paolacalle
    paolacalle committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    575fb60 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into reconstruct_user_model

    @paolacalle
    paolacalle authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    78b4178 View commit details
    Browse the repository at this point in the history

  4. paolacalle/reconstruct_user_model -- using devise 

    - Reconstruct user model using devise 
- fixed error with nav bar
- add toggle button to nav bar
    @paolacalle
    paolacalle authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    5a3bba0 View commit details
    Browse the repository at this point in the history

  5. Removed a sign in and log in thing i using for testing : )

    @paolacalle
    paolacalle committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    c6db5f6 View commit details
    Browse the repository at this point in the history

  6. changes

    @paolacalle
    paolacalle committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    e22403e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #39 from paolacalle/reconstruct_user_model 

    small error
    @paolacalle
    paolacalle authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    7bd93b6 View commit details
    Browse the repository at this point in the history

  8. small navbar changes

    @paolacalle
    paolacalle committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    be005f0 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into fixing_navbar

    @paolacalle
    paolacalle authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    816538d View commit details
    Browse the repository at this point in the history

  10. Merge pull request #40 from paolacalle/fixing_navbar 

    small navbar changes
    @paolacalle
    paolacalle authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    de9aa58 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. returned at time shown in past rentals

    @chel48
    chel48 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    db73569 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into hours_and_minutes

    @chel48
    chel48 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    24ef4f7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #41 from paolacalle/hours_and_minutes 

    Hours and minutes
    @chel48
    chel48 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    bbd51f3 View commit details
    Browse the repository at this point in the history

  4. mailer configed using sendgrid -- forget password works

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    c330df6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #42 from paolacalle/configing_mailer 

    mailer configed using sendgrid -- forget password works
    @paolacalle
    paolacalle authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    50ee887 View commit details
    Browse the repository at this point in the history

  6. privated the key since sendgrid actually destroys them if not do sooooo

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    d319bc0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #43 from paolacalle/configing_mailer 

    privated the key since sendgrid actually destroys them if not do sooooo
    @paolacalle
    paolacalle authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    ba7624f View commit details
    Browse the repository at this point in the history

  8. delete membership doesnt work

    @okveery
    okveery committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    6ea32f8 View commit details
    Browse the repository at this point in the history

  9. pin verfication

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    1fa6729 View commit details
    Browse the repository at this point in the history

  10. expiration works, fixed flow between membership and payments

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    a24e885 View commit details
    Browse the repository at this point in the history

  11. small message

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    2a5584e View commit details
    Browse the repository at this point in the history

  12. starting files

    @chel48
    chel48 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    e877ec8 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into feedback_form

    @chel48
    chel48 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    8acf52d View commit details
    Browse the repository at this point in the history

  14. some styling

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    56197e3 View commit details
    Browse the repository at this point in the history

  15. payments for hourly made rentals

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    46d6fcf View commit details
    Browse the repository at this point in the history

  16. small bug

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    a9e8c70 View commit details
    Browse the repository at this point in the history

  17. small problem withh home link

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    4189bf8 View commit details
    Browse the repository at this point in the history

  18. late fee created

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    3f2119c View commit details
    Browse the repository at this point in the history

  19. Changed late fee msg to alert

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    c113c5d View commit details
    Browse the repository at this point in the history

  20. Merge pull request #44 from paolacalle/expiration 

    - Expiration
- Late fee 
- prevents user from creating a new rental if they have a pending payment 
- connected hr rental and membership rentals 
- added CSS to the membership selection
- added CSS to the payment form --> auto fill some components depending on the type of payment
    @paolacalle
    paolacalle authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    08af035 View commit details
    Browse the repository at this point in the history

  21. homebike a little

    @kemerson-ryan
    kemerson-ryan committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    3ea8d52 View commit details
    Browse the repository at this point in the history

  22. small msg

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    e96d445 View commit details
    Browse the repository at this point in the history

  23. general feedback form working

    @chel48
    chel48 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    27c4822 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #45 from paolacalle/expiration 

    small msg
    @paolacalle
    paolacalle authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    efb6efb View commit details
    Browse the repository at this point in the history

  25. prettifiy the login and siugn up pages

    @kemerson-ryan
    kemerson-ryan committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    fcaa0c0 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #46 from paolacalle:makepretty4 

    Makepretty4
    @kemerson-ryan
    kemerson-ryan authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    2635a20 View commit details
    Browse the repository at this point in the history

  27. Added containers for info

    @paolacalle
    paolacalle committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    fdf53e9 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #47 from paolacalle/fixing_account 

    Added containers for info
    @paolacalle
    paolacalle authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    07ead66 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. footer and little fixes

    @chel48
    chel48 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    92581e5 View commit details
    Browse the repository at this point in the history

  2. updates

    @chel48
    chel48 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    fb439ad View commit details
    Browse the repository at this point in the history

  3. fixed css of login

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1f85d8f View commit details
    Browse the repository at this point in the history

  4. small change

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    9fb74f2 View commit details
    Browse the repository at this point in the history

  5. made a form card -- for login, forgot password, sign up

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0dd4da6 View commit details
    Browse the repository at this point in the history

  6. added small animation to form cards

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    367bc9e View commit details
    Browse the repository at this point in the history

  7. fixed membership options on home page

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    00b61d4 View commit details
    Browse the repository at this point in the history

  8. start on getting a confirmation email to send after submitting feedba… 

    …ck, from controller?
    @chel48
    chel48 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0aeb6fb View commit details
    Browse the repository at this point in the history

  9. Allow user to edit their account and delete account if no payments/me… 

    …mbership
    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    790bbc6 View commit details
    Browse the repository at this point in the history

  10. merging with master

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8159560 View commit details
    Browse the repository at this point in the history

  11. emails are confirmable and lockable

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    cdb41fb View commit details
    Browse the repository at this point in the history

  12. user reset password

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5a8ac7c View commit details
    Browse the repository at this point in the history

  13. Merge pull request #48 from paolacalle/email_confimation 

    - Email confirmation --> user must verify account before the creation of an account
    @paolacalle
    paolacalle authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    6b38527 View commit details
    Browse the repository at this point in the history

  14. back btn

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1fbb481 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #49 from paolacalle/email_confimation 

    back btn
    @paolacalle
    paolacalle authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5ac429a View commit details
    Browse the repository at this point in the history

  16. added show station btn to popup

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0b92174 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #50 from paolacalle/email_confimation 

    added show station btn to popup
    @paolacalle
    paolacalle authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f5c3b41 View commit details
    Browse the repository at this point in the history

  18. consistancy updates, updated links/routes

    @kemerson-ryan
    kemerson-ryan committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e0c3e4a View commit details
    Browse the repository at this point in the history

  19. route to review station form is working, but saving feedback not work… 

    …ing, email confirmation is not working
    @chel48
    chel48 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    01ba530 View commit details
    Browse the repository at this point in the history

  20. leaving a review on a station works

    @chel48
    chel48 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d67585d View commit details
    Browse the repository at this point in the history

  21. account-specific rental info displayed

    @kemerson-ryan
    kemerson-ryan committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ae94342 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into feedback_form

    @chel48
    chel48 authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f3935e6 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #51 from paolacalle/feedback_form 

    Feedback form
    @chel48
    chel48 authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    60f5538 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into makepretty5

    @kemerson-ryan
    kemerson-ryan authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    63fd27a View commit details
    Browse the repository at this point in the history

  25. Merge pull request #52 from paolacalle/makepretty5 

    Makepretty5
    @kemerson-ryan
    kemerson-ryan authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c08971f View commit details
    Browse the repository at this point in the history

  26. team photo jpeg in images

    @kemerson-ryan
    kemerson-ryan committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    527276f View commit details
    Browse the repository at this point in the history

  27. Merge pull request #53 from paolacalle:makepretty6 

    team photo jpeg in images
    @kemerson-ryan
    kemerson-ryan authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    3e2e17a View commit details
    Browse the repository at this point in the history

  28. Fixed err with membership (thxs Laura) & added rate to review form

    @paolacalle
    paolacalle committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    35eb616 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. basic feedback confirmation email

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    75e5e6c View commit details
    Browse the repository at this point in the history

  2. small change

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    aac27b8 View commit details
    Browse the repository at this point in the history

  3. removed the script from profile edit, made it harder for user to canc… 

    …el account
    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    74a049f View commit details
    Browse the repository at this point in the history

  4. deleted dead code

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    544a401 View commit details
    Browse the repository at this point in the history

  5. small changes

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3811350 View commit details
    Browse the repository at this point in the history

  6. about us page and image-background dryness

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    feef209 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #54 from paolacalle:aboutus 

    about us page and image-background dryness
    @kemerson-ryan
    kemerson-ryan authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b0c2190 View commit details
    Browse the repository at this point in the history

  8. feedback and review forms working with email confirmation

    @chel48
    chel48 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    7d0e2ff View commit details
    Browse the repository at this point in the history

  9. small changes

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    eae2b99 View commit details
    Browse the repository at this point in the history

  10. made sender email a ENV thing

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    57e6548 View commit details
    Browse the repository at this point in the history

  11. added favicon and membership images

    @okveery
    okveery committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    70089c7 View commit details
    Browse the repository at this point in the history

  12. show station

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    c1eade0 View commit details
    Browse the repository at this point in the history

  13. change background color of past rental hovers, adjustments to nav bar… 

    … and footer, add back arrow to qr code page
    @chel48
    chel48 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ef2bf42 View commit details
    Browse the repository at this point in the history

  14. update

    @chel48
    chel48 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ac18981 View commit details
    Browse the repository at this point in the history

  15. show reviews in user show

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0e4f5e5 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into stationshow

    @kemerson-ryan
    kemerson-ryan authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2c673f8 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #55 from paolacalle/stationshow 

    Stationshow
    @kemerson-ryan
    kemerson-ryan authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f746308 View commit details
    Browse the repository at this point in the history

  18. dry user mailer

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0b694da View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/paolacalle/valetbike

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1d1b92f View commit details
    Browse the repository at this point in the history

  20. color changes

    @chel48
    chel48 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    58ce01f View commit details
    Browse the repository at this point in the history

  21. Merge pull request #56 from paolacalle/last_changes 

    Last changes
    @chel48
    chel48 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    982c83b View commit details
    Browse the repository at this point in the history

  22. minor user view change

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f548644 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #57 from paolacalle:reviewssubmitted 

    Reviewssubmitted
    @kemerson-ryan
    kemerson-ryan authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0ef23d5 View commit details
    Browse the repository at this point in the history

  24. Update Gemfile.lock

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    bf74579 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' of https://github.com/paolacalle/valetbike

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8b84357 View commit details
    Browse the repository at this point in the history

  26. memebership path corrected

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8b48519 View commit details
    Browse the repository at this point in the history

  27. review star no hover color other than on the value

    @kemerson-ryan
    kemerson-ryan committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2463fef View commit details
    Browse the repository at this point in the history

  28. Merge pull request #58 from paolacalle/moreviewspretty 

    Moreviewspretty
    @kemerson-ryan
    kemerson-ryan authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    69f821c View commit details
    Browse the repository at this point in the history

  29. minor changes, quick fix to nav

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    39c1d5c View commit details
    Browse the repository at this point in the history

  30. fix navbar problem, added styling for images

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3f1a191 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' into addpictures

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    9ab1306 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #59 from paolacalle/addpictures 

    added favicon and membership images
    @paolacalle
    paolacalle authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1a8daad View commit details
    Browse the repository at this point in the history

  33. small change

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    c3e0304 View commit details
    Browse the repository at this point in the history

  34. ruby railers logo in contact us

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    0805813 View commit details
    Browse the repository at this point in the history

  35. last changes

    @paolacalle
    paolacalle committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e19cfec View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. users show with no review fixed

    @kemerson-ryan
    kemerson-ryan committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    dc1522d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from paolacalle:usershowreview 

    Usershowreview
    @kemerson-ryan
    kemerson-ryan authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    068f4e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. fixed usershow review bug

    @kemerson-ryan
    kemerson-ryan committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    2ae1d17 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from paolacalle:usershowreview 

    Usershowreview
    @kemerson-ryan
    kemerson-ryan authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    9bd2745 View commit details
    Browse the repository at this point in the history