Commit graph

108 commits

Author SHA1 Message Date
Pieter Fiers 8978ecdae3 Resolve merge conflict 2020-07-20 23:55:04 +02:00
Pieter Fiers 2c92f5bbe2 Add translations + bike Shops 2020-07-20 23:43:42 +02:00
Pieter Vander Vennet a730345b16 Merge master into translations 2020-07-20 21:48:24 +02:00
Pieter Vander Vennet 9d077890bd Add clean script 2020-07-20 21:39:26 +02:00
Pieter Vander Vennet 7bec750ae2 Update bike parking to english 2020-07-20 17:40:25 +02:00
Pieter Vander Vennet 96c03dc8e3 Add more quests for bike shop 2020-07-20 17:37:16 +02:00
Pieter Vander Vennet 81a80ef95c More translations 2020-07-20 17:30:02 +02:00
Pieter Vander Vennet a528159bb7 Removed bit of stray dutch 2020-07-20 16:57:43 +02:00
Pieter Vander Vennet 5116626816 Remove dutch hardcoded texts for now; add a simple bikeshop quest 2020-07-20 16:55:16 +02:00
Pieter Vander Vennet 5670b04a71 Merge branch 'master' into features/mapathon-prep 2020-07-20 16:39:27 +02:00
Pieter Vander Vennet c688c42258 Fix bug with add buttons not always working 2020-07-20 16:37:58 +02:00
Pieter Vander Vennet 360c653553 New icons 2020-07-20 16:32:35 +02:00
Pieter Vander Vennet 7d25088981 Add new icons 2020-07-20 16:16:22 +02:00
Pieter Vander Vennet dc0da41fb1 Checkbox example 2020-07-20 13:37:33 +02:00
Pieter Vander Vennet 4abe74fbf1 Add minimal checkbox 2020-07-20 13:30:58 +02:00
Pieter Fiers 232664ee14 Half complete i18n 2020-07-20 12:39:43 +02:00
Pieter Vander Vennet 5c9fb293e9 Simplified update process 2020-07-20 09:57:19 +02:00
Pieter Vander Vennet 5e0d54601c More tweaks 2020-07-19 00:13:45 +02:00
Pieter Vander Vennet fe4fa9dd0e Add a nature reserve oriented quest layout 2020-07-18 20:40:51 +02:00
Pieter Vander Vennet a7d356c263 Add use-sidepath-awareness to calculation 2020-07-18 00:49:22 +02:00
Pieter Vander Vennet c9e90935d8 More work on widths 2020-07-17 18:57:07 +02:00
Pieter Vander Vennet 636bad97b3 Bug fixes with preprocessing; add streetwidth map 2020-07-17 17:21:07 +02:00
Pieter Vander Vennet c5b9e66bd2 Merge branch 'master' of github.com:StanIsAdmin/MapComplete 2020-07-17 14:26:28 +02:00
Pieter Vander Vennet a8314b39e6 New dependency system for TagDependantUIElement 2020-07-17 14:24:31 +02:00
Pieter Vander Vennet d7809b88bc Create a metamap 2020-07-17 13:27:09 +02:00
Pieter Vander Vennet 952a475b6d
Merge pull request #45 from pietervdvn/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-07-17 12:01:38 +02:00
Pieter Vander Vennet b01622780b Fix detection of brokenness 2020-07-17 12:00:52 +02:00
Pieter Vander Vennet 66e5808e4e Clicking the popup doesn't cause the login to appear anymore 2020-07-17 12:00:43 +02:00
Pieter Vander Vennet 4bfe078836 Fix deployment 2020-07-16 22:00:23 +02:00
Pieter Vander Vennet ce4cc244dc Add deploy script 2020-07-16 17:29:52 +02:00
dependabot[bot] 7b71f57849
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:25:22 +00:00
Pieter Vander Vennet b24698513d Merge branch 'bike-pumps' 2020-07-16 17:24:30 +02:00
Pieter Vander Vennet 7c1c9bc80a Add deploy script, fix realtime updating of the icons 2020-07-16 17:24:18 +02:00
Pieter Vander Vennet 07afc597c9 Merge branch 'bike-pumps' of github.com:pietervdvn/MapComplete into bike-pumps 2020-07-16 16:55:29 +02:00
Pieter Vander Vennet ce4775a77d Enable ghost bikes, fix assets 2020-07-16 16:48:43 +02:00
Pieter Fiers 98e299eb07 Make bike icons 50*50 2020-07-16 16:25:27 +02:00
Pieter Fiers 27411692b4 Fix pump operational icon 2020-07-16 16:08:51 +02:00
Pieter Fiers 67ceb04148 Add new icons for parking/pumps 2020-07-16 15:56:10 +02:00
Pieter Vander Vennet b6a6879415
Merge pull request #14 from StanIsAdmin/hotfix-css-bug
fixed CSS bug
2020-07-16 15:42:31 +02:00
Pieter Vander Vennet 3898440715 CSS tweaks 2020-07-16 15:36:57 +02:00
Pieter Vander Vennet 6d2c065cb4 Merge remote-tracking branch 'stanislas/hotfix-css-bug' 2020-07-16 15:33:54 +02:00
Pieter Fiers 9d245bcf98 Resolve merge 2020-07-16 15:32:32 +02:00
Pieter Fiers 38d6616b4a Added bike assests + naming consistency 2020-07-16 15:29:50 +02:00
Bavo Vanderghote 9cca8d9ff6 fixed CSS bug 2020-07-16 15:24:44 +02:00
Pieter Vander Vennet b4c2e4df70 Merge preliminary work on layer selection 2020-07-16 14:56:19 +02:00
Pieter Vander Vennet b51542cd2d Add valves to bicycle pumps 2020-07-16 14:24:46 +02:00
Pieter Vander Vennet 19acba61d2 Change in tagfilters 2020-07-16 14:21:06 +02:00
Pieter Vander Vennet c1c11ed906 Merge branches 2020-07-16 09:54:32 +02:00
Pieter Vander Vennet 5cdd594e63 Merge branch 'bike-pumps' of github.com:pietervdvn/MapComplete into bike-pumps 2020-07-16 09:25:49 +02:00
Pieter Vander Vennet bb61f7777f Bike pump updates 2020-07-16 09:25:20 +02:00