Commit graph

462 commits

Author SHA1 Message Date
1de50237a0 Merge branch 'master' into develop 2021-11-08 03:06:39 +01:00
49ee00e10a Fix typo 2021-11-08 03:06:33 +01:00
36faf6f7f1 Readd questions in toilet which dissappeared 2021-11-08 03:05:37 +01:00
3334e0d384 Stricter layer checking 2021-11-08 03:00:58 +01:00
2ee429be1b Merge branch 'master' into develop 2021-11-08 02:39:12 +01:00
fda9eaead4 Fix build 2021-11-08 02:39:02 +01:00
09eee08fbc Documentation updates 2021-11-08 02:36:01 +01:00
78c689b7e8 Merge branch 'master' into develop 2021-11-08 00:46:07 +01:00
b928bcda6f Remove obsolete keys through lint script (once more) 2021-11-07 21:20:05 +01:00
c7386007bc Add service:electricity to pubs and food-amenities 2021-11-07 21:17:55 +01:00
0e30bd58d8 Fix translations 2021-11-07 19:47:52 +01:00
fdb769a0fc Fix text-area type, support for newlines in key substitutions (fix #543), small tweaks to etymology-theme (fix #537) 2021-11-07 18:37:42 +01:00
7839712deb Merge branch 'master' into develop 2021-11-07 18:08:02 +01:00
b609885a1f Fix bike parking location question 2021-11-07 18:06:57 +01:00
459d25d24c Various fixes on toilets-layer: add opening hours and payment options, fix typos 2021-11-07 18:03:21 +01:00
bb283b59a4 Fix build 2021-11-07 16:43:29 +01:00
bd21212eba Full code cleanup 2021-11-07 16:34:51 +01:00
70964f645a Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2021-11-07 15:44:47 +01:00
e237d84436 Merge master, fix translations 2021-11-07 15:44:22 +01:00
37231969e6 Merge branch 'master' into develop 2021-11-07 15:31:55 +01:00
69daae955a Add payment options to toilet, isolate tagrendering-override 2021-11-07 15:31:51 +01:00
76fa858b61 Improve language 2021-11-07 15:23:29 +01:00
e3d6feeae9 Fix big license-info file, fix missing images, fix #553 2021-11-07 15:16:28 +01:00
2a6a2d4f24 Remove licenses from non-existing images 2021-11-07 15:03:03 +01:00
2a49074ab6 Regenerate translations 2021-11-07 14:37:21 +01:00
5dab0927a4
Merge pull request #555 from pietervdvn/cycle-barrier-fixes
Update cycle_barrier tags
2021-11-07 14:26:28 +01:00
b4468c676a
Merge branch 'develop' into bike-theme-duplicate-location 2021-11-07 14:25:09 +01:00
Robin van der Linde
28867f642f Update cycle_barrier tags 2021-11-07 11:45:51 +01:00
David Haberthür
7b0d00b7d4 Remove duplicate relative locations
Both `underground` and `surface` show up twice.
See https://github.com/pietervdvn/MapComplete/issues/541
2021-11-05 12:24:52 +01:00
ab159b1880 Translation sync 2021-11-04 22:02:42 +01:00
4f37bf64a2 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2021-11-04 21:57:23 +01:00
a9489f6135 Merge master 2021-11-04 21:57:10 +01:00
Robin van der Linde
2511632a6e Merge branch 'develop' into theme/street_lighting 2021-11-04 17:17:03 +01:00
d8d12c607b Translation sync, should fix #538 2021-11-04 17:14:17 +01:00
1a2636f19e Formatting, translations 2021-11-04 17:03:12 +01:00
63acca1638 Add 'CreateNewWayWithNodeReuse'-action, use it in the GRB-theme 2021-11-04 02:16:07 +01:00
Robin van der Linde
0ee6a1a47b Update mapRendering 2021-11-03 11:58:14 +01:00
Robin van der Linde
e206ceb70a
Merge branch 'develop' into theme/street_lighting 2021-11-03 11:15:07 +01:00
6e0f57f368 Generate translations 2021-11-03 00:51:05 +01:00
2484848cd6 Refactoring of GPS-location (uses featureSource too now), factoring out state, add ReplaceGeometryAction and conflation example 2021-11-03 00:44:53 +01:00
23ae9d39c8 Add the possibility to snap onto another layer with imports, add location confirm on input, add metalayer exporting all nodes, various fixes 2021-10-31 02:08:39 +01:00
4bdabd271b Merge branch 'feature/prefix-for-oh' into develop 2021-10-29 03:43:20 +02:00
a2306c2c6f Add the possibility to define a postfix and prefix for opening hours 2021-10-29 03:42:33 +02:00
c2682fc56d Move legacy theme handling into a rewritting class, various small fixes 2021-10-29 01:41:37 +02:00
4471319588 Reformatting and regeneration of themes 2021-10-28 03:25:12 +02:00
10d9f18110 Fixes to sidewalks theme 2021-10-28 01:26:35 +02:00
070262a959 Add missing translations 2021-10-28 00:56:34 +02:00
ea61e17268 Translation regeneration 2021-10-28 00:32:47 +02:00
897c59f97a Merge develop 2021-10-28 00:13:18 +02:00
e777776531 Merge branch 'master' into develop 2021-10-27 01:34:33 +02:00