Commit Graph

7834 Commits

Author SHA1 Message Date
JamesKingdom ecb07f2b3b Rename to Candy Maker and change sweets > sweet 2017-10-03 17:46:10 +01:00
Bryan Housel 2b47ac4b3e Replace tunnel_waterway combo with structure_water radio
(closes #4384)

- adds the `layer` field so it works like the structure field on highways
- also defaults the tunnel type to `culvert` for waterways
- also fixed so that `layer` gets removed if user changes types or clicks delete
2017-10-02 11:24:59 -04:00
Bryan Housel 7376787c44 If showing layer= field, add to field.keys so delete will remove it 2017-10-02 09:40:54 -04:00
Bryan Housel 7ba3bf3a45 Don't hard code form-field-structure field name
(radiobox with structure extras can be used for other fields)
2017-10-02 09:26:54 -04:00
Bryan Housel f7b7bd7d5f Change "listening on" console message from red to yellow
(Because red looks like an error)
2017-10-02 08:53:10 -04:00
Bryan Housel a20cc8ed3f Standardize on one access_simple field that includes "yes" option
(closes #4383)

`access_toilets` used to be the only one with the "yes" option,
now it's not needed.
2017-10-02 08:49:32 -04:00
Bryan Housel b0c50bcc32 Add "trim trail" as a term for fitness station preset
(re: https://github.com/openstreetmap/iD/issues/4373#issuecomment-333307431)
2017-10-01 10:23:02 -04:00
Bryan Housel e6f46831f0 Pacify eslint 2017-09-29 10:13:42 -04:00
Bryan Housel 4fb81748dc Update to sinon v4, sinon-chai v2.14 2017-09-29 10:09:38 -04:00
Bryan Housel 63450b05b5 Merge pull request #4380 from openstreetmap/build
Streamline build steps
2017-09-28 22:38:15 -04:00
Kushan Joshi 81b91ad676 fix travis 2017-09-28 17:57:06 +05:30
Kushan Joshi 84fd3d7d16 fix lodash merge 2017-09-28 17:32:55 +05:30
Kushan Joshi 6e3795bfd8 Merge branch 'master' of github.com:openstreetmap/iD into build
# Conflicts:
#	build_data.js
#	development_server.js
#	modules/services/mapillary.js
2017-09-28 17:27:34 +05:30
Kushan Joshi 6eb509d413 promisify build steps 2017-09-28 17:10:30 +05:30
Bryan Housel 015c8918f6 Merge pull request #4372 from openstreetmap/lodash-es
Convert to named imports for lodash and d3
(re: #3948)
2017-09-27 15:00:39 -04:00
Bryan Housel 1074c4ff9a Merge branch 'master' into lodash-es 2017-09-27 14:47:31 -04:00
Bryan Housel 17d71cb1cf Use rollup-plugin-includepaths to help rollup resolve d3 on npm2
rollup-plugin-node-resolve seems unable to resolve d3 under npm2
which is installed by default with node 4.  So this plugin adds
an extra include path to help it find the d3 dependencies.

npm3 flat dependencies:  /node_modules/d3-selection
npm2 hierarchical dependencies:  /node_modules/d3/node_modules/d3-selection
2017-09-27 13:31:23 -04:00
Bryan Housel b5168c1070 Restore the global d3 (needed so tests use the same d3.event as iD?) 2017-09-27 10:39:03 -04:00
Bryan Housel 888214f0c5 Merge pull request #4375 from openstreetmap/playground
Adding playground presets
2017-09-26 14:33:25 -04:00
Bryan Housel 9f1d476594 Attempt to remove d3, lodash from bundle, but leave available for tests 2017-09-26 14:19:14 -04:00
Bryan Housel 3d13620705 Convert lodah-es and d3 to named imports for ui 2017-09-26 11:22:43 -04:00
Kushan Joshi 07ac2a372f Ignore the output files of buildData.js 2017-09-26 11:29:01 +05:30
Kushan Joshi 9b008a32a1 Separate build steps 2017-09-26 11:29:01 +05:30
Bryan Housel 2d583a9400 Comment out debugging code from #4376
use node v8
2017-09-26 11:28:59 +05:30
Bryan Housel 31aec5743c Convert lodah-es and d3 to named imports for ui/panels 2017-09-26 00:41:15 -04:00
Bryan Housel d296c26fcc Convert lodah-es and d3 to named imports for ui/intro 2017-09-26 00:27:21 -04:00
Bryan Housel 6d65a1c89a Convert lodah-es and d3 to named imports for ui/fields 2017-09-26 00:17:13 -04:00
Bryan Housel eb5d00bcc3 Convert lodah-es and d3 to named imports for validations 2017-09-25 23:36:28 -04:00
Bryan Housel 50b7e2e2a8 Convert lodah-es and d3 to named imports for util 2017-09-25 23:35:06 -04:00
Bryan Housel 9edae82673 Convert lodah-es and d3 to named imports for svg 2017-09-25 23:16:24 -04:00
Bryan Housel 50da78c1fd Convert lodah-es and d3 to named imports for services 2017-09-25 15:10:47 -04:00
Bryan Housel d906ca6b10 Convert lodah-es and d3 to named imports for renderer 2017-09-25 14:35:33 -04:00
Bryan Housel d53e473474 Convert lodah-es and d3 to named imports for presets 2017-09-25 14:20:24 -04:00
Bryan Housel 855c112ae0 Convert lodah-es and d3 to named imports for osm 2017-09-25 14:14:49 -04:00
Bryan Housel 3def4db09f Convert lodah-es and d3 to named imports for operations 2017-09-25 13:58:53 -04:00
JamesKingdom fef0e8000c Update min+max age fields 2017-09-25 17:55:52 +01:00
JamesKingdom 7748a2889d Update slide icon 2017-09-25 17:52:44 +01:00
Bryan Housel bf3fbd21d1 Comment out debugging code from #4376 2017-09-25 11:56:50 -04:00
Kushan Joshi ddbc9df113 Sort mapillary’s rbush result 2017-09-25 18:20:43 +05:30
Kushan Joshi 24fef3cbac build css in development 2017-09-25 18:20:43 +05:30
Bryan Housel 914ef0236a Convert lodah-es and d3 to named imports for modes 2017-09-24 23:25:49 -04:00
Bryan Housel 0ee30c44cb Convert lodah-es and d3 to named imports for lib 2017-09-24 23:08:47 -04:00
Bryan Housel 8e591a5384 Convert lodah-es and d3 to named imports for geo 2017-09-24 23:01:21 -04:00
Bryan Housel 78908bfaa1 Convert lodah-es and d3 to named imports for core 2017-09-24 22:52:12 -04:00
Bryan Housel 75d2c45fd6 Convert lodah-es and d3 to named imports for behaviors 2017-09-24 21:43:54 -04:00
Bryan Housel a98f57cdcb Convert lodah-es and d3 to named imports for actions 2017-09-24 21:06:52 -04:00
JamesKingdom be0853798e Adding some more fields to playground 2017-09-24 21:25:01 +01:00
JamesKingdom 2079fb4f9e Adding playground presets 2017-09-24 19:30:41 +01:00
Bryan Housel f42cb77d99 Fix topbar buttons in Firefox in save mode when css filter active
(closes #4348)
2017-09-22 22:43:32 -04:00
Bryan Housel 8d50e748a7 Merge pull request #4366 from openstreetmap/volcano
Adding volcano status and volcano type
2017-09-21 20:37:31 -04:00