16273 Commits

Author SHA1 Message Date
Kushan Joshi 851daafced Add preset man_made=pumping_station 2016-09-05 18:12:13 +05:30
Tom MacWright e659bd75e9 Fix assumption that [0] contains the nodes 2016-09-04 18:19:02 -04:00
Tom MacWright 760c515c8a Fix source toggle, fix way drawing 2016-09-04 17:33:42 -04:00
Tom MacWright 9834f66f66 Merge branch 'd3-v4' of github.com:openstreetmap/iD into d3-v4 2016-09-04 12:37:04 -04:00
Tom MacWright 71ab78a221 Turn off strict 2016-09-04 12:36:53 -04:00
Bryan Housel 76efe06c0f Rebuild time should include time spent writing the bundle and sourcemap 2016-09-04 12:04:14 -04:00
Tom MacWright 2910eaddbb Fix point adding 2016-09-04 10:52:57 -04:00
Tom MacWright a436bada3b Circularize expects rawmercator 2016-09-03 20:10:38 -04:00
Tom MacWright 0236389611 Fix Circularize logic 2016-09-03 19:33:19 -04:00
Tom MacWright 947a1d9c1a Resolve lints 2016-09-03 19:08:03 -04:00
Tom MacWright 9852fa7879 Fix initial map size 2016-09-03 18:58:45 -04:00
Tom MacWright f0145a8b56 Fix raw tag editor 2016-09-03 18:54:37 -04:00
Tom MacWright aebf0c14e1 Fix area redrawing 2016-09-03 18:42:17 -04:00
Tom MacWright 68d144e0c0 Point dragging works 2016-09-03 18:01:00 -04:00
Tom MacWright 3af54610ca Refactor customEvent system to use d3.customEvent 2016-09-03 17:56:56 -04:00
Tom MacWright 27f9f75eae Master-merge 2016-09-03 17:02:38 -04:00
Tom MacWright 202482519a Disable caching to save memory, fix event.of hack, remove console.log 2016-09-03 17:01:25 -04:00
Tom MacWright c5b3a16d3a Fix getSetValue, fix line display 2016-09-03 16:39:30 -04:00
Tom MacWright b493c85399 Refactor away multi requirement 2016-09-03 15:13:20 -04:00
Bryan Housel 8029d4de62 Fix zoomPanning
for simplicity, use raw mercator like context.projection()
2016-09-03 01:18:36 -04:00
Bryan Housel 2d35eb0253 run build instead of make before running tests 2016-09-03 00:38:06 -04:00
Bryan Housel 44d16b25b7 Restore the source switcher 2016-09-03 00:37:37 -04:00
Bryan Housel 810a1e59fb Remove more of the Makefile 2016-09-02 15:42:25 -04:00
Bryan Housel 1727e9355b Remove temporary replaceStuff.js utility 2016-09-02 11:25:27 -04:00
Bryan Housel 8c29dd9348 Enable radix eslint rule 2016-09-02 10:39:54 -04:00
Holger Jeromin d1105ccc14 Removing parseInt call of a number 2016-09-02 09:35:21 +02:00
Holger Jeromin aa1d03c823 Added Radix for parseInt call 2016-09-02 09:20:44 +02:00
boothym 09fefb227c Update name 2016-09-01 23:27:09 +01:00
boothym f6b23afd0f Add railway crossing (path) and update railway crossing (road) 2016-09-01 17:42:09 +01:00
boothym 7a4f03f887 Add indoor/outdoor gym, update sports centre presets 2016-09-01 16:51:49 +01:00
Tom MacWright f402e6b5e9 Fix rebuilding after error 2016-09-01 09:31:49 -04:00
Tom MacWright da5d5083a7 Merge branch 'd3-v4' of github.com:openstreetmap/iD into d3-v4 2016-09-01 08:47:42 -04:00
Tom MacWright 525131eb46 Display errors 2016-09-01 08:47:31 -04:00
boothym 27e2588bd3 Add cctv term for surveillance 2016-09-01 12:39:39 +01:00
Kushan Joshi 2411556588 Watch all files inside modules 2016-08-31 23:01:34 +05:30
Bryan Housel 9fa9330f7b gitignore sourcemap, add dependencies for gazer and ecstatic 2016-08-30 16:44:16 -04:00
Tom MacWright fc0e381769 Add sourcemap 2016-08-30 16:25:51 -04:00
Tom MacWright 28e41032e9 Unify, improve development environment 2016-08-30 16:16:36 -04:00
Bryan Housel 7e30fa0fe3 Add string suggestions for display and visibility combos 2016-08-28 16:10:16 -04:00
Bryan Housel f98b5563a2 Merge branch 'patch-1' of https://github.com/HolgerJeromin/iD into HolgerJeromin-patch-1 2016-08-28 15:59:35 -04:00
Bryan Housel 9d0b019699 Merge pull request #3370 from Psigio/3336
Add access_simple field to basketball, tennis & garden presets (#3336)
2016-08-28 15:49:09 -04:00
Bryan Housel 0695a38827 Run make for new preset strings 2016-08-28 15:39:31 -04:00
Bryan Housel b9ad608252 Merge pull request #3381 from willemarcel/master
Add preset for amenity=coworking_space
2016-08-28 15:37:29 -04:00
Bryan Housel a6f6bb9c17 Merge pull request #3380 from bagage/patch-1
Add fire-station icon for fire-hydrant
2016-08-28 15:35:37 -04:00
Wille Marcel 84de65e316 add preset to amenity=coworking_space 2016-08-28 11:24:42 -03:00
Wille Marcel 12b06f0583 Merge branch 'master' of https://github.com/openstreetmap/iD 2016-08-28 10:38:49 -03:00
Gautier Pelloux-Prayer 9a5598e8cd Add fire-station icon for fire-hydrant
Fire hydrants are for firemen anyway, and it help distinguish them from other no-icon point on the map. 

By the way, is there any plan to upgrade maki from version 0.5.0 to latest version 2.0.x? Is that OK if I migrate iD by updating icons' name or there is a particular reason to use maki 0.5.0?
2016-08-27 21:24:07 +02:00
Bryan Housel 82495e8f16 Merge pull request #3379 from openstreetmap/greenkeeper-eslint-3.4.0
Update eslint to version 3.4.0 🚀
2016-08-26 22:02:10 -04:00
greenkeeperio-bot 4a776cc7c7 chore(package): update eslint to version 3.4.0
https://greenkeeper.io/
2016-08-26 14:30:34 -04:00
Bryan Housel a86f34b4ef Pacify eslint, get build and tests running again 2016-08-26 01:15:07 -04:00