Age | Commit message (Collapse) | Author |
|
|
|
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
|
|
|
|
|
|
|
|
|
|
from list view
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
adjusted zoomLevelToScale(zoom)
|
|
denominators
|
|
device selection zoom
|
|
now each map URL has its own cache dir
|
|
|
|
|
|
|
|
|
|
Conflicts:
androidApp/src/main/res/layout/user_information_activity.xml
|
|
and changed default view to MAP
|
|
|
|
|
|
|
|
|
|
SessionController
|
|
|
|
|
|
|
|
|