mvglasow
|
bf36c875d5
|
Merge commit 'eb264889e3' into traffic
|
2025-10-10 18:40:35 +03: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
|
5300af3138
|
[strings] Add categories.txt to gitignore
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-09-10 13:25:59 +07:00 |
|
Konstantin Pastbin
|
a189516736
|
[tools][styles] Output diffs in generate_drules.sh
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-08-20 10:40:40 +02: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 |
|
Andrei Shkrob
|
0f744e7cf2
|
[desktop] Organize desktop resources
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
|
2025-08-16 00:12:24 +07:00 |
|
mvglasow
|
167f0b8377
|
Add traffic.xml to .gitignore
Signed-off-by: mvglasow <michael -at- vonglasow.com>
|
2025-08-12 19:02:46 +03:00 |
|
Andrei Shkrob
|
8f5c8a5bd7
|
[data] Refactor resources folder
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
|
2025-08-08 20:47:41 +07:00 |
|
Andrei Shkrob
|
e65ab6e458
|
Update gitignore
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
|
2025-08-07 13:39:05 +02:00 |
|
x7z4w
|
45ec96dd3c
|
[build] Generate drules at build
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
|
2025-08-06 10:40:29 +02:00 |
|
Yannik Bloscheck
|
c6dcfc71bf
|
[build] Changed to hash based comparing and adjustments to make it work on macOS
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
|
2025-08-01 23:03:41 +02:00 |
|
x7z4w
|
053fe3c143
|
[build] Cache World maps and symbols version
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
|
2025-08-01 23:03:41 +02:00 |
|
Yannik Bloscheck
|
bb03e9334c
|
[ios] Renamed Xcode workspace (and fixed a few little things, that were missed before)
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
|
2025-06-20 14:32:15 +02:00 |
|
Yannik Bloscheck
|
074d443f0f
|
More rebranding including the team identifier, url scheme, and links on about screen
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-06-15 18:33:52 +07:00 |
|
Matheus Gomes
|
d4e1d53c40
|
Rebranded the app for iOS
|
2025-06-15 18:32:35 +07:00 |
|
Konstantin Pastbin
|
7f0b97e6f8
|
[android] Remove Google Play metadata from .gitignore
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-05-26 09:05:09 +02:00 |
|
Jean-Baptiste
|
bd8d068783
|
[android] Remove Firebase dependencies
Signed-off-by: jeanbaptisteC <jeanbaptistec@noreply.codeberg.org>
|
2025-05-20 19:28:02 +02:00 |
|
Konstantin Pastbin
|
01aecbfac4
|
[tools] Add generate_subways.sh script
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-05-19 10:52:42 +02:00 |
|
Harry Bond
|
c45f9100cb
|
Add symbols and world.mwm to gitignore
Signed-off-by: Harry Bond <me@hbond.xyz>
|
2025-05-08 21:12:41 +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 |
|