3714486ad3
chore(package): update mocha to version 4.0.0
2017-10-06 00:21:40 -04:00
6b17d54144
chore(package): update d3 to version 4.11.0
2017-10-06 00:20:26 -04:00
07e0ee0d69
Merge pull request #4402 from pwelby/patch-1
...
Disable source switcher during walkthrough
2017-10-06 00:12:19 -04:00
7586f7e086
Disable source switcher during walkthrough
...
Closes #4401 -- fixed as proposed in the issue's comments
2017-10-05 23:53:14 -04:00
dd40dd5fad
Merge pull request #4400 from openstreetmap/cam
...
Allow cameras on a vertex
2017-10-05 21:59:08 -04:00
20e47a4685
Allow cameras on a vertex
...
(closes #4394 )
2017-10-05 18:12:20 +01:00
810c74f6a4
Merge pull request #4396 from arka-nitd/master
...
changed label for hashtag field to suggested hashtag
2017-10-04 20:33:20 -04:00
7b470eab29
changed label for hashtag field to suggested hashtag
2017-10-05 03:38:58 +05:30
795fe0c391
Correct path crane_type -> crane/type
2017-10-04 11:51:47 -04:00
0de9ea3cff
change location of crane:type field
2017-10-04 06:30:57 -03:00
2b00b85a7e
add preset for man_made=crane
2017-10-03 18:07:44 -03:00
d11cdcf628
Merge pull request #4389 from openstreetmap/sweet
...
Update confectionery presets
2017-10-03 13:32:16 -04:00
d1a59ca953
Add sweet term and build npm
2017-10-03 17:56:48 +01:00
ecb07f2b3b
Rename to Candy Maker and change sweets > sweet
2017-10-03 17:46:10 +01:00
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
7376787c44
If showing layer= field, add to field.keys so delete will remove it
2017-10-02 09:40:54 -04:00
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
f7b7bd7d5f
Change "listening on" console message from red to yellow
...
(Because red looks like an error)
2017-10-02 08:53:10 -04:00
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
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
e6f46831f0
Pacify eslint
2017-09-29 10:13:42 -04:00
4fb81748dc
Update to sinon v4, sinon-chai v2.14
2017-09-29 10:09:38 -04:00
63450b05b5
Merge pull request #4380 from openstreetmap/build
...
Streamline build steps
2017-09-28 22:38:15 -04:00
81b91ad676
fix travis
2017-09-28 17:57:06 +05:30
84fd3d7d16
fix lodash merge
2017-09-28 17:32:55 +05:30
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
6eb509d413
promisify build steps
2017-09-28 17:10:30 +05:30
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
1074c4ff9a
Merge branch 'master' into lodash-es
2017-09-27 14:47:31 -04:00
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
b5168c1070
Restore the global d3 (needed so tests use the same d3.event as iD?)
2017-09-27 10:39:03 -04:00
888214f0c5
Merge pull request #4375 from openstreetmap/playground
...
Adding playground presets
2017-09-26 14:33:25 -04:00
9f1d476594
Attempt to remove d3, lodash from bundle, but leave available for tests
2017-09-26 14:19:14 -04:00
3d13620705
Convert lodah-es and d3 to named imports for ui
2017-09-26 11:22:43 -04:00
07ac2a372f
Ignore the output files of buildData.js
2017-09-26 11:29:01 +05:30
9b008a32a1
Separate build steps
2017-09-26 11:29:01 +05:30
2d583a9400
Comment out debugging code from #4376
...
use node v8
2017-09-26 11:28:59 +05:30
31aec5743c
Convert lodah-es and d3 to named imports for ui/panels
2017-09-26 00:41:15 -04:00
d296c26fcc
Convert lodah-es and d3 to named imports for ui/intro
2017-09-26 00:27:21 -04:00
6d65a1c89a
Convert lodah-es and d3 to named imports for ui/fields
2017-09-26 00:17:13 -04:00
eb5d00bcc3
Convert lodah-es and d3 to named imports for validations
2017-09-25 23:36:28 -04:00
50b7e2e2a8
Convert lodah-es and d3 to named imports for util
2017-09-25 23:35:06 -04:00
9edae82673
Convert lodah-es and d3 to named imports for svg
2017-09-25 23:16:24 -04:00
50da78c1fd
Convert lodah-es and d3 to named imports for services
2017-09-25 15:10:47 -04:00
d906ca6b10
Convert lodah-es and d3 to named imports for renderer
2017-09-25 14:35:33 -04:00
d53e473474
Convert lodah-es and d3 to named imports for presets
2017-09-25 14:20:24 -04:00
855c112ae0
Convert lodah-es and d3 to named imports for osm
2017-09-25 14:14:49 -04:00
3def4db09f
Convert lodah-es and d3 to named imports for operations
2017-09-25 13:58:53 -04:00
fef0e8000c
Update min+max age fields
2017-09-25 17:55:52 +01:00
7748a2889d
Update slide icon
2017-09-25 17:52:44 +01:00
greenkeeper[bot]