7945 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nikita Mashukov	da0b42e727	merge way nodes action is added	2017-10-28 21:05:50 +07:00
Bryan Housel	0265c8b04a	Fix misspelling of Auxiliary ... 0cdd77d696 (commitcomment-25223290)	2017-10-26 21:48:33 -04:00
Bryan Housel	92c2f8c38a	Merge pull request #4475 from octagonal/remove-underscores ... Don't add unneeded underscores to source	2017-10-26 15:12:03 -04:00
Anthony Madhvani	b682697009	Don't add unneeded underscores to source	2017-10-26 21:03:05 +02:00
greenkeeper[bot]	08e23d2dfd	chore(package): update rollup-plugin-commonjs to version 8.2.5	2017-10-26 01:25:19 -04:00
Bryan Housel	9c6c82d883	Merge pull request #4470 from openstreetmap/alpine ... Add "Climbing hut" term to alpine hut	2017-10-25 11:09:58 -04:00
JamesKingdom	cb5b9bf428	Add "Climbing hut" term to alpine hut	2017-10-25 16:05:39 +01:00
Bryan Housel	5a9d53fcb3	Disambiguate between playground and fitness station horizontal bar	2017-10-25 10:38:57 -04:00
Bryan Housel	fc59d1f1c2	Update fitness_station field and add seveal fitness equipment presets	2017-10-25 10:27:13 -04:00
Bryan Housel	5824a61819	Merge branch 'master' into fitness	2017-10-25 09:41:01 -04:00
Bryan Housel	9c5a79a714	Deprecate amenity=scrapyard, in favor of industrial=scrap_yard ... (re: #3387 / https://github.com/openstreetmap/iD/issues/4466#issuecomment-339187977)	2017-10-24 23:02:04 -04:00
Bryan Housel	2ed84c00ac	Move slaughterhouse under landuse/industrial, add terms	2017-10-24 22:46:18 -04:00
Bryan Housel	e1dd5f2616	Merge branch 'master' into sh	2017-10-24 22:36:46 -04:00
Bryan Housel	be02b1c530	Better placeholders for electrical fields, switch some to combo	2017-10-24 22:30:07 -04:00
Bryan Housel	6ce6179166	Rename label from "Star" -> "Star / Wye"	2017-10-24 16:54:21 -04:00
Bryan Housel	d78655cf7c	Merge pull request #4464 from ToeBee/transformer-preset ... Adding details to power transformer preset	2017-10-24 16:44:58 -04:00
Bryan Housel	c40f242b82	Depend on bhousel/node-diff3 which includes fix for hunk sorting bug ... (closes #3544, closes #3058)	2017-10-24 15:38:52 -04:00
JamesKingdom	658889ee22	Add Slaughterhouse preset ... (closes #4466)	2017-10-24 15:05:21 +01:00
Toby Murray	983b2468c2	Adding transformer presets to generated files	2017-10-23 23:17:37 -05:00
Toby Murray	48f2b598fb	Tweaking transformer presets ... Title casing labels and adding the frequency field	2017-10-23 23:16:30 -05:00
Bryan Housel	fa0ad3abb2	Merge pull request #4462 from AndreasHae/master ... Change drain icon to ditch	2017-10-23 16:53:24 -04:00
Bryan Housel	690571d40c	Downgrade rollup-plugin-commonjs to fix node 4	2017-10-23 16:19:20 -04:00
Bryan Housel	30ff68348f	Don't disable boundries when disable_features list is present ... (also removed some unused functions)	2017-10-23 15:53:46 -04:00
Andreas Haessler	ebdf3009b8	Change drain icon to ditch	2017-10-23 11:10:49 +02:00
Bryan Housel	dbf85dae43	If no features are disabled remove the querystring parameter	2017-10-22 22:42:35 -06:00
Bryan Housel	a670c73808	Merge pull request #4461 from AndreasHae/master ... Add islet preset	2017-10-22 22:34:05 -06:00
Toby Murray	0cdd77d696	Adding field presets for transformers ... Addresses #4442	2017-10-22 17:26:13 -05:00
Andreas Hässler	95bcf1f87f	Add islet preset	2017-10-22 23:21:59 +02:00
Bryan Housel	469df0b059	Change features to disable_features querystring, add init()	2017-10-22 12:00:51 -06:00
Bryan Housel	3332847beb	Merge pull request #4439 from ferdibiflator/features-api-parameter ... add the features api parameter which enables the list of features	2017-10-22 10:40:44 -06:00
Bryan Housel	dda0411aba	Update rollup-plugin-commonjs to the latest version	2017-10-21 16:55:12 -06:00
greenkeeper[bot]	0cb479e4ca	chore(package): update @std/esm to version 0.12.0	2017-10-21 16:50:42 -06:00
Bryan Housel	21fb5da2a4	Merge pull request #4456 from ferdibiflator/copyable-content-within-info-panels ... Copyable content text	2017-10-20 13:53:51 -04:00
Nikita Mashukov	edc30ad41c	no prevent the copy event when there is selected text	2017-10-20 20:20:42 +07:00
Bryan Housel	b3842d97f4	Remove lodash from the test suite ... (closes #4378)	2017-10-18 14:37:39 -04:00
Bryan Housel	04fead1bc0	Merge pull request #4447 from DzikowskiW/feature/remove-lodash ... Lodash dependencies removed from build scripts	2017-10-18 10:06:55 -04:00
Bryan Housel	8e273f2240	Rename "Boules Area" to "Boules/Bocce Court", add type field, terms	2017-10-17 22:01:32 -04:00
Wojciech Dzikowski	9f272fdb06	Added leaisue boules preset (#4451)	2017-10-17 21:50:11 -04:00
Wojciech Dzikowski	1c831b2b7f	Lodash dependencies removed from build scripts ... 1. @std/esm added to handle ES6 imports in older node version 2. Swapped lodash dependencies for lodash-es in build scripts	2017-10-17 16:58:08 +02:00
Bryan Housel	515d510223	Merge pull request #4448 from manfredbrandl/landuse-fields-preset ... Add landuse=brownfield/greenfield presets	2017-10-16 13:54:58 -04:00
Manfred Brandl	4b5ff8a377	Add landuse=brownfield/greenfield presets with npm run build	2017-10-16 19:07:39 +02:00
Manfred Brandl	4d29c60573	Add landuse=brownfield/greenfield presets	2017-10-16 18:37:36 +02:00
Bryan Housel	29a99b4cf1	Merge pull request #4445 from moshen/fix-imagrey-save ... Fix #4443 Imagery only updated on first save	2017-10-16 00:38:08 -04:00
Colin Kennedy	c81cf703f2	Fix #4443 Imagery only updated on first save	2017-10-15 15:45:53 -04:00
Nikita Mashukov	718383d05c	features api parameter description is added 📝	2017-10-16 00:14:08 +07:00
Bryan Housel	fd4ca2368d	Merge pull request #4440 from ferdibiflator/put-gpx-src-to-imagery-used ... push the gpx src (file name or url) to imagery_used	2017-10-15 10:35:42 -04:00
Bryan Housel	6f81c80d22	Merge pull request #4438 from haroldb/sauna-preset ... Add sauna preset	2017-10-14 12:48:58 -04:00
Nikita Mashukov	d0cca4bc5b	spaces instead tabs	2017-10-14 18:42:37 +07:00
Nikita Mashukov	a00debe663	push gpx src (file name or url) to imagery_used	2017-10-14 18:37:49 +07:00
Nikita Mashukov	bac4da5abe	using spaces instead tabs	2017-10-14 17:46:29 +07:00