CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-13 22:56:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,608 Commits 2 Branches 0 Tags
d9b6fcef7113bbbcd3e84ac2d06c291dc9dcd1e2
Commit Graph

8608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Housel
d9b6fcef71 Switch "monastery_grounds" -> "monastery" 2018-03-24 17:55:48 -04:00
Bryan Housel
9e02cde651 Merge pull request #4936 from Xavier-J-Ortiz/add_amenity_monestary 
added monastary
 2018-03-24 14:55:33 -04:00
xortiz
1b01b2e0ad removed service_times from monastary 2018-03-24 12:58:05 -04:00
xortiz
790740dac5 corrected typo changed tags to monastery_grounds, as well as added monastery to terms 2018-03-24 08:31:35 -04:00
xortiz
6c04f1d711 added monastary 2018-03-24 08:21:27 -04:00
Bryan Housel
aafc40b872 Merge pull request #4905 from vershwal/building-height 
Added preset height for buildings.
 2018-03-23 17:04:30 -04:00
Bryan Housel
5291ac902f Copy edit icon to iD-sprite.src.idraw 2018-03-23 15:56:50 -04:00
Bryan Housel
df5383c1b4 Merge pull request #4908 from vershwal/icon_edit 
Added pencil icon.
 2018-03-23 15:40:52 -04:00
Bryan Housel
ca4fd2a224 Merge pull request #4933 from vershwal/outdoor_seating_preset 
Outdoor seating preset
 2018-03-23 15:39:51 -04:00
vershwal
33991eb8ae Added new line at the end of file. 2018-03-24 00:51:02 +05:30
vershwal
28336a95b3 Added preset for leisure=outdoor_seating. 2018-03-24 00:48:58 +05:30
Princi Vershwal
2f9f29eda7 Update iD-sprite.src.svg 2018-03-24 00:01:02 +05:30
vershwal
75d54e6089 Modified the pencil icon. 2018-03-23 23:35:06 +05:30
Bryan Housel
bcb76cd06c Tell Greenkeeper to ignore d3 v5 2018-03-23 13:31:28 -04:00
Bryan Housel
aea3b6feb5 Fix reference typo introduced in c44551be7 2018-03-23 13:30:37 -04:00
Bryan Housel
3d99213169 Merge pull request #4927 from openstreetmap/greenkeeper/marked-0.3.18 
Update marked to the latest version 🚀
 2018-03-22 16:57:25 -04:00
Bryan Housel
1dbf273878 Remove flow 
https://github.com/openstreetmap/iD/issues/3744#issuecomment-374950519
 2018-03-22 16:51:53 -04:00
Bryan Housel
c08d79e488 Extract tag cleaning code to utilCleanTags, add tests 
(closes #4925)
 2018-03-22 14:46:36 -04:00
Bryan Housel
c44551be77 Don't trim spaces around semicolons in conditional: tag values 
This commit also includes code formatting, and removes some lodash
 2018-03-22 14:46:36 -04:00
greenkeeper[bot]
1069473686 fix(package): update marked to version 0.3.18 2018-03-22 17:03:03 +00:00
Bryan Housel
e1b72d2c0c Merge pull request #4926 from Xavier-J-Ortiz/add_mud 
added mud to presets natural
 2018-03-22 10:07:46 -04:00
xortiz
3365ff5e73 added mud to presets natural 2018-03-22 07:53:46 -04:00
Bryan Housel
58f4bb56e9 Merge pull request #4924 from openstreetmap/greenkeeper/sinon-5.0.0 
Update sinon to the latest version 🚀
 2018-03-21 15:32:41 -04:00
Bryan Housel
7f82572f30 Merge pull request #4920 from vershwal/allotments_plot 
Added preset for allotments=plot.
 2018-03-21 15:30:05 -04:00
greenkeeper[bot]
c135eca9dc chore(package): update sinon to version 5.0.0 2018-03-21 17:48:30 +00:00
vershwal
2f01571d3c presets/landuse/allotments/plot.json -> presets/allotments/plot.json 2018-03-21 11:45:03 +05:30
vershwal
49fa8d3797 Added preset for allotments=plot. 2018-03-21 04:42:05 +05:30
vershwal
a2a0e2687d Added height preset for other buildings. 2018-03-21 00:27:31 +05:30
Bryan Housel
866aa650ac Upgrade rollup-plugin-node-resolve 
(closes #4910)
 2018-03-19 12:03:53 -04:00
Bryan Housel
be85cd8e89 Drop support for node 4 / npm 2 
(closes #4853)

This fixes several issues with dependency resolution
 2018-03-19 11:59:41 -04:00
Bryan Housel
f9c218c940 Brand not actually needed on building=hotel preset 
(should be mapped on the tourism=hotel, but not the building=hotel)
 2018-03-19 11:25:09 -04:00
greenkeeper[bot]
21c890765f chore(package): update svg-sprite to version 1.4.0 2018-03-19 11:21:51 -04:00
Bryan Housel
945b9bd432 Merge pull request #4907 from vershwal/brand_for_hotels 
Added brand=* for hotels.
 2018-03-19 11:21:10 -04:00
Bryan Housel
8db38dd59d Merge pull request #4906 from vershwal/brand_for_fuel 
Add support for “brand=*” for “amenity=fuel”.
 2018-03-19 11:18:40 -04:00
Bryan Housel
448ad5157a Merge pull request #4904 from vershwal/remove-undo-icon 
Hint text for Remove and Undo button.
 2018-03-18 18:58:34 -04:00
vershwal
1c047f5ac8 Added pencil icon. 2018-03-17 20:22:26 +05:30
Bryan Housel
efddfd271c More flow coverage of geo submodule 
(re: #3744)

also:
- Move types to index and export/import them
- add return types
 2018-03-17 09:29:12 -04:00
Bryan Housel
3e47ca005c Started adding Flow annotations to functions in the geo submodule 
(re: #3744)
 2018-03-17 01:18:05 -04:00
vershwal
06d35156ea Added brand=* for hotels. 2018-03-17 02:29:01 +05:30
vershwal
d0e3348482 Add support for “brand=*” for “amenity=fuel”. 2018-03-17 02:15:24 +05:30
vershwal
4d5bf064e2 Added preset height for buildings. 2018-03-17 01:42:35 +05:30
vershwal
142b738a30 Hint text for Remove and Undo button. 2018-03-17 01:07:56 +05:30
Bryan Housel
61c7f64077 Remember changeset source, make it settable via url param 
(closes #4899)
 2018-03-16 09:20:32 -04:00
greenkeeper[bot]
47241043b7 chore(package): update flow-bin to version 0.68.0 2018-03-15 15:52:40 -04:00
greenkeeper[bot]
19ffd75b4f chore(package): update rollup to version 0.57.0 2018-03-15 14:43:44 -04:00
Bryan Housel
8ee50abc18 Merge pull request #4889 from vershwal/observatory 
Added preset for man_made=observatory.
 2018-03-15 14:42:44 -04:00
Bryan Housel
e66218e1ef Merge branch 'tooltip' of https://github.com/vershwal/iD into vershwal-tooltip 2018-03-15 14:30:25 -04:00
vershwal
04bc4b09f0 Added alt text for information icon. 2018-03-15 12:54:42 +05:30
vershwal
9677b3d0aa fixed review comments 2018-03-15 12:25:09 +05:30
Bryan Housel
98869c2722 Merge pull request #4891 from Xavier-J-Ortiz/create_passing_place 
added passing place to presets
 2018-03-15 01:17:25 -04:00