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

Mei #236

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

Mei #236

wants to merge 185 commits into from

Commits on Oct 31, 2023

  1. Update README.md 

    Added name
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    a75c458 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from meic-123/Sami 

    Update README.md
    @meic-123
    meic-123 authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    139242a View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @Sami-Aiyathurai
    Sami-Aiyathurai authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    a81a8ea View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from meic-123/Sami 

    Update README.md
    @meic-123
    meic-123 authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    cd7e28f View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. testing

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    12ad31e View commit details
    Browse the repository at this point in the history

  2. Who knows

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    af1b8c9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from meic-123/Sami 

    testing
    @meic-123
    meic-123 authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    9fd2d3e View commit details
    Browse the repository at this point in the history

  4. skeleton pages

    @achristen3386
    achristen3386 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    77ffc8c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5 from meic-123/Home-page-and-skeleton-Anna 

    skeleton pages
    @meic-123
    meic-123 authored Nov 2, 2023
    Configuration menu
    Copy the full SHA
    bab6c5b View commit details
    Browse the repository at this point in the history

  6. routing and links

    @achristen3386
    achristen3386 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    90819b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Merge pull request #6 from meic-123/Home-page-and-skeleton-Anna 

    routing and links
    @meic-123
    meic-123 authored Nov 3, 2023
    Configuration menu
    Copy the full SHA
    2be0a03 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. finish print bikes and stations

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

  2. update bikes and stations

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    f2d7205 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from meic-123/Sami 

    update bikes and stations
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    637952f View commit details
    Browse the repository at this point in the history

  4. Header and Footer

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

  5. Header and Footer CSS 

    11/7 - mei
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    7a00663 View commit details
    Browse the repository at this point in the history

  6. Header and Footer HTML 

    11/7 - mei
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a665153 View commit details
    Browse the repository at this point in the history

  7. tables for users, memberships and transactions

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b8c8774 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #8 from meic-123/Sami 

    tables for users, memberships and transactions
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    91b8622 View commit details
    Browse the repository at this point in the history

  9. Update Home Page.html.erb 

    11/7 - mei
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    43e47e9 View commit details
    Browse the repository at this point in the history

  10. Update index.html.erb

    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    6706d56 View commit details
    Browse the repository at this point in the history

  11. resolve conflict

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

  12. Merge branch 'master' of https://github.com/meic-123/valetbike into a… 

    …nh-print-data
    @Anhtran0208
    Anhtran0208 committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    63ec632 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #12 from meic-123/anh-print-data 

    finish print bikes and stations
    @Anhtran0208
    Anhtran0208 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    0aa7d63 View commit details
    Browse the repository at this point in the history

  14. Update index.html.erb

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

  15. Merge branch 'mei' of https://github.com/meic-123/valetbike into mei

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

  16. Update index.html.erb

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

  17. Merge pull request #13 from meic-123/mei 

    Mei
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    9a80fc7 View commit details
    Browse the repository at this point in the history

  18. Fixed href link

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    c852917 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #14 from meic-123/Sami 

    Fixed href link
    @meic-123
    meic-123 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    0cbc92a View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. created migrations for trip, favorite and report

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    f625889 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from meic-123/Sami 

    created migrations for trip, favorite and report
    @meic-123
    meic-123 authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    fdd0997 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Move Stylesheets from Application to Global

    @meic123
    meic123 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    2652aa2 View commit details
    Browse the repository at this point in the history

  2. made relationship between memberships and users

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    283b39e View commit details
    Browse the repository at this point in the history

  3. login and logout skeleton functionality

    @achristen3386
    achristen3386 committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    52c128c View commit details
    Browse the repository at this point in the history

  4. Started with the relations for trips

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    baabc6a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from meic-123/login 

    login and logout skeleton functionality
    @meic-123
    meic-123 authored Nov 9, 2023
    Configuration menu
    Copy the full SHA
    1aecb6d View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. header + footer on each page

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

