CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-09 03:25:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,273 Commits 2 Branches 0 Tags
develop
Commit Graph

16273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huangyingjie 8beb943fa9 fix: properties exported are redefined 2017-01-12 20:24:44 +08:00
Bryan Housel f109efda7b Fix close() for single node ways 2017-01-12 15:56:46 +05:30
Bryan Housel 0efd8cb9e6 Merge pull request #3747 from openstreetmap/add-aerialway-presets 
Adds additional aerialway presets, fixes #3733
 2017-01-12 14:52:06 +05:30
Ajith Ranka adbde8c68f Add additional aerialway presets, fixes #3733 2017-01-12 14:37:21 +05:30
Bryan Housel cc3b2ea079 Merge pull request #3735 from M1dgard/fields-email-fax 
Add universal email field, make fax universal
 2017-01-11 00:22:40 +05:30
Bryan Housel f96a595698 Merge pull request #3730 from mertemin/feature-y 
Add outdoor_seating options
 2017-01-10 12:29:04 -05:00
Bryan Housel 1207b08a20 Use a more example-y Turkish phone number, and run build 2017-01-10 22:57:25 +05:30
Bryan Housel bf951fc451 Merge branch 'feature-x' of https://github.com/mertemin/iD 2017-01-10 22:53:57 +05:30
Bryan Housel f5ff246ecf Merge pull request #3740 from boothym/step_count 
Add step_count field
 2017-01-10 12:21:51 -05:00
boothym ef54e4eb8e Add step_count field 2017-01-10 15:46:50 +00:00
Bryan Housel cadb38009a Add tests for way.close, way.unclose 2017-01-09 19:58:18 -05:00
popov 42a6530796 Do not attach dragNode behavior in browse mode 2017-01-10 10:41:58 +10:00
Bryan Housel 73e27c9657 Now that updateNode preserves circularity, provide close/unclose functions 
This lets us break closed ways at their connecting node in the few situations where
we actually want that behavior (disconnect action for circular non-area ways)
 2017-01-09 19:41:38 -05:00
Bryan Housel 8676dd6e4c Changes to removeNode and add tests 2017-01-09 18:38:28 -05:00
Bryan Housel 7b86afc9de Changes to replaceNode and add tests, also stricter isClosed 2017-01-09 18:16:30 -05:00
Bryan Housel f510038791 Changes to updateNode and add tests 2017-01-09 17:33:46 -05:00
Bryan Housel f1cdde0f92 Changes to addNode and add tests 2017-01-09 17:33:26 -05:00
Mert Emin Kalender c654033663 Add Turkish phone format 2017-01-08 23:37:18 -08:00
Mert Emin Kalender d18f54cb2f Making outdoor_seating checkbox 2017-01-08 23:05:14 -08:00
popov e56feb160f Merge remote-tracking branch 'upstream/master' 
Conflicts:
	data/core.yaml
	dist/locales/en.json
 2017-01-09 11:15:56 +10:00
M1dgard 8226745f12 Add universal email field, make fax universal 
Fixes #3710
 2017-01-08 23:14:29 +01:00
Bryan Housel 9abae74e83 Merge pull request #3729 from mertemin/feature-x 
Add Turkish address scheme
 2017-01-08 15:14:52 -05:00
Bryan Housel 9ab39dd030 Merge pull request #3727 from M1dgard/amenity-coworkingspace 
Add amenity=coworking_space as non-searchable preset
 2017-01-08 15:13:04 -05:00
Mert Emin Kalender b2bd8ada9d Add outdoor_seating options 2017-01-07 20:50:42 -08:00
Mert Emin Kalender 0d2eb85007 Add Turkish address scheme 2017-01-07 19:54:35 -08:00
M1dgard d268f7983e amenity=coworking_space as non-searchable preset 
So that it doesn't show up as a blank Amenity in the Inspector.
 2017-01-07 23:11:45 +01:00
Bryan Housel a4eda3cf08 Add presets for leisure=horse_riding 
(closes #3619)
 2017-01-07 00:29:51 -05:00
Bryan Housel 104262e0b0 Add preset for place=square 
(closes #3658)
 2017-01-07 00:15:53 -05:00
Bryan Housel 6fd7743f00 Add toll field to motorway, trunk 2017-01-06 23:31:21 -05:00
Bryan Housel 8a7e9f8669 Add preset for barrier=border_control 
(closes #3719)
 2017-01-06 23:22:04 -05:00
Bryan Housel 5db9cd156b Allow toll_booth on area geometry 2017-01-06 23:18:48 -05:00
Bryan Housel 739c1e9acc Move tracktype to top of field list 
(closes #3718)
 2017-01-06 23:08:07 -05:00
greenkeeperio-bot 6f18f3865d chore(package): update rollup to version 0.41.1 
https://greenkeeper.io/
 2017-01-06 22:42:47 -05:00
greenkeeperio-bot aed977d736 chore(package): update d3 to version 4.4.1 
https://greenkeeper.io/
 2017-01-06 21:45:33 -05:00
greenkeeperio-bot ae28a18152 chore(package): update eslint to version 3.13.0 
https://greenkeeper.io/
 2017-01-06 21:45:13 -05:00
Bryan Housel 5ffe5e0a5b Merge branch 'replace-node' of https://github.com/slhh/iD into slhh-replace-node 2017-01-05 14:17:57 -05:00
Bryan Housel 4cfc51bf4a Merge branch 'cedarstudios-master' 2017-01-05 11:09:14 -05:00
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