Commit Graph

23 Commits

Author SHA1 Message Date
mvglasow
7ed4a6ddd9 Merge commit '07cd1ec4f5' into traffic
# Conflicts:
#	libs/indexer/ftypes_matcher.hpp

Bug: boost/regex.hpp may not be found
Workaround: remove `if` in CMakeLists.txt:226, leave `include_directories`
2025-11-23 17:04:45 +02:00
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
x7z4w
0e5fa5c501 nit
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2025-11-18 12:04:02 +01:00
Konstantin Pastbin
0814b574a9 [core] Add mapgen to default CDNs list
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-11-14 10:04:40 +01:00
Konstantin Pastbin
e25e7dd583 [core] Use alt endpoint for ru1 CDN
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-11-05 13:48:47 +07:00
mvglasow
bf36c875d5 Merge commit 'eb264889e3' into traffic 2025-10-10 18:40:35 +03:00
Konstantin Pastbin
656f08c4b3 [core] Change ru1 to an alt endpoint because of SSL cert issue
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-09-15 17:06:45 +02:00
mvglasow
0713e22328 [traffic] Set default traffic URL to dev server
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-09-01 22:02:45 +03: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
x7z4w
86ebbf6006 Remove us1
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2025-08-11 10:06:44 +02:00
mvglasow
dde50bd0a1 [traffic] Default URL
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-07-29 20:39:57 +03:00
mvglasow
0106dc3fe5 [traffic] Remove unused constants
Signed-off-by: mvglasow <michael -at- vonglasow.com>
2025-07-29 20:39:05 +03:00
Konstantin Pastbin
0fee3c3781 Add de1 and us1 CDN servers to the default list
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-07-13 17:46:08 +02:00
Konstantin Pastbin
a94cb3531d Add all CDN servers to the default list
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-06-30 18:45:51 +02:00
map per
a1bb9769f3 Removed unused code for oauth2 client secret
Signed-off-by: map per <map-per@gmx.de>
2025-06-14 09:39:55 +02:00
Konstantin Pastbin
0edd732846 Re-register oauth2 app in OSM
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-26 19:58:05 +07:00
Konstantin Pastbin
3032eb6dfe [editor] Auth to OSM via a browser always
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-26 19:33:25 +07:00
Konstantin Pastbin
a8349ffa85 [api] Replace om:// scheme with cm://
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-26 17:33:53 +07:00
Konstantin Pastbin
3c7c8658fd [editor] Update OSM keys
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-22 19:46:17 +07:00
Konstantin Pastbin
b0812ef8c9 [editor] Update dev OSM oauth2 tokens
Deleted not used OSM_CONSUMER_*

Co-authored-by: zyphlar <zyphlar@gmail.com>
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-20 17:23:32 +07:00
Konstantin Pastbin
11e4b6d7b6 Update CDN config
Co-authored-by: zyphlar <zyphlar@gmail.com>
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-05-20 17:20:01 +07:00
Harry Bond
70ed37b648 [android][ios] Remove Kayak links
Signed-off-by: Harry bond <me@hbond.xyz>
2025-05-08 21:12:41 +07: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