Kushan Joshi
851daafced
Add preset man_made=pumping_station
2016-09-05 18:12:13 +05:30
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
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
5a045933c6
Rename confirm -> uiconfirm and import to save.js
...
(closes #3373 )
2016-08-24 16:03:23 -04:00
Jon D
d0fcb96892
Check in generated presets.json file from make for #3336
2016-08-22 09:01:37 +01:00
Jon D
278816473e
Add access_simple field to garden also #3336
2016-08-21 16:03:25 +01:00
Jon D
60dd3fdb80
Add access_simple field to basketball and tennis presets as per issue #3336
2016-08-21 15:57:53 +01:00
Bryan Housel
36a90b4f86
Adjust fields (building->building_area), run make for yoga preset
2016-08-21 09:50:45 -04:00
Jon D
d13c3b0979
Add Yoga Studio preset #3352
2016-08-21 14:29:49 +01:00
Bryan Housel
18186ba926
Merge pull request #3367 from 1ec5/patch-2
...
Simplify macOS setup instructions
2016-08-20 14:30:24 -04:00
Minh Nguyễn
2f6c2e15ee
Simplified macOS setup instructions
...
Presumably either the Command Line Tools package or Xcode would install the tools needed for the build system.
2016-08-20 11:15:32 -07:00
Bryan Housel
2501a763e2
Run make for preset updates
2016-08-18 15:14:36 -04:00
Bryan Housel
dd57c9f413
Merge pull request #3363 from boothym/bowling-green
...
Add Bowling Green preset
2016-08-18 15:13:33 -04:00
Bryan Housel
a96eeac3a7
Merge pull request #3362 from boothym/shop-terms
...
Add additional shop/amenity terms
2016-08-18 15:09:29 -04:00
Bryan Housel
07c75eaf6d
Merge pull request #3361 from boothym/locality
...
Remove population from locality
2016-08-18 15:08:31 -04:00
Guillaume Carbonneau
3abfb0f973
Change instructions to use node's http-server instead of going into python land ( #3364 )
...
* Change instructions to use node's http-server instead of going into python land
* Node scripts have the local node_modules/.bin/ automatically in their path
2016-08-18 10:48:22 -04:00
boothym
da68f82f54
Bowling Green preset
2016-08-18 14:06:16 +01:00
boothym
88783d2b9f
Add additional shop/amenity terms
2016-08-18 13:48:47 +01:00
boothym
03eec2924a
Remove population from locality
2016-08-18 12:54:48 +01:00
Bryan Housel
13ed12c1ab
Merge pull request #3358 from openstreetmap/greenkeeper-rollup-0.34.10
...
Update rollup to version 0.34.10 🚀
2016-08-17 13:10:52 -04:00
greenkeeperio-bot
c7d88fe4ed
chore(package): update rollup to version 0.34.10
...
https://greenkeeper.io/
2016-08-17 11:22:05 -04:00
Bryan Housel
15a522516f
Merge pull request #3339 from McKaneAndrus/patch-json-schema
...
Fixed validate function
2016-08-16 08:53:08 -04:00
Greenkeeper
7545cadf26
chore(package): update eslint to version 3.3.1 ( #3354 )
...
https://greenkeeper.io/
2016-08-16 08:42:20 -04:00
Greenkeeper
09c3026b3d
chore(package): update rollup to version 0.34.9 ( #3355 )
...
https://greenkeeper.io/
2016-08-16 08:27:39 -04:00
Greenkeeper
42ba544be3
chore(package): update togeojson to version 0.14.2 ( #3351 )
...
https://greenkeeper.io/
2016-08-15 13:58:07 -04:00
Tom MacWright
04891b9c6e
Upgrade togeojson
2016-08-12 09:07:51 -04:00
Tom MacWright
1750684b70
Javascript -> JavaScript, remove outdated contributing instructions
2016-08-11 14:02:29 -07:00
Tom MacWright
b97652c759
Cleanup: removing unnecessary independent libs ( #3342 )
2016-08-11 14:55:33 -04:00
Tom MacWright
8819d3d061
Remove continued iD references ( #3341 )
...
* Remove continued iD references
* make build.js safe enough to dodge json plugin bug
* Package as an iife to avoid var name issue
2016-08-10 20:06:45 -07:00
Tom MacWright
6341d4e4b5
one-shot build ( #3266 )
...
* One-shot development
* Move jsonp to module
* Tooltip -> module
* Remove d3.jsonp
* Fix tooltip lint
* Load all libs but d3 itself with require
* Add top-level brfs
* Unformat intro graph
2016-08-10 15:25:19 -07:00
McKane
828c304685
Fix failing preset validation function
2016-08-10 14:48:33 -07:00
Bryan Housel
77a037b225
Resolve conflict with phantomjs-prebuilt dependency
2016-08-08 11:08:13 -04:00
Bryan Housel
a1cef4b6ff
Update dependencies, add flex semver range for most devDependencies
...
(but not rollup, which moves fast and is a key dependency I want to watch)
2016-08-08 11:05:48 -04:00
Greenkeeper
1e1df9635d
chore(package): update phantomjs-prebuilt to version 2.1.11 ( #3331 )
...
https://greenkeeper.io/
2016-08-08 10:54:04 -04:00
Greenkeeper
60aa289873
chore(package): update rollup to version 0.34.5 ( #3326 )
...
https://greenkeeper.io/
2016-08-06 09:39:14 -04:00
Bryan Housel
30724e8110
Merge pull request #3322 from openstreetmap/greenkeeper-mocha-3.0.1
...
Update mocha to version 3.0.1 🚀
2016-08-04 09:50:43 -04:00
greenkeeperio-bot
95062a00dd
chore(package): update mocha to version 3.0.1
...
https://greenkeeper.io/
2016-08-04 03:46:59 -04:00
Bryan Housel
b3d8d13138
Run make
2016-08-03 21:36:36 -04:00
