Commit graph

835 commits

Author SHA1 Message Date
53cd991318 Translation sync 2022-04-30 02:27:12 +02:00
06252bd35e Merge branch 'develop' 2022-04-30 00:42:43 +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
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
1da799bb5f Translations sync 2022-04-28 00:35:08 +02:00
a22ff2f36b More climbing styling 2022-04-26 10:30:43 +02:00
bc953abe48 Refactoring of the climbing theme 2022-04-23 15:20:54 +02:00
7b036ad149 Add filters for payment methods to shops and restaurants 2022-04-22 16:58:48 +02:00
1bf3be987b Add name and species to tree title (if applicable); fix issue with dropdown in tagrenderingquestion 2022-04-22 16:24:21 +02:00
2fe67c7dc1 Merge branch 'master' into develop 2022-04-22 16:11:11 +02:00
849f95feec Remove test rendering from etymology theme 2022-04-22 16:10:25 +02:00
0aae923187 Add projected_centerpoint as pointrenderingoption 2022-04-22 16:09:55 +02:00
347b4df88d Add description 2022-04-22 02:03:20 +02:00
de8ce84bde Fix tree_node theme 2022-04-22 02:01:39 +02:00
eb5a6195b9
Merge pull request #770 from pdassori/patch-1
Update tree_node.json
2022-04-22 01:51:17 +02:00
700cad1000 Merge branch 'master' into develop 2022-04-22 01:48:47 +02:00
2d46821186 Translation sync 2022-04-22 01:48:40 +02:00
6a124da543 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-22 01:45:55 +02:00
389e3f18a0 Improve wikidata search with filtering, add search box for species to trees 2022-04-22 01:45:54 +02:00
f15dfa905a Small fixes to themes 2022-04-21 20:39:09 +02:00
pdassori
86d9a9b61c
Update tree_node.json
The Spanish translation "es" was made. In this window as title, I think it is better to consider tag: species over tag: name.  Since trees generally do not have a name, unless they are considered monumental or extraordinary (as in the example of the photo). On the other hand tag:species, includes all of them. species identifies a tree better.
2022-04-19 18:54:17 -04:00
4c9474f6d0 Translations 2022-04-19 23:43:51 +02:00
ccf9c4b5f6 Merge develop 2022-04-19 01:39:03 +02:00
303ccfa322 Translation sync 2022-04-18 01:47:54 +02:00
0f5c132287 Merge master 2022-04-15 01:19:44 +02:00
663f01c21e Extract some layers to standalone files 2022-04-15 00:56:42 +02:00
4af622575d Translation sync 2022-04-15 00:48:19 +02:00
18430df75a Merge master 2022-04-14 01:00:04 +02:00
8db80d879a Translation sync 2022-04-13 18:42:40 +02:00
de0a6a666e Translation sync 2022-04-13 01:20:52 +02:00
a63fed178b Attempt to fix #683 2022-04-09 21:44:37 +02:00
92f33a440e Revert "Translation sync + fix translation issue"
This reverts commit aaa59955cb.
2022-04-09 19:32:22 +02:00
aaa59955cb Translation sync + fix translation issue 2022-04-09 19:07:43 +02:00
0ec0367529 Translation sync 2022-04-09 17:35:21 +02:00
bcbbff0f2b Fix tagging: shop=rental instead of shop=bicycle_rental 2022-04-09 10:10:10 +02:00
679422e26c Fix duplicate ids: actually rewrite id 2022-04-08 22:13:58 +02:00
4235c42463 Add bicycle_rental questions to bike shops 2022-04-08 21:53:29 +02:00
13c2c2309c Add condition to bicycle rental type, add clarification in cyclofix to shop=rental 2022-04-08 20:53:42 +02:00
dbf5b04d1a Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-08 18:03:26 +02:00
a46b6d1e27 Merge branch 'develop' 2022-04-08 17:59:44 +02:00
riQQ
4b84c62f76
Editorial improvements to Chargings Station theme readme 2022-04-08 13:05:47 +02:00
f59b2aee33 Add 'needles' as waste category 2022-04-08 01:25:10 +02:00
f61df52c7d Fix wrong title in recycling layer 2022-04-08 01:13:36 +02:00
6e3dd6a8d5 Translation sync 2022-04-07 03:14:21 +02:00
c8e8908148 Merge branch 'master' into develop 2022-04-07 03:13:34 +02:00
855959d623 Translation sync 2022-04-07 03:13:29 +02:00
df706d2f97 Small fixes, add filters to shops 2022-04-04 05:12:14 +02:00
a05e611326 Fix typo 2022-04-03 03:29:58 +02:00
6beebcd4ef Merge master 2022-04-03 03:26:26 +02:00
c2f7403f04 Translation sync 2022-04-03 03:17:10 +02:00
b6aa99ef74 Remove name from note_import template 2022-04-03 03:14:52 +02:00
320f38802d Add article to presets 2022-04-03 03:13:21 +02:00
18729049b7 Translation sync 2022-04-03 03:01:16 +02:00
6c1a1d59f3 Fix #716 2022-04-03 02:37:31 +02:00
2c7fb556dc Add translation buttons 2022-04-01 12:51:55 +02:00
37c00bbf99 Merge branch 'master' into develop 2022-03-29 22:10:44 +02:00
78b54d2fce Automatically add articles to presets to transition 2022-03-29 22:02:21 +02:00
eb71995b97 Translation sync 2022-03-29 21:38:24 +02:00
bedc0eb690 Merge master 2022-03-29 21:31:16 +02:00
d0abf14806 Fix filter on notes theme, fix #713 2022-03-29 21:24:44 +02:00
c47a6d5ea7 Add rewrite of 'special' clauses, various QOLimprovements on import viewer 2022-03-29 00:20:10 +02:00
8df0324572 Add website to playground theme 2022-03-28 22:20:36 +02:00
308ab74a08 Add download-as-svg options 2022-03-18 01:21:00 +01:00
bed1352e37 Merge master 2022-03-17 23:11:20 +01:00
2ded4fccfb Translation sync 2022-03-16 14:07:41 +01:00
dc42483edf
Add label to shops 2022-03-16 00:20:15 +01:00
daa23fad95 Merge master 2022-03-15 13:45:20 +01:00
4f4fc650b1 First steps to a real testing framework: first working version with mocha, chai and doctest-ts 2022-03-14 22:57:01 +01:00
2cbebfe8d4 Fixed shadowed mapping 2022-03-14 20:59:06 +01:00
edc366149b Merge master 2022-03-14 20:52:06 +01:00
b406d17b10 Add more bicycle options to cycle rental; add deletion and images to cycle rental, fix #703 2022-03-14 20:45:17 +01:00
2ceeb15a67 Add tandems, add images to cycle rental 2022-03-14 17:14:25 +01:00
564fb16135 Translation sync 2022-03-14 17:11:15 +01:00
9e81d41d25 Add images to bicycle rental 2022-03-14 17:01:47 +01:00
f20144a502 Merge master 2022-03-14 03:34:42 +01:00
d7df6a7a80 Improvements to notes layer and elements 2022-03-13 02:46:42 +01:00
aa7e6565db Small fix to playgrounds 2022-03-11 02:40:27 +01:00
0497b10e04 Add 'paid playground' as access option 2022-03-11 02:25:39 +01:00
1455a87077 Merge master 2022-03-11 01:31:13 +01:00
7d02ed0af6 Add 'access=key' as option 2022-03-10 23:41:16 +01:00
7acaafae1f Fix icons 2022-03-10 16:26:25 +01:00
67fd7028f1 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-03-08 04:15:22 +01:00
135d8644da Better social images 2022-03-08 04:09:03 +01:00
Robin van der Linde
e1a9a14d74
Add Dutch traffic signs, hide questions if traffic signs not known (#679)
* Add Dutch traffic signs, hide questions if traffic signs not known

* Move images to subfolders

* Merge develop, regen docs

Co-authored-by: pietervdvn <pietervdvn@posteo.net>
2022-03-08 01:11:32 +01:00
67c8d08f3e Some fixes in the rewrite of the maprendering 2022-03-08 01:05:54 +01:00
e6185b8dca Merge branch 'master' into develop 2022-03-02 16:00:06 +01:00
bd3f4bb474 Merge branch 'master' of github.com:pietervdvn/MapComplete 2022-03-02 15:10:49 +01:00
b21dbabe5e Fix #686 in the script 2022-03-02 13:16:52 +01:00
98c40822a2 Fix csvToJson script 2022-02-28 19:28:59 +01:00
7a540ea6ce Translation sync, fix typo 2022-02-27 15:54:50 +01:00
86351f30f4 Hide docking_station bicycle rentals on lower zoom to prevent them flooding the map 2022-02-25 15:38:48 +01:00
5b13d3f25c Merge branch 'develop' 2022-02-22 16:13:59 +01:00
247b2e4db1 Translation sync 2022-02-22 16:13:49 +01:00
793d765ead Add contact information to recycling centers 2022-02-22 16:11:00 +01:00
bc890f5476 Merge branch 'master' into develop 2022-02-22 14:14:01 +01:00
be41ead9bf Translation sync, small fixes 2022-02-22 13:43:36 +01:00
d19791382f Add move and delete options 2022-02-21 11:39:57 +01:00