Commits on Nov 12, 2023

  1. Merge branch 'master' into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    2e53998 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from meic-123/Sami 

    Sami
    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    dcc8068 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    90310cf View commit details
    Browse the repository at this point in the history

  4. something is wrong

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    8966974 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from meic-123/Sami 

    Sami
    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    b2c8154 View commit details
    Browse the repository at this point in the history

  6. edited global css

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

  7. Merge branch 'master' into mei

    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    cd3aaf4 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #19 from meic-123/mei 

    Mei header + footer
    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    a9c6ca8 View commit details
    Browse the repository at this point in the history

  9. update routes

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

  10. update routes

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

  11. Merge branch 'mei' of https://github.com/meic-123/valetbike into mei

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

  12. Update routes.rb

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

  13. Merge pull request #20 from meic-123/mei 

    Mei routes
    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    a99637a View commit details
    Browse the repository at this point in the history

  14. Revert "Mei routes"

    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    0832fbb View commit details
    Browse the repository at this point in the history

  15. Merge pull request #21 from meic-123/revert-20-mei 

    Revert "Mei routes"
    @meic-123
    meic-123 authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    199c41f View commit details
    Browse the repository at this point in the history

  16. finish about page

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

  17. resolve-conflict

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

  18. resolve conflict

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

  19. resolve conflict

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

Commits on Nov 14, 2023

  1. Merge pull request #24 from meic-123/anh-about-page 

    finish about page
    @meic-123
    meic-123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    b3736a3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Sami' meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    f8cfdb5 View commit details
    Browse the repository at this point in the history

  3. added signin/out functionality

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

  4. Merge branch 'master' into login

    @achristen3386
    achristen3386 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    628cda8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25 from meic-123/login 

    added signin/out functionality
    @meic-123
    meic-123 authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    2c0e6f4 View commit details
    Browse the repository at this point in the history

  6. troubleshooting nomethod error

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

  7. Merge branch 'login'

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

Commits on Nov 15, 2023

  1. header + footer applied to all

    @meic123
    meic123 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    0e8e6ec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #26 from meic-123/header-and-footer-applied-to-all 

    header + footer applied to all
    @meic-123
    meic-123 authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    efb8129 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    59fb047 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27 from meic-123/Sami 

    Sami
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    ee2ab28 View commit details
    Browse the repository at this point in the history

  5. re-adding signup/sign in functionality

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    dd8b847 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #28 from meic-123/Sami 

    re-adding signup/sign in functionality
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    5e2e06d View commit details
    Browse the repository at this point in the history

  7. Working map, button in header but revisit ifparams

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    159b63a View commit details
    Browse the repository at this point in the history

  8. fixed sign in button

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    d2918af View commit details
    Browse the repository at this point in the history

  9. Merge pull request #29 from meic-123/Sami 

    Working map, button in header but revisit ifparams
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    17ab5f3 View commit details
    Browse the repository at this point in the history

  10. Fixed stations printing

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    4e87417 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Cleaned up the number of controllers

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    5ca7813 View commit details
    Browse the repository at this point in the history

  2. membership into homepage deleted reports

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    f52012a View commit details
    Browse the repository at this point in the history

  3. short message to explain pages

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    c75a534 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #30 from meic-123/Sami 

    Sami
    @meic-123
    meic-123 authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    605bebc View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. logo, fixed sign in home page

    @meic123
    meic123 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    52aa8b1 View commit details
    Browse the repository at this point in the history

  2. added capacity default

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    de79ad9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #31 from meic-123/Sami 

    added capacity default
    @meic-123
    meic-123 authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    1594c48 View commit details
    Browse the repository at this point in the history

  4. Update about.html.erb

    @Anhtran0208
    Anhtran0208 authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    6474984 View commit details
    Browse the repository at this point in the history

  5. update about

    @Anhtran0208
    Anhtran0208 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    1aa75af View commit details
    Browse the repository at this point in the history

  6. fix button

    @meic123
    meic123 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    355cda8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/meic-123/valetbike

    @meic123
    meic123 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    705e1d1 View commit details
    Browse the repository at this point in the history

  8. add logo

    @meic123
    meic123 committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    d1a4bd2 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. finish payment

    @Anhtran0208
    Anhtran0208 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    62f4b5a View commit details
    Browse the repository at this point in the history

  2. finish payment

    @Anhtran0208
    Anhtran0208 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    912c9d3 View commit details
    Browse the repository at this point in the history

  3. resolve conflict

    @Anhtran0208
    Anhtran0208 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    889791e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge pull request #33 from meic-123/anh-payment 

    finish payment
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    2fe5539 View commit details
    Browse the repository at this point in the history

  2. fixed merge error

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    15bb4bb View commit details
    Browse the repository at this point in the history

  3. installed mapkick gem

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b13a955 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #34 from meic-123/Sami 

    fixed merge error
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    5880070 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. fixed map to load immediatly

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    393f2eb View commit details
    Browse the repository at this point in the history

  2. fixed map

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3310fe0 View commit details
    Browse the repository at this point in the history

  3. move map to active trip controller

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    7c231bc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35 from meic-123/Sami 

    Sami
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    d252863 View commit details
    Browse the repository at this point in the history

  5. updating database for personal computer

    @achristen3386
    achristen3386 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    4a50545 View commit details
    Browse the repository at this point in the history

  6. added rentmap,returnmap,and basemap

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    6065a80 View commit details
    Browse the repository at this point in the history

  7. updating databasewith active_bike, total_minutes, and end_at columns

    @achristen3386
    achristen3386 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    9595eb9 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #36 from meic-123/update_database 

    Update database
    @achristen3386
    achristen3386 authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    dcac7d0 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    9c9e5ad View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. adding return view under active_trip

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

  2. Merge pull request #37 from meic-123/returns 

    adding return view under active_trip
    @achristen3386
    achristen3386 authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    198803d View commit details
    Browse the repository at this point in the history

  3. base map

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    22aaf54 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c898d54 View commit details
    Browse the repository at this point in the history

  5. added dummy return page

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

