Commit graph

880 commits

Author SHA1 Message Date
LiamSimons
502f70d004 merge master, fixx bugs 2021-07-08 11:31:26 +02:00
LiamSimons
91cf0a9a2e Fixed error in waste_basket but waste_basket.svg broken in layer 2021-07-08 10:45:10 +02:00
pietervdvn
c8b70dec9d Fix theme 2021-07-07 22:29:07 +02:00
pietervdvn
3a56dd1d9d Re-add waste basket theme 2021-07-07 22:21:01 +02:00
pgm-chardelv1
b9aa1435cc Adds conditional render of carriage width question 2021-07-07 19:59:56 +02:00
pietervdvn
1175562c18 Merge branch 'master' into project/natuurpunt 2021-07-07 18:20:22 +02:00
pietervdvn
18753a3548 Merge master 2021-07-07 18:19:54 +02:00
pietervdvn
844df16524 Translation sync 2021-07-07 18:19:12 +02:00
Arno Deceuninck
ec250252d2 Merged all layers related to cycle paths 2021-07-07 17:20:17 +02:00
karelleketers
b636f00006 merged layers Natuurpunt 2021-07-07 16:30:15 +02:00
Arno Deceuninck
e23f225532 Fix cyclestreets dissapeared after merge conflict 2021-07-07 16:27:35 +02:00
karelleketers
9cb275d7c4 Added Trails Layer 2021-07-07 16:26:58 +02:00
Arno Deceuninck
3eba5f893e Merge remote-tracking branch 'origin/project/cycle-infra' into project/cycle-infra
# Conflicts:
#	assets/themes/cycle_infra/cycle_infra.json
2021-07-07 16:24:12 +02:00
Arno Deceuninck
fd3b9f5c6e Cycleway type questions 2021-07-07 16:21:08 +02:00
pgm-chardelv1
247380ca33 Generate question for carriagewidth | Needs to be moved 2021-07-07 15:54:26 +02:00
pietervdvn
4a08dc74d8 Merge branch 'project/natuurpunt' of github.com:pietervdvn/MapComplete into project/natuurpunt 2021-07-07 15:52:57 +02:00
LiamSimons
08c47551fa waste_basket.json fixed svg directory 2021-07-07 15:15:34 +02:00
LiamSimons
a5275b386b waste_basket.json saved again 2021-07-07 15:12:10 +02:00
pietervdvn
21788b43dc Merge branch 'project/natuurpunt' of github.com:pietervdvn/MapComplete into project/natuurpunt 2021-07-07 15:10:55 +02:00
LiamSimons
81e621d63d waste_basket theme and layer 2021-07-07 15:08:49 +02:00
pietervdvn
b8bf3cc714 Only show nature reserves of Natuurpunt 2021-07-07 13:24:37 +02:00
Ward Beyens
cbf7ef764d extra layers natuurpunt 2021-07-07 13:11:06 +02:00
pgm-chardelv1
179e06cec6 Fixes keys for maxspeed 2021-07-07 09:51:06 +02:00
root
e749b44459 added extra layers to theme natuurpunt 2021-07-07 01:34:48 +02:00
Robin van der Linde
c79c6f85f4 Basic cyclestreet 2021-07-06 16:45:17 +02:00
Arno Deceuninck
f51f2598e5 Updated dutch translations 2021-07-06 16:24:35 +02:00
pgm-chardelv1
199dfaf904 Adds maxspeed questions to shared lanes and lanes 2021-07-06 16:17:36 +02:00
Arno Deceuninck
3da3e25980 Surface type basic questions 2021-07-06 15:57:02 +02:00
pietervdvn
d3b748b873 Fix logo 2021-07-06 15:48:09 +02:00
karelleketers
bf0924a699 Added Natuurpunt Theme 2021-07-06 15:18:41 +02:00
Arno Deceuninck
43980a2a78 Cycleway type colors 2021-07-06 15:05:57 +02:00
pietervdvn
8b1b843dbe Merge branch 'master' into develop 2021-07-04 00:36:22 +02:00
pietervdvn
19d34454af Translation sync 2021-07-04 00:22:46 +02:00
pietervdvn
28bcf1266b Translation sync 2021-07-03 21:41:17 +02:00
pietervdvn
e4c29ce660 First version of a delete button, is working 2021-07-03 14:35:44 +02:00
pietervdvn
b7798a470c Merge branch 'master' into develop 2021-06-28 01:22:16 +02:00
pietervdvn
33264c61b3 Translation sync 2021-06-28 01:22:08 +02:00
pietervdvn
58812b50f2 Small improvements to fritures theme: add vegetarian and opening hours indicators 2021-06-28 01:19:03 +02:00
pietervdvn
0e15d483d4 Fix typo 2021-06-28 00:50:45 +02:00
pietervdvn
284102c2f1 Seperate logic to detect special renderings and to actually render them, add a minimap to all popups (if no minimap is defined seperately) 2021-06-27 19:21:31 +02:00
pietervdvn
89c5c78f41 Small improvements to units 2021-06-25 18:30:56 +02:00
pietervdvn
81ba9973e7 Add contributor list 2021-06-24 14:12:24 +02:00
pietervdvn
651d987386 Add missing licenses 2021-06-24 12:35:15 +02:00
pietervdvn
700f1be11d Formatting 2021-06-24 12:23:17 +02:00
pietervdvn
7ca9ff4728 Add minimaps to climbing layer + translation sync 2021-06-24 02:35:55 +02:00
pietervdvn
aa50d33b81 Merge master 2021-06-24 01:55:45 +02:00
pietervdvn
9bbe13beff Fix translations for bookcase theme 2021-06-24 01:20:25 +02:00
pietervdvn
7dc9d5cdb9 Translation sync 2021-06-24 01:19:33 +02:00
pietervdvn
5e991bdc02 Allow to style special visualisations, no cursor if popups are disabled 2021-06-23 02:41:30 +02:00
pietervdvn
eba1772ab9 Add minimap baseElement; add this as special rendering, add minimap beneath direction input element 2021-06-23 02:15:28 +02:00