GitLab

# Conflicts:
#	src/app/hirebike/hirebike.page.html

Resolve "Page loader is getting displayed everywhere"

Closes #52

See merge request 92khra1mst/hft_awado_app!37

Resolve "Ride History"

Closes #20

See merge request 92khra1mst/hft_awado_app!35

Merge branch '20-ride-history-2' of https://gitlab.rz.hft-stuttgart.de/92khra1mst/hft_awado_app into 20-ride-history-2

Resolve "Ride History"

Closes #20

See merge request 92khra1mst/hft_awado_app!30

# Conflicts:
#   src/app/hirebike/hirebike.page.ts

Resolve "While navigating between pages, map doesn't load properly."

Closes #51

See merge request 92khra1mst/hft_awado_app!34

Resolve "Add dependencies locally to improve app performance"

Closes #50

See merge request 92khra1mst/hft_awado_app!33

Resolve "Show loading page"

Closes #49

See merge request 92khra1mst/hft_awado_app!32

Merge branch '48-create-a-common-service-for-getting-user-s-current-location-and-live-location' into 'master'

Resolve "Create a common service for getting user's current location and live location"

Closes #48

See merge request 92khra1mst/hft_awado_app!31

Resolve "Show stepwise navigation instructions on my ride page"

Closes #45

See merge request 92khra1mst/hft_awado_app!29

Resolve "Show bicycle route between bike and user's destination"

Closes #46

See merge request 92khra1mst/hft_awado_app!28

Resolve "Display calculated name of the street on reservation and hire page"

Closes #38

See merge request 92khra1mst/hft_awado_app!23