Commits on Nov 30, 2023

  1. update to master

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

  2. Merge branch 'master' of https://github.com/meic-123/valetbike into a… 

    …nh-payment
    @Anhtran0208
    Anhtran0208 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    0ef98b7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8024f6f View commit details
    Browse the repository at this point in the history

  4. base map set up

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    861eaec View commit details
    Browse the repository at this point in the history

  5. Merge pull request #38 from meic-123/Sami 

    Sami
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c175cb5 View commit details
    Browse the repository at this point in the history

  6. start on rent map page

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    13f482c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #39 from meic-123/Sami 

    start on rent map page
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    ee1eb1f View commit details
    Browse the repository at this point in the history

  8. Editing Pages 

    edit contact us, home how it works
    @meic123
    meic123 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    1587107 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/meic-123/valetbike

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

Commits on Dec 1, 2023

  1. mostly finished rent map

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    39be0c2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #40 from meic-123/Sami 

    mostly finished rent map
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    ae65705 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/meic-123/valetbike into a… 

    …nh-payment
    @Anhtran0208
    Anhtran0208 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    fec48c4 View commit details
    Browse the repository at this point in the history

  4. added data csvs and made rake tasks

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f49d20f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #41 from meic-123/Sami 

    added data csvs and made rake tasks
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    7ea24b5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/meic-123/valetbike into a… 

    …nh-payment
    @Anhtran0208
    Anhtran0208 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    5c8e226 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. git

    @Anhtran0208
    Anhtran0208 committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    5450c4f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #42 from meic-123/anh-rent 

    Anh rent
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 2, 2023
    Configuration menu
    Copy the full SHA
    0091154 View commit details
    Browse the repository at this point in the history

  3. fix csv file

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

  4. Merge pull request #43 from meic-123/anh-rent 

    fix csv file
    @Anhtran0208
    Anhtran0208 authored Dec 2, 2023
    Configuration menu
    Copy the full SHA
    99faed3 View commit details
    Browse the repository at this point in the history

  5. partway through return functionality

    @achristen3386
    achristen3386 committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    4ea5cdd View commit details
    Browse the repository at this point in the history

  6. "commiting to pull from origin to get ahn's model"

    @achristen3386
    achristen3386 committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    005dd5f View commit details
    Browse the repository at this point in the history

  7. "switching over to return functionality, accident"

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

Commits on Dec 3, 2023

  1. finish rent-return

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

  2. Merge pull request #44 from meic-123/anh-rent-return 

    finish rent-return
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    069626f View commit details
    Browse the repository at this point in the history

  3. added customizeable user account and sign up pages with devise

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

  4. Merge branch 'master' into account_creation

    @achristen3386
    achristen3386 authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    3888dad View commit details
    Browse the repository at this point in the history

  5. Merge pull request #45 from meic-123/account_creation 

    Merging new devise controllers and views
    @achristen3386
    achristen3386 authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    4b22cc3 View commit details
    Browse the repository at this point in the history

  6. How it works

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

  7. Merge pull request #46 from meic-123/mei 

    How it works
    @meic-123
    meic-123 authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    ae347a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. adding account controller for managing user info

    @achristen3386
    achristen3386 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    58c54f0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #47 from meic-123/account_creation 

    adding account controller for managing user info
    @achristen3386
    achristen3386 authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    3aa2eae View commit details
    Browse the repository at this point in the history

  3. fix syntax error

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

  4. Merge pull request #48 from meic-123/anh-rent-return 

    fix syntax error
    @Anhtran0208
    Anhtran0208 authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9481be6 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. tweaks to account and edit user information pages

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

  2. edit style of login, signup and account pages

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

  3. Merge pull request #49 from meic-123/account_creation 

    Edited style of login, signup and edit account pages.
    @achristen3386
    achristen3386 authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    6889613 View commit details
    Browse the repository at this point in the history

  4. how it works, about, contact, home

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

  5. Merge pull request #50 from meic-123/mei 

    how it works, about, contact, home
    @meic-123
    meic-123 authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    1f0b5f5 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. finish payment

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

  2. resolve conflicts

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

