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

beta #505

Draft
wants to merge 726 commits into
base: main
Choose a base branch
from
Draft

beta #505

wants to merge 726 commits into from

Conversation

kriskbx
Copy link
Member

@kriskbx kriskbx commented Feb 27, 2025

DO NOT REVIEW, DO NOT MERGE!!

shh-cats

Mayaryin and others added 30 commits December 16, 2024 16:53
…hen-no-edited-value' into feature/a11ymap-disable-button-when-no-edited-value
kriskbx and others added 17 commits March 5, 2025 17:07
Co-authored-by: Sebastian Felix Zappe <[email protected]>
# Conflicts:
#	src/components/CombinedFeaturePanel/components/image/WikidataEntityImage.tsx
#	src/components/CombinedFeaturePanel/editors/WheelchairEditor.tsx
#	src/components/CombinedFeaturePanel/utils/useFeatureLabel.tsx
#	src/components/shared/Toolbar.tsx
#	src/domains/categories/components/CategoryFilter.tsx
#	src/domains/needs/components/NeedsButton.tsx
#	src/domains/needs/components/NeedsDropdownSection.tsx
#	src/domains/needs/needs.ts
#	src/domains/search/components/SearchFormField.tsx
#	src/lib/fetchers/osm-api/fetchOSMFeatureCollection.ts
#	src/lib/fetchers/useFeatures/fetchers.ts
#	src/lib/model/geo/placeNameFor.ts
kriskbx added 10 commits March 12, 2025 18:18
# Conflicts:
#	src/components/App/MapLayout.tsx
#	src/components/CombinedFeaturePanel/editors/WheelchairEditor.tsx

# Conflicts:
#	src/components/App/MapLayout.tsx
#	src/components/CombinedFeaturePanel/components/image/WikidataEntityImage.tsx
#	src/components/CombinedFeaturePanel/editors/WheelchairEditor.tsx
#	src/components/CombinedFeaturePanel/utils/useFeatureLabel.tsx
#	src/components/TopBar.tsx
#	src/components/shared/Toolbar.tsx
#	src/lib/fetchers/osm-api/fetchOSMFeatureCollection.ts
#	src/lib/fetchers/useFeatures/fetchers.ts
#	src/lib/model/geo/placeNameFor.ts
#	src/modules/categories/components/CategoryFilter.tsx
#	src/modules/needs/components/NeedsButton.tsx
#	src/modules/needs/components/NeedsDropdownSection.tsx
#	src/modules/needs/needs.ts
#	src/modules/search/components/SearchFormField.tsx
#	src/modules/search/tests/empty-photon-mock.json
#	src/modules/search/tests/empty-place-infos-mock.json
#	src/modules/search/tests/node:3908141014-osm-mock.json
#	src/modules/search/tests/photon-mock.json
#	src/modules/search/tests/place-infos-mock.json
#	src/modules/search/tests/way:23723125-osm-mock.json
#	src/pages/_app.tsx

# Conflicts:
#	package.json
#	src/components/App/MapLayout.tsx
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.

3 participants