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

Station based end of rent when no tracking is available #28

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

Station based end of rent when no tracking is available #28

wants to merge 41 commits into from

Commits on Dec 1, 2020

  1. Set default position of map to Wedel coordinates

    @Amar-Bolkan
    Amar-Bolkan committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    06db9e5 View commit details
    Browse the repository at this point in the history

  2. Add Costum login button, which accesses the cykel admin login page an… 

    …d redirects back to voorwiel
    @Amar-Bolkan
    Amar-Bolkan committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    538223b View commit details
    Browse the repository at this point in the history

  3. Check TODO

    @Amar-Bolkan
    Amar-Bolkan committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    2439be6 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2020

  1. Custom Login funktion hinzugefuegt.

    @Amar-Bolkan
    Amar-Bolkan committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    ac6e35b View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2020

  1. cleaned up

    @Amar-Bolkan
    Amar-Bolkan committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    a80d747 View commit details
    Browse the repository at this point in the history

  2. Added choosable return locations. Currently hardcoded

    @Amar-Bolkan
    Amar-Bolkan committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    5e5d455 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Added selectable return location, when renting bikes

    @Amar-Bolkan
    Amar-Bolkan committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    5250ecd View commit details
    Browse the repository at this point in the history

  2. Textbox for Error Message

    @mlange304
    mlange304 committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    655f795 View commit details
    Browse the repository at this point in the history

  3. Changed CustomLogin URL to relativ path

    @Amar-Bolkan
    Amar-Bolkan committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    03f70b2 View commit details
    Browse the repository at this point in the history

  4. Todo entfernt

    @Amar-Bolkan
    Amar-Bolkan committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    85c2a72 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. messages.json für custom login aktualisiert

    @mlange304
    mlange304 committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    c928a55 View commit details
    Browse the repository at this point in the history

  2. Changed request for station locations from POST to GET

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    2800e52 View commit details
    Browse the repository at this point in the history

  3. Added conditional rendering so the user has to select a location befo… 

    …r returning the bike
    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    332020c View commit details
    Browse the repository at this point in the history

  4. Formatting

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    94e1228 View commit details
    Browse the repository at this point in the history

  5. added configurable messages for the return locations etc., also made … 

    …the drop down list refetch the stations to ensure there are always selectable locations
    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    12b3e3d View commit details
    Browse the repository at this point in the history

  6. Formatting

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    47a1dc7 View commit details
    Browse the repository at this point in the history

  7. Message Dialog with wrong password from messages.json

    @mlange304
    mlange304 committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    cbde3c0 View commit details
    Browse the repository at this point in the history

  8. Made messages configurable for english and german display, red box du… 

    …ring login only rendered when sending wrong user credentials
    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    16ca31a View commit details
    Browse the repository at this point in the history

  9. Max with custom login 400

    @mlange304
    mlange304 committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    acfbfef View commit details
    Browse the repository at this point in the history

  10. Merge branch 'custom-login' of https://github.com/iteratec/voorwiel i… 

    …nto custom-login
    @mlange304
    mlange304 committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    f1722b3 View commit details
    Browse the repository at this point in the history

  11. Formatting

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    3011e45 View commit details
    Browse the repository at this point in the history

  12. made the selectable return option more intuitive for the user

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    9a1aa0b View commit details
    Browse the repository at this point in the history

  13. changes the message for choosable locations

    @Amar-Bolkan
    Amar-Bolkan committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    b04ae0c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Bug Fix when returning a bike, now each rentId gets associated with i… 

    …ts own selectable rreturn location
    @Amar-Bolkan
    Amar-Bolkan committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    ee3eeea View commit details
    Browse the repository at this point in the history

  2. removed unnecessary if statement inside endRent

    @Amar-Bolkan
    Amar-Bolkan committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    5b26be5 View commit details
    Browse the repository at this point in the history

  3. Formatting

    @Amar-Bolkan
    Amar-Bolkan committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    02660e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. Design Änderungen der Error-Box

    @mlange304
    mlange304 committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    eed8ebd View commit details
    Browse the repository at this point in the history

  2. Dropdown-Pfeil nicht mehr hardcoded sondern über CSS-Styles

    @mlange304
    mlange304 committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    9448b5a View commit details
    Browse the repository at this point in the history

  3. Clean up

    @mlange304
    mlange304 committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    8bce227 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into selectable-return-locations

    @Amar-Bolkan
    Amar-Bolkan authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    8eeb3e8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from iteratec/selectable-return-locations 

    Selectable return locations
    @Amar-Bolkan
    Amar-Bolkan authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    0267df0 View commit details
    Browse the repository at this point in the history

  6. Created separate component to handle the returning bikes without trac… 

    …ker available. Added component to rent.vue and made it selectable by a boolean.
    @Amar-Bolkan
    Amar-Bolkan committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    e56d5a8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from iteratec/configurable-bike-return-method 

    Created separate component to handle the returning bikes without trac…
    @mlange304
    mlange304 authored Dec 14, 2020
    Configuration menu
    Copy the full SHA
    d41736a View commit details
    Browse the repository at this point in the history

  8. removed a comment

    @Amar-Bolkan
    Amar-Bolkan committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    808d38d View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Formatting, removed unused methods inside Rent.vue

    @Amar-Bolkan
    Amar-Bolkan committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    c421eea View commit details
    Browse the repository at this point in the history

  2. Moved TRACKERAVAILABLE into the config.development.js

    @Amar-Bolkan
    Amar-Bolkan committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    55e6cf4 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. made environment configurable

    Jonas Laacke committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    e81d3fb View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2021

  1. Merge branch 'stadtulm:master' into master

    @jlaacke
    jlaacke authored Aug 9, 2021
    Configuration menu
    Copy the full SHA
    52b9421 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. set default for end station select; redirect to customLogin

    Jonas Laacke committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    ec475c4 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2021

  1. use gbfs station information for end station selection

    Jonas Laacke committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    0678236 View commit details
    Browse the repository at this point in the history

  2. cleaned up end rent functions

    Jonas Laacke committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    695bb83 View commit details
    Browse the repository at this point in the history