Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add other answer "Tree is stump" (wrong branch) #624

Closed
wants to merge 1,743 commits into from

Conversation

mnalis
Copy link
Collaborator

@mnalis mnalis commented Aug 28, 2024

westnordost and others added 30 commits June 26, 2024 20:30
# Conflicts:
#	app/src/main/java/de/westnordost/streetcomplete/StreetCompleteApplication.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/OsmApiModule.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/ResurveyIntervalsUpdater.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/maptiles/MapTilesDownloadCacheConfig.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/messages/MessagesSource.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/upload/LastEditTimeStore.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestController.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/preferences/Prefs.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/quest/QuestAutoSyncer.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/user/UserDataController.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/user/UserLoginController.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/user/statistics/StatisticsController.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/visiblequests/SelectedQuestPresetStore.kt
#	app/src/main/java/de/westnordost/streetcomplete/data/visiblequests/TeamModeQuestFilter.kt
#	app/src/main/java/de/westnordost/streetcomplete/overlays/AStreetSideSelectOverlayForm.kt
#	app/src/main/java/de/westnordost/streetcomplete/overlays/places/PlacesOverlayForm.kt
#	app/src/main/java/de/westnordost/streetcomplete/quests/AAddLocalizedNameForm.kt
#	app/src/main/java/de/westnordost/streetcomplete/quests/AStreetSideSelectForm.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/BaseActivity.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/MainActivity.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/controls/AnswersCounterFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/controls/OverlaysButtonFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/controls/UploadButtonFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/map/LocationAwareMapFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/map/MapFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/map/TangramIconsSpriteSheet.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/main/map/TangramPinsSpriteSheet.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/SettingsFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/SettingsModule.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/SettingsViewModel.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/debug/ShowQuestFormsActivity.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/questselection/QuestSelectionAdapter.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/settings/questselection/QuestSelectionFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/user/profile/ProfileFragment.kt
#	app/src/main/java/de/westnordost/streetcomplete/screens/user/profile/ProfileViewModel.kt
#	app/src/main/java/de/westnordost/streetcomplete/util/LocaleListCompatUtils.kt
#	app/src/test/java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestControllerTest.kt
#	app/src/test/java/de/westnordost/streetcomplete/data/user/statistics/StatisticsControllerTest.kt
Helium314 and others added 28 commits August 18, 2024 17:58
prevents strings becoming outdated when quests are renamed or removed
@mnalis mnalis changed the title Add other answer "Tree is stump" Add other answer "Tree is stump" (wrong branch) Aug 28, 2024
@mnalis mnalis closed this Aug 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.