Commits on Dec 7, 2023

  1. Merge pull request #51 from meic-123/anh-fix-payment 

    finish payment
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e082fb4 View commit details
    Browse the repository at this point in the history

  2. testing

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    f4bcfb5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:meic-123/valetbike into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e831bfd View commit details
    Browse the repository at this point in the history

  4. ask users to subscribe before renting

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

  5. Merge pull request #52 from meic-123/anh-new-rent 

    ask users to subscribe before renting
    @Anhtran0208
    Anhtran0208 authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    5abd2aa View commit details
    Browse the repository at this point in the history

  6. Updated maps and created unlocking code

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    24714e9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into Sami

    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    f4ec030 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #53 from meic-123/Sami 

    Sami
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c7517fb View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. update stripe

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

  2. Merge pull request #54 from meic-123/anh-update-stripe 

    update stripe
    @Anhtran0208
    Anhtran0208 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    f06d181 View commit details
    Browse the repository at this point in the history

  3. Fixed database usage and worked on renting styling

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    acf97e1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55 from meic-123/Sami 

    Fixed database usage and worked on renting styling
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    abe041e View commit details
    Browse the repository at this point in the history

  5. dropdown

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

  6. finished styling for returning

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    86478b7 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #56 from meic-123/Sami 

    finished styling for returning
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    422cea5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'mei' into master

    @meic-123
    meic-123 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    8807b01 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #57 from meic-123/master 

    update mei
    @meic-123
    meic-123 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    334fc4b View commit details
    Browse the repository at this point in the history

  10. stash

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

  11. weird database issues

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

  12. pulling sami changes

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

  13. Merge branch 'master' of https://github.com/meic-123/valetbike into mei

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

  14. Merge branch 'mei' of https://github.com/meic-123/valetbike into mei

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

  15. removed unused controllers, helpers and routes

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

  16. Merge pull request #58 from meic-123/remove_unused 

    removed:
accoutn_helper.rb
return.html.erb
payment_information_controller.erb
payment information folder + index
pay_information routes
active_trip/return routes
past_trips/index from routes
    @achristen3386
    achristen3386 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    103a38b View commit details
    Browse the repository at this point in the history

  17. display membership

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

  18. Merge branch 'master' of https://github.com/meic-123/valetbike into a… 

    …nh-update-stripe
    @Anhtran0208
    Anhtran0208 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    f716797 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #59 from meic-123/anh-display-membership 

    Anh display membership
    @Anhtran0208
    Anhtran0208 authored Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7d652e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. changed the styling on the membershio buttons

    @Sami-Aiyathurai
    Sami-Aiyathurai committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    aaacba8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from meic-123/Sami 

    changed the styling on the membership buttons
    @Sami-Aiyathurai
    Sami-Aiyathurai authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    dafde99 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Merge branch 'master' of https://github.com/meic-123/valetbike into mei

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

  2. dropdown

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

  3. Merge pull request #61 from meic-123/mei 

    Mei
    @meic-123
    meic-123 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8226e3b View commit details
    Browse the repository at this point in the history

  4. dropdown and header styling

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

  5. Merge branch 'master' into mei

    @meic-123
    meic-123 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f95a0f6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #62 from meic-123/mei 

    Mei
    @meic-123
    meic-123 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5167810 View commit details
    Browse the repository at this point in the history

  7. fix small error

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

  8. Merge pull request #63 from meic-123/anh-display-membership 

    fix small error
    @Anhtran0208
    Anhtran0208 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    cac723d View commit details
    Browse the repository at this point in the history

  9. make pretty

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