Commit graph

5107 commits

Author SHA1 Message Date
danieldegroot2
fc906dff28
Merge branch 'pietervdvn:develop' into books 2022-05-03 21:15:17 +02:00
4727f59148
Merge pull request #811 from danieldegroot2/fix-typo/artowrk
Fix typo
2022-05-03 20:44:52 +02:00
danieldegroot2
c460c93ab5
Fix typo
Fixes typo "artowrk" and changed the sentence to be more similar to other layers.

See also https://taginfo.openstreetmap.org/search?q=artowrk#values
2022-05-03 20:21:11 +02:00
danieldegroot2
9d651cb98f
Merge branch 'pietervdvn:develop' into books 2022-05-03 20:12:10 +02:00
danieldegroot2
2b60075c8b
Update public_bookcase.json
ToDo (optional):
- Decide whether to keep books=children;adults (possibly redundant; may mean the same as leaving it empty)
- Lock values `children`/`adults`(/`children;adults`) (combined choice + string question, like opening hours).
2022-05-03 18:55:38 +02:00
853d2ca949
Merge pull request #807 from pietervdvn/joostschouppe-patch-1
added filter for "import notes only"
2022-05-03 18:26:17 +02:00
Joost
1d8cacf7b6
added filter for "import notes only" 2022-05-02 17:06:44 +02:00
174ced9967 Match fritures with a broader tag that allows ';', fixes #776 2022-05-01 23:06:31 +02:00
92c6e70c8f Fix translation links in import notes 2022-05-01 22:58:59 +02:00
ff0c2451da Fix tests 2022-05-01 21:05:58 +02:00
d5a7aa2f44 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-05-01 20:56:18 +02:00
3a2b163128 Also load wikipedia articla from 'wikipedia' tag if no wikidata is given, fixes #780 2022-05-01 20:56:16 +02:00
96b077a1bf
Indicate that a shallow clone should be used
See #701
2022-05-01 18:46:05 +02:00
84e0b1c917
Merge pull request #796 from Codain/patch-4
Etymology - Add french prefixes
2022-05-01 15:46:15 +02:00
Codain
e18e741107
Etymology - Add french prefixes 2022-05-01 15:13:48 +02:00
7f972d4512 Fix tests 2022-05-01 04:21:41 +02:00
f77c24183c Add translation for delete options of drinking_water 2022-05-01 04:19:48 +02:00
fd90914c35 Refactoring of deleteWizard 2022-05-01 04:19:03 +02:00
b941fb2983 Remove obsolete import 2022-05-01 04:16:36 +02:00
819f65e18d Add extra optimization on And, add test 2022-05-01 04:16:17 +02:00
2f3886d2e0 Better error message 2022-04-30 22:58:36 +02:00
4fe7233071 Add soft-delete options for drinking water to retag as fountain or water-tap 2022-04-30 22:58:27 +02:00
aaed4171b0 Attempt to fix PWA-icon 2022-04-30 14:37:25 +02:00
41ca20d80d Remove personal from search in morescreen, add some special search terms 2022-04-30 14:00:03 +02:00
566facaa4e Fix build, translation sync 2022-04-30 02:41:06 +02:00
066fa1056b Move dogpark and veterinarian into separate layers, some renamings and rewordings 2022-04-30 02:31:19 +02:00
197d1db599 Merge branch 'master' into develop 2022-04-30 02:27:26 +02:00
53cd991318 Translation sync 2022-04-30 02:27:12 +02:00
560a47e744 Open official theme when enter is pressed in MoreScreen 2022-04-30 02:10:57 +02:00
ed81b12c44 Regenerate schemas, see #789 2022-04-30 01:57:25 +02:00
194ee668ae Merge branch 'SOTM' into develop 2022-04-30 00:51:54 +02:00
8114119446 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-30 00:51:33 +02:00
56701744d1
Merge pull request #764 from elgaard/develop
Dog resourses. For dog owners
2022-04-30 00:45:18 +02:00
06252bd35e Merge branch 'develop' 2022-04-30 00:42:43 +02:00
270a0d3a99 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-30 00:42:04 +02:00
f4a965eacf Move ShowDataLayer-implementation to a separate class for nodejs compatibility 2022-04-30 00:41:33 +02:00
7a76109d61 Improve wikipedia fetcher 2022-04-30 00:30:15 +02:00
f5ae73aac1 Convert markdown into UIElements 2022-04-30 00:28:51 +02:00
73cec987c9 Add paragraph and wikipedia options 2022-04-30 00:19:36 +02:00
8b06ca77f9 Add documentation for a theme function 2022-04-30 00:10:04 +02:00
aa51815a04 Remove obsolete console.log 2022-04-29 23:58:22 +02:00
50d95bbfd7 Regenerate css 2022-04-29 23:54:12 +02:00
ecba715265 Merge branch 'develop'
# Conflicts:
#	assets/themes/climbing/climbing.json
#	assets/themes/mapcomplete-changes/mapcomplete-changes.json
#	css/index-tailwind-output.css
2022-04-29 23:35:11 +02:00
b5afe520de Fix labels on bicycle_rental_type 2022-04-29 23:26:58 +02:00
8862a953ef Translation sync 2022-04-29 23:23:04 +02:00
c8617639e4
Merge pull request #784 from weblate/weblate-mapcomplete-layers
Translations update from Hosted Weblate
2022-04-29 23:17:39 +02:00
Niels Elgaard Larsen
433aff25db new vet logo 2022-04-29 21:08:24 +02:00
b52418ee1d
Merge pull request #793 from pietervdvn/cycle_types
Cycle types
2022-04-29 21:06:11 +02:00
Thierry1030
9a24ab92c8
fixed typo (comma) 2022-04-29 20:58:01 +02:00
Thierry1030
87fa7a03c1
added bike helmets as an extra option 2022-04-29 20:53:31 +02:00