Bryan Housel
ddd1b7e43a
Don't change history state while in transition
2017-01-04 17:37:29 -05:00
Bryan Housel
8ce6b9e185
Merge branch 'transitioned-actions'
2017-01-04 17:26:22 -05:00
Natsuyasumi
e1640a1e39
Merge branch 'master' into address-customization
2017-01-04 22:19:09 +01:00
Bryan Housel
9ba610a977
Add test for transitioned history.perform
2017-01-04 16:06:09 -05:00
Bryan Housel
12047b1b5b
Merge branch 'master' of https://github.com/cedarstudios/iD into cedarstudios-master
2017-01-04 13:33:31 -05:00
Milad Karbasizadeh
4729bbbc4e
fix a bug with space
2017-01-04 11:13:45 +03:30
Bryan Housel
d63c766e69
Split into utilDisplayName / utilDisplayNameForPath
...
This is because utilDisplayName gets called a bunch of places and we
only want to add the Arabic reversal code for textpath labels
2017-01-03 20:58:56 -05:00
Bryan Housel
c70b6278fc
Avoid es6 let/const (because phantomjs)
2017-01-03 17:29:33 -05:00
Bryan Housel
952a338abf
eslint / formatting
2017-01-03 17:27:48 -05:00
Bryan Housel
f9f369b806
Merge branch 'master' of https://github.com/cedarstudios/iD into cedarstudios-master
2017-01-03 17:10:15 -05:00
greenkeeperio-bot
2fbeda0f59
chore(package): update rollup to version 0.40.0
...
https://greenkeeper.io/
2017-01-03 14:01:27 -05:00
Bryan Housel
00d1572bc3
Run build for preset
2017-01-03 13:58:34 -05:00
Bryan Housel
3989e45029
Merge pull request #3714 from iandees/adjust_coworking_preset
...
Adjust coworking preset
2017-01-03 13:54:38 -05:00
Ian Dees
23a3718376
Lets make it office=coworking instead
2017-01-03 12:46:53 -06:00
Ian Dees
e01534dbd2
Move the amenity=coworking_space preset to office=coworking_space
2017-01-03 12:45:32 -06:00
Milad Karbasizadeh
3ef1103c3a
Remove signs of real_name ever existed.
2017-01-03 21:57:29 +03:30
Milad Karbasizadeh
5fab91dd7c
Merge pull request #2 from Georeactor/master
...
digest combined LTR and RTL words
2017-01-03 21:38:13 +03:30
Nick Doiron
9e5d3e7c5a
digest combined LTR and RTL words
2017-01-03 22:21:15 +08:00
Milad Karbasizadeh
5da7d83fe9
Modify railways arabic/persian names
2017-01-03 16:34:57 +03:30
Milad Karbasizadeh
a36650ccbe
add arabic kaf to character table
2017-01-03 16:15:08 +03:30
Milad Karbasizadeh
47389176cd
Merge pull request #1 from Georeactor/master
...
Changes I was talking about in the OSM PR
2017-01-03 15:30:00 +03:30
Nick Doiron
88efc0c8ef
add and reorder letters
2017-01-03 18:18:29 +08:00
Nick Doiron
94ee7d4916
move changes to svg display name
2017-01-03 18:18:18 +08:00
Bryan Housel
aba1ab105e
Add postcode to jp address format
2017-01-02 19:41:20 -05:00
Bryan Housel
fc5aea739f
Update fontstack to use better system fonts over Helvetecia Neue
2017-01-02 18:51:12 -05:00
Bryan Housel
7e755db28d
Merge branch 'japanese-address-scheme' of https://github.com/Natsuyasumi/iD into Natsuyasumi-japanese-address-scheme
2017-01-02 13:38:03 -05:00
Mikołaj "Natsuyasumi" Kuranowski
5102782bdb
Adding japanese address scheme
2017-01-02 18:07:32 +01:00
Mikołaj "Natsuyasumi" Kuranowski
9ff18af45f
Merge remote-tracking branch 'refs/remotes/openstreetmap/master'
2017-01-02 17:51:27 +01:00
Mikołaj "Natsuyasumi" Kuranowski
79c01b3ec4
Merge remote-tracking branch 'refs/remotes/openstreetmap/master' into address-customization
2017-01-02 17:48:24 +01:00
Milad Karbasizadeh
af1ac89df7
Rename fix-string.js and fixTextForSvg function name to a more readable name.
...
User regex to detect arabic characters.
Fix editing bugs.
2017-01-02 14:48:22 +03:30
greenkeeperio-bot
84537fa1c8
chore(package): update lodash to version 4.17.4
...
https://greenkeeper.io/
2017-01-01 15:29:26 -05:00
Bryan Housel
dcf90aec3b
Run build for presets
2017-01-01 15:28:25 -05:00
Bryan Housel
90d5c69c1b
Merge branch 'fire-hydrant-fields' of https://github.com/wopfel/iD into wopfel-fire-hydrant-fields
2017-01-01 15:20:14 -05:00
Bernd Arnold
10d7d7f7b3
Add fire_hydrant:position field to presets
...
http://wiki.openstreetmap.org/wiki/Tag:emergency%3Dfire_hydrant
2017-01-01 13:16:06 +01:00
Milad Karbasizadeh
92b5ce133d
fix persian characters on chrome and safari
2017-01-01 15:41:47 +03:30
greenkeeperio-bot
8c812f6fb8
chore(package): update npm-run-all to version 4.0.0
...
https://greenkeeper.io/
2016-12-31 13:24:21 -05:00
Bryan Housel
c2713c3a3f
For node-way merge, preserve original node if possible
...
(closes #3683 )
2016-12-31 02:01:13 -05:00
greenkeeperio-bot
4e2d975e13
chore(package): update lodash to version 4.17.3
...
https://greenkeeper.io/
2016-12-31 00:08:47 -05:00
greenkeeperio-bot
1f63f43231
chore(package): update rollup-plugin-commonjs to version 7.0.0
...
https://greenkeeper.io/
2016-12-31 00:08:28 -05:00
greenkeeperio-bot
8eb9342409
chore(package): update rollup to version 0.39.2
...
https://greenkeeper.io/
2016-12-31 00:08:01 -05:00
Bryan Housel
e9dfa04dd4
Social Facility preset improvements
...
(closes #3702 )
* Add `social facility` field
* Make sure Social Facility presets have both `social_facility` and `social_facility:for`
* Change `social_facility:for` from radio to combo, because so many choices
2016-12-30 23:32:00 -05:00
Bryan Housel
9033c9d638
Standardize on calling things "features" instead of "objects"
...
(closes #3689 )
2016-12-29 21:35:00 -05:00
Bryan Housel
45ad0842dd
Pacify eslint
2016-12-28 01:16:57 -05:00
Bryan Housel
9af0db792c
Merge branch 'midpoints' of https://github.com/edpop/iD into edpop-midpoints
2016-12-28 01:08:42 -05:00
popov
ab5d3e4056
reflect-typo
2016-12-28 01:06:38 -05:00
popov
d0727c2f36
reflect-typo
2016-12-28 15:45:13 +10:00
Bryan Housel
0386ee249e
Add castle_type field to Castle preset
2016-12-28 00:33:40 -05:00
popov
19b0a771f6
make vertex by midpoint double-clicking
2016-12-28 15:32:47 +10:00
abdeldjalil09
b074c299e7
Add "castle_type" field to castle preset
2016-12-27 17:26:03 +01:00
Bryan Housel
0c9fb7c407
Improve military presets
...
(closes #3663 )
* Add Nuclear Explosion Site and Military Office presets
* Add Bunker Type field
* Improve styling rules for preset icons
* Improve search terms for all military presets
* Nest military presets under `landuse=military`
* Add ref, iata, icao fields to Military Airfield
* Don't set area pattern fills on buildings
2016-12-27 01:19:13 -05:00
