Commit graph

1215 commits

Author SHA1 Message Date
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
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
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
f460895f60 Merge develop 2022-07-18 10:44:42 +02:00
d805686fd5 Fix build 2022-07-18 10:41:20 +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
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
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
f7506e07cd
Add hotel layer, conversion scripts 2022-07-14 15:17:09 +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
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
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
Robin van der Linde
3f2d50b2e1 Split out stuff 2022-07-13 08:59:02 +00:00
AlexanderRebai
f5f4d7bdcb indoors layers added, labels added 2022-07-13 08:53:55 +00:00
Robin van der Linde
556ed6001f Merge branch 'develop' into feature/maproulette 2022-07-13 08:03:32 +00:00
Robin van der Linde
65997291bb Allow closing Maproulette tasks 2022-07-13 08:03:09 +00:00
Andrews Leruth
99fabe6e5c can find entrance id 2022-07-12 15:38:39 +02:00
AlexanderRebai
c33ca35029 added an indoors layer + theme 2022-07-12 13:02:49 +00:00
a7b0db2416 Fix build, formatting 2022-07-12 14:20:40 +02:00
Andrews Leruth
c13d86a8ac fixes 2022-07-12 11:25:19 +02:00
Robin van der Linde
a1bffc7b7f Merge branch 'develop' into feature/maproulette 2022-07-12 09:01:18 +00:00
fbe11d4a90 Fix reset:layeroverview, improve rainbow map 2022-07-12 10:45:08 +02:00
Andrews Leruth
173cbf187b Merge branch 'develop' into feature/walls-and-buildings 2022-07-12 10:39:42 +02:00
Andrews Leruth
7157512004 Merge branch 'develop' into feature/walls-and-buildings 2022-07-12 10:33:27 +02:00
755d34c160 s/minZoom/minzoom/g 2022-07-12 10:30:43 +02:00
Andrews Leruth
8199419ec8 added walls and buildings theme 2022-07-12 10:25:31 +02:00
441d8467fe Fix rainbox theme and add improvements 2022-07-12 10:23:45 +02:00
Robin van der Linde
41e01c49f8 Merge branch 'develop' into feature/maproulette 2022-07-12 07:43:11 +00:00
bxl-forever
3a682970bf New feature request: rainbow-crossings 2022-07-11 20:48:19 +02:00
AlexanderRebai
3058781ac6 Merge branch 'feature/OnWheels' of https://github.com/pietervdvn/MapComplete into feature/OnWheels 2022-07-11 14:06:53 +00:00