mvglasow
|
67b1d918ba
|
Merge commit '7312560f48' into traffic
# Conflicts:
# iphone/Maps/UI/Settings/SettingsNavigationView.swift
# libs/drape_frontend/rule_drawer.cpp
# libs/traffic/traffic_info.cpp
|
2025-11-21 22:33:12 +02:00 |
|
Dobri Dabar
|
936e05283c
|
[desktop] Sort map languages in the dropdown list in preferences
Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org>
|
2025-10-28 21:38:28 +01:00 |
|
mvglasow
|
38e98df6cc
|
Merge commit '05cc660641' into traffic
# Conflicts:
# CMakeLists.txt
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
# libs/indexer/data_source.hpp
# libs/indexer/feature.hpp
# libs/indexer/ftypes_matcher.hpp
# libs/map/framework.cpp
# libs/map/traffic_manager.cpp
# libs/routing/absent_regions_finder.cpp
# libs/routing/edge_estimator.hpp
# libs/routing/index_router.cpp
# libs/routing/index_router.hpp
# libs/routing/routing_session.hpp
# libs/routing_common/num_mwm_id.hpp
# libs/traffic/traffic_info.cpp
# qt/mainwindow.hpp
# qt/preferences_dialog.cpp
# tools/openlr/helpers.hpp
# tools/openlr/openlr_decoder.cpp
# tools/openlr/openlr_decoder.hpp
# tools/openlr/openlr_stat/openlr_stat.cpp
# tools/openlr/router.hpp
# tools/openlr/score_candidate_paths_getter.cpp
# tools/openlr/score_candidate_paths_getter.hpp
# xcode/CoMaps.xcworkspace/contents.xcworkspacedata
|
2025-09-10 21:22:40 +03:00 |
|
Konstantin Pastbin
|
bfffa1fff4
|
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-08-17 14:32:37 +07:00 |
|
mvglasow
|
90d7cadc3f
|
Merge commit '211e3fb4' into traffic
# Conflicts:
# android/app/src/main/cpp/CMakeLists.txt
# android/app/src/main/java/app/organicmaps/sdk/util/Config.java
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# indexer/ftypes_matcher.hpp
# iphone/Maps/Maps.xcodeproj/project.pbxproj
|
2025-08-16 18:04:14 +03:00 |
|
Viktor Govako
|
905a823490
|
[desktop] Removed redundant NightMode setting.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
|
2025-08-07 13:39:05 +02:00 |
|
mvglasow
|
dcab6ee5a0
|
[qt] Keep traffic URL editable even when source is disabled
Signed-off-by: mvglasow <michael -at- vonglasow.com>
|
2025-07-28 00:33:26 +03:00 |
|
mvglasow
|
03d6847be3
|
[traffic][qt] Make HttpTraffSource configurable from Qt GUI
Signed-off-by: mvglasow <michael -at- vonglasow.com>
|
2025-07-28 00:33:25 +03:00 |
|
Konstantin Pastbin
|
e3e4a1985a
|
Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)
To expand with full Organic Maps and Maps.ME commits history run:
git remote add om-historic [om-historic.git repo url]
git fetch --tags om-historic
git replace squashed-history historic-commits
|
2025-05-08 21:10:51 +07:00 |
|