Commit graph

1161 commits

Author SHA1 Message Date
AlexanderRebai
3058781ac6 Merge branch 'feature/OnWheels' of https://github.com/pietervdvn/MapComplete into feature/OnWheels 2022-07-11 14:06:53 +00:00
AlexanderRebai
bfdc1056a0 fixed language english and crest background 2022-07-11 14:06:37 +00:00
7d8e43a505 Merge develop 2022-07-11 15:11:07 +02:00
AlexanderRebai
3cf5bd8dc6 Created a first version for onWheels layer 2022-07-11 11:45:09 +00:00
1055e3c47b Merge master 2022-07-09 17:33:53 +02:00
4ef5d31c53 Housekeeping... 2022-07-09 17:25:38 +02:00
d8d0fa685b Merge all healtcare layers into a map theme 2022-07-07 23:27:36 +02:00
fe522022b2 Clean cycle infra logo 2022-07-07 22:32:36 +02:00
Andrews Leruth
7100685949 added pharmacy theme and layer 2022-07-06 15:54:21 +02:00
fb311b9d56
Merge pull request #923 from pietervdvn/transit
Transit
2022-07-06 12:29:07 +02:00
Robin van der Linde
0a330643fb Merge branch 'develop' into transit 2022-07-06 09:16:45 +00:00
AlexanderRebai
2bb48439b5 doctors feature 2022-07-05 15:04:14 +00:00
263c760a1c Housekeeping... 2022-07-05 13:52:34 +00:00
bb10f60636 Remove duplicate presets in Toerisme_Vlaanderen theme 2022-07-03 13:16:49 +02:00
6f51a4b3bd Housekeeping... 2022-07-02 23:24:48 +02:00
70667de472
Merge pull request #913 from loviuz/develop
Added italian translations for waste
2022-07-02 23:10:11 +02:00
loviuz
378c62137e Added italian translations for waste 2022-07-02 12:54:01 +02:00
Robin van der Linde
0e0beb3efd
Merge develop into kerbs-crossings 2022-07-02 11:52:52 +02:00
ff4be56c42 More reuse of icons 2022-07-02 02:45:59 +02:00
Robin van der Linde
ab4d60b0d8
Merge branch 'develop' into kerbs-crossings 2022-07-01 16:05:49 +02:00
c25745b133 Merge master 2022-07-01 00:35:48 +02:00
5ef95f12c9 Housekeeping... 2022-07-01 00:34:46 +02:00
Robin van der Linde
3436894249
Merge branch 'develop' into kerbs-crossings 2022-06-29 20:04:05 +02:00
e67c3ffa52 Add error if hideInAnswer:true and addExtraTags are used in the same mapping, fix #906 2022-06-28 01:38:57 +02:00
3a3e2750f2 Allow different renderings in question mode, but emit a warning for this intead 2022-06-28 01:04:45 +02:00
RobJN
07ee80a675 Update uk_addresses.json 2022-06-27 23:57:36 +02:00
dba6f22e11 Housekeeping... 2022-06-27 09:29:23 +02:00
aae96c5e7d Translation sync 2022-06-27 09:16:53 +02:00
2ccc977b52 Translation sync 2022-06-27 09:12:17 +02:00
52543893f6 Fix build, merge translations 2022-06-24 19:00:02 +02:00
09b230b5be Housekeeping... 2022-06-24 03:52:54 +02:00
1305e0c2db Make sure that landing pages are in english 2022-06-24 03:37:00 +02:00
a839e6e820 Enable automatic conflation in the GRB theme 2022-06-24 03:37:00 +02:00
174a0e1852 Fix build, remove no longer used 'favourite layers 2022-06-22 20:18:17 +02:00
98c6113cbe Merge master 2022-06-22 20:06:41 +02:00
8066afd2e5 Housekeeping... 2022-06-22 18:56:02 +02:00
7f9e5d3cd6 Small fixes to education theme, temporarily hide from overview 2022-06-22 18:54:38 +02:00
b05caa8fbd Housekeeping... 2022-06-22 15:30:45 +02:00
fa07cd5a87 Change order 2022-06-21 13:59:31 +02:00
88eabd183e Further work on the educational theme 2022-06-21 13:59:31 +02:00
2408b4b19d Add universities and colleges, reorganize 2022-06-21 13:59:31 +02:00
378eb123f8 Add diary entry to organize thoughts 2022-06-21 13:59:31 +02:00
f7cacc15d3 Add first version of schools 2022-06-21 13:59:31 +02:00
f0c90b4d1c Merge master 2022-06-20 03:22:27 +02:00
193834c286 Fix tests 2022-06-20 03:14:44 +02:00
ca91241c3b Fix some tests 2022-06-20 01:55:29 +02:00
6d1e4836bc Merge master 2022-06-19 22:19:25 +02:00
43a214a5d1 Housekeeping... 2022-06-19 22:13:38 +02:00
470e9acc64 Merge master 2022-06-19 18:23:43 +02:00
47345bdf61 Add charging stations to cyclofix theme 2022-06-14 23:48:09 +02:00