Commit graph

2036 commits

Author SHA1 Message Date
Robin van der Linde
983ada79f3
Changed tagrendering 2022-07-19 12:06:26 +02:00
Robin van der Linde
330f1f53f3
Merge branch 'develop' into feature/maproulette 2022-07-19 09:38:12 +02:00
47b50e2b94 Fix typo 2022-07-19 09:24:00 +02:00
5c0ff4e1b0
Merge branch 'develop' into feature/pharmacy 2022-07-19 09:12:12 +02:00
0ea3239933 Remove unresolved merge conflict 2022-07-18 16:23:18 +02:00
e37ada0b20 Merge branch 'master' into develop 2022-07-18 16:20:25 +02:00
Robin van der Linde
63bb1a4da3
Show buttons for adding tags and importing 2022-07-18 16:08:41 +02:00
3ae7478bfb Another attempt to fix the build 2022-07-18 15:45:26 +02:00
c8de5166f1 Attempt to fix the build 2022-07-18 15:15:48 +02:00
b5750c8c1a Remove unneeded icon 2022-07-18 14:59:01 +02:00
88d9f70c6d Translation sync 2022-07-18 13:56:37 +02:00
a538566851 Add artwork 2022-07-18 13:54:28 +02:00
f307660ef1 Housekeeping... 2022-07-18 11:52:37 +02:00
80be3eb9ef Sync; fix build 2022-07-18 11:49:22 +02:00
0c512a0085 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-07-18 11:26:34 +02:00
008ed859bb Merge develop 2022-07-18 10:47:58 +02:00
2c51c82541 Remove 'corridor' from the indoor theme 2022-07-18 10:45:54 +02:00
f460895f60 Merge develop 2022-07-18 10:44:42 +02:00
d805686fd5 Fix build 2022-07-18 10:41:20 +02:00
8ff405497c Improve typing, regen scheme files 2022-07-18 10:26:15 +02:00
a1c4cdd544 Add fallback as title for pharmacies without a name 2022-07-18 10:26:15 +02:00
c9c67936b8
Merge pull request #961 from pietervdvn/feature/walls-and-buildings
Feature/walls and buildings
2022-07-18 10:25:59 +02:00
Andrews Leruth
de53d67577 reset unnecessary files 2022-07-18 10:19:28 +02:00
Andrews Leruth
4af43b4afc added entrance:id to render 2022-07-18 10:15:17 +02:00
Robin van der Linde
512282772a
Generate translations 2022-07-18 10:08:39 +02:00
Andrews Leruth
f749259b76 tags don't show if we click on an entrance 2022-07-18 09:58:03 +02:00
Robin van der Linde
1ce88c18c5
Merge branch 'develop' into feature/maproulette 2022-07-18 09:41:38 +02:00
Andrews Leruth
a5d80401a3 POIs can display data from their outer walls 2022-07-18 09:31:54 +02:00
7e0bbab156 Enable the education theme 2022-07-18 09:22:18 +02:00
b8bca0287d Refactor isShown into a tagsfilter 2022-07-18 02:00:32 +02:00
169db873f0 Update documentation 2022-07-18 00:59:23 +02:00
d9979940ee Improve documentation 2022-07-18 00:58:30 +02:00
336b7b39aa Remove last 'AndOrTagRenderingConfig'-mentions, Regenerate schema files 2022-07-18 00:30:57 +02:00
f6ea4c18fa Download new stats 2022-07-16 01:01:51 +02:00
07973e37a6 Add priority-search to the searchable element 2022-07-15 01:10:10 +02:00
Robin van der Linde
5290e0042b
Add presets and titles 2022-07-14 15:45:57 +02:00
Robin van der Linde
f7506e07cd
Add hotel layer, conversion scripts 2022-07-14 15:17:09 +02:00
Robin van der Linde
64288ec1b8
Merge branch 'develop' into feature/maproulette 2022-07-14 09:19:11 +02:00
c916d5fe66 Merge develop 2022-07-13 23:12:14 +02:00
9327d96550 Fix ability to add a freeform tag when using the searchableMappings element, add test 2022-07-13 23:05:50 +02:00
Robin van der Linde
befee4b546
Add details rendering 2022-07-13 16:12:25 +02:00
Andrews Leruth
07bf3e3d34 Merge branch 'develop' into feature/walls-and-buildings 2022-07-13 14:35:38 +02:00
Andrews Leruth
c2328e784a can display calculated tags with tag renderings 2022-07-13 14:33:53 +02:00
dff8f51a6a Fix icons, rename same-as 2022-07-13 13:13:08 +02:00
71e3560b27 Fix â‚#951, fix #952 2022-07-13 13:00:47 +02:00
ce4665a4f1 Housekeeping... 2022-07-13 12:51:14 +02:00
Robin van der Linde
8d8f2f6827
Move icon 2022-07-13 11:33:11 +02:00
Robin van der Linde
e2dd4a4325
Use title icon 2022-07-13 11:32:59 +02:00
Robin van der Linde
ab7b6d9d46
Generate translations 2022-07-13 11:06:43 +02:00
Robin van der Linde
228df2aa9d
Merge branch 'develop' into parking 2022-07-13 11:02:30 +02:00