Age | Commit message (Collapse) | Author |
|
into url_switch
|
|
at login
|
|
|
|
removed annoying auto-generated redundant qualifiers
|
|
|
|
fragment
|
|
|
|
|
|
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
work with timer
|
|
|
|
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
androidApp/src/main/res/values/map_layers.xml
|
|
|
|
|
|
|
|
|
|
|
|
types in controller and API
|
|
|
|
|
|
|
|
|
|
adjusted zoomLevelToScale(zoom)
|
|
|
|
denominators
|
|
Conflicts:
androidApp/src/main/res/layout/user_information_activity.xml
|
|
and changed default view to MAP
|
|
|
|
|
|
|
|
|
|
|
|
SessionController
|
|
|
|
|
|
|
|
|
|
- Displays the user information
- Allows the user to sign out
|
|
|
|
and many fixes
|
|
open device location in map, minor UI tweaks and added translations.
|
|
removed unnecessary content description warnings.
|
|
# Conflicts:
# androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
# androidApp/src/main/res/values/strings.xml
|