Commit Graph

548 Commits

Author SHA1 Message Date
Kushan Joshi
39c82af158 Sort modules [eslint rule] 2016-07-06 12:12:08 +05:30
Bryan Housel
759413fe40 Merge pull request #3221 from ramyaragupathy/master
Adding emergency =defibrillator preset (fixes #3202)
2016-07-05 11:10:20 -04:00
Ramya
aa135d921f fixing #3202 2016-07-05 15:49:05 +05:30
Bryan Housel
2c3162c9ad Remove unused language json files (fil and ko-KR)
(closes #3214)
2016-07-03 13:18:53 -04:00
Satya Sudheer
63363a8d67 Adding man_made=bridge preset issue# 3183 2016-07-02 16:47:58 +05:30
Bryan Housel
8bf9c260a7 Switch from sloped_curb=* to kerb=*
(closes #3210)
2016-06-30 21:45:18 -04:00
Bryan Housel
e664c35e72 Rename "Chemist" preset label to "Drugstore" for en_US
(closes #3201)

Don't worry - we will leave it as "Chemist" in the en_GB translation.
2016-06-30 21:29:16 -04:00
Bryan Housel
03558c7e40 Bump dependencies, fix tests
(commented out 2 failing tests in mapillary service related to sinon spy)
2016-06-25 00:50:20 -04:00
Bryan Housel
7d80494ac5 Add stop type, direction forward/backward 2016-06-23 21:24:10 -04:00
Bryan Housel
4cdcc8c2a3 Add rooms, internet fields to guest_house, hostel, motel presets 2016-06-23 17:35:21 -04:00
Bryan Housel
304b3b3579 Restore numeric lanes preset, but keep code for new WIP lanes field 2016-06-22 16:21:51 -04:00
Kushan Joshi
4083a0e29e adding a lanes() to return lane data 2016-06-22 16:11:46 -04:00
Bryan Housel
8b9a9e32f6 Remove reference to mapillary-js assets from dist/index.html
(This was a holdover from testing a while ago. Assets are loaded from CDN now)
2016-06-15 11:08:56 -04:00
Bryan Housel
4fd6b94973 Consistent single quotes in .html 2016-06-15 10:43:48 -04:00
Bryan Housel
e98db81a27 Switch dist/modules/actions.js -> js/lib/id/actions.js 2016-06-13 14:04:44 -04:00
Bryan Housel
2ef7fdead5 Merge branch 'master' into baby-steps 2016-06-13 12:31:09 -04:00
Bryan Housel
e0dac9457d make translations 2016-06-07 14:42:55 -04:00
Tom MacWright
266504d4e2 Baby steps mode 2016-06-06 16:54:24 -04:00
Bryan Housel
02ba1ae0fd Run Make 2016-06-05 20:51:01 -04:00
Bryan Housel
30dfdeb3ba Merge pull request #3128 from openstreetmap/mapillary_js
Replace static Mapillary thumbnail with mapillary-js viewer
2016-06-01 00:27:39 -04:00
Bryan Housel
6788f7932a Load mapillary viewer assets dynamically from CDN 2016-05-29 23:07:37 -04:00
Bryan Housel
368b861818 Allow Mapillary signs layer only if image layer is already enabled 2016-05-27 23:37:40 -04:00
Kushan Joshi
6b70cf3db8 temporary css fixup 2016-05-26 18:44:04 +05:30
Kushan Joshi
f81ff29645 Mapillary Js, second stab 2016-05-25 15:51:36 +05:30
Bryan Housel
c3d817797b make translations 2016-05-24 20:17:33 -04:00
Bryan Housel
1683e3e8eb Rename barrier=ditch preset name to "Trench"
We have `waterway=ditch` already and don't want two things labelled "Ditch" to appear in search.
Ditches are more for carrying water, Trenches are more for preventing movement
2016-05-12 17:07:41 -04:00
Bryan Housel
5a4f401ba7 Update barrier category, use roadblock icon 2016-05-12 16:50:55 -04:00
Bryan Housel
b2fe5744d5 Use ⌘ B for quick background switching, add tooltip, style 2016-05-12 00:52:20 -04:00
Bryan Housel
2ed9b19dbe Add style and route-horse icon, rename per #3066 2016-05-08 22:01:39 -04:00
Kushan Joshi
cdfe2435f2 add preset for route=horse relations 2016-05-08 21:51:01 -04:00
Bryan Housel
c6dcef423c make translations 2016-05-03 22:56:55 -04:00
Bryan Housel
662c5f756f Add "required" to changeset comment placeholder 2016-05-03 17:10:16 -04:00
Bryan Housel
2506a3881a Add fee and bin fields to some presets
(closes #2872)
2016-05-01 14:16:46 -04:00
Bryan Housel
faa8f86dc0 Use multiCombo for payment options, add to vending
(re: #2872)
2016-05-01 12:27:32 -04:00
Bryan Housel
fdfee96f53 Use multiCombo for currency options, add to vending, money exchange, atm
(re: #2872)
2016-05-01 12:17:11 -04:00
Bryan Housel
1495f45c20 Use multiCombo for fuel options
(closes #1987)
2016-05-01 11:44:22 -04:00
Bryan Housel
f071b93654 Merge pull request #3080 from openstreetmap/kepta-chips
Add multiselect preset
2016-04-30 00:21:30 -04:00
Bryan Housel
8ecda6d9fc Remove multiselect.js, remove test data
(all functionality in multiselect.js has been moved to combo.js)
2016-04-29 21:31:56 -04:00
Bryan Housel
10c1e975ca make translations 2016-04-25 12:24:31 -04:00
Bryan Housel
7ebd7a3eb6 Merge branch 'prison' of git://github.com/kepta/iD into kepta-prison 2016-04-24 21:13:22 -04:00
Bryan Housel
e24acfab77 Change Multiselect input placeholder text to translateable "Add" 2016-04-22 22:33:43 -04:00
Bryan Housel
9d8626a330 Merge branch 'chips' of https://github.com/kepta/iD into kepta-chips 2016-04-22 10:39:41 -04:00
Kushan Joshi
e0188395b5 Add prison preset 2016-04-22 01:26:15 +05:30
Kushan Joshi
165b53e249 Change studio preset 2016-04-19 04:06:27 +05:30
Tom MacWright
39429fbceb add a warning to the changeset page if a user mentions google 2016-04-15 15:25:12 +05:30
Bryan Housel
5f3eae9c29 Fix imagery offset +/-, adjust text and style 2016-04-14 01:08:56 -04:00
Bryan Housel
215d83f2d4 Merge branch 'offset' of https://github.com/kepta/iD into kepta-offset 2016-04-13 10:46:11 -04:00
Kushan Joshi
9261752068 add multiselect preset 2016-04-03 12:40:14 +05:30
Bryan Housel
b7fa84eb98 Add nutrition supplements store preset
(closes #3043)
2016-03-26 21:02:05 -04:00
Bryan Housel
4e475b8b67 Add coffee shop preset
(closes #3042)
2016-03-21 17:07:42 -04:00