CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-07 18:56:45 +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
Tom MacWright d3348a8729 Remove no longer used globals 2016-07-05 19:13:25 -04:00
Tom MacWright 1ef83b925c Make JXON pass style check 2016-07-05 19:12:33 -04:00
Tom MacWright b15338b964 Use local jxon 2016-07-05 19:00:12 -04:00
Tom MacWright 63b1c14f56 Merge pull request #3225 from openstreetmap/dep-osm-auth 
Use osm-auth, togeojson and marked as packages
 2016-07-05 18:43:55 -04:00
Tom MacWright f9a6378701 Obey the browser field 2016-07-05 18:38:41 -04:00
Tom MacWright 712d471a6b Use togeojson package 2016-07-05 18:29:15 -04:00
Tom MacWright 869725551f Use marked as a dependency 2016-07-05 18:22:43 -04:00
Tom MacWright 8f68221b9b Use osm-auth as a package. 2016-07-05 18:14:36 -04:00
Tom MacWright f7e49e79f8 Merge pull request #3222 from openstreetmap/ui-2 
Continuation of work from #3194
 2016-07-05 18:08:14 -04:00
Tom MacWright a8295e9706 Merge master 2016-07-05 18:03:54 -04:00
Tom MacWright e30d5f3299 Fix references to iD 2016-07-05 17:58:34 -04:00
Bryan Housel e4ccf116f5 Merge pull request #3224 from openstreetmap/greenkeeper-eslint-3.0.1 
Update eslint to version 3.0.1 🚀
 2016-07-05 16:29:57 -04:00
Bryan Housel 7b7e9c6e99 Merge pull request #3223 from openstreetmap/greenkeeper-xml2js-0.4.17 
Update xml2js to version 0.4.17 🚀
 2016-07-05 16:29:45 -04:00
Bryan Housel 42dcb384da Prefer Node 4.x or newer 
`README` and `.travis.yml` already have it this way
 2016-07-05 16:27:01 -04:00
Kushan Joshi 477d446772 final touch up 2016-07-06 01:05:21 +05:30
Kushan Joshi 780960c711 interim 2016-07-06 00:34:35 +05:30
greenkeeperio-bot 0a94ac6b6f chore(package): update eslint to version 3.0.1 
https://greenkeeper.io/
 2016-07-05 14:30:00 -04:00
Bryan Housel ab6719a6ec Rebundle js/lib/id/index.js if anything under modules changes 2016-07-05 14:17:08 -04:00
Bryan Housel 1723dd357e Remove old generated bundles 2016-07-05 14:14:42 -04:00
greenkeeperio-bot 9e11a704c3 chore(package): update xml2js to version 0.4.17 
https://greenkeeper.io/
 2016-07-05 12:48:38 -04:00
Bryan Housel e87bcdfd75 Merge pull request #3220 from openstreetmap/greenkeeper-eslint-plugin-import-1.10.2 
Update eslint-plugin-import to version 1.10.2 🚀
 2016-07-05 11:11:34 -04:00
Bryan Housel 759413fe40 Merge pull request #3221 from ramyaragupathy/master 
Adding emergency =defibrillator preset (fixes #3202)
 2016-07-05 11:10:20 -04:00
Ramya aa135d921f fixing #3202 2016-07-05 15:49:05 +05:30
greenkeeperio-bot 843c39439f chore(package): update eslint-plugin-import to version 1.10.2 
https://greenkeeper.io/
 2016-07-04 21:09:50 -04:00
Bryan Housel 87ef436220 Merge pull request #3217 from openstreetmap/greenkeeper-uglify-js-2.7.0 
Update uglify-js to version 2.7.0 🚀
 2016-07-04 00:05:56 -04:00
greenkeeperio-bot e586a90813 chore(package): update uglify-js to version 2.7.0 
https://greenkeeper.io/
 2016-07-03 15:54:10 -04:00
Bryan Housel 2c3162c9ad Remove unused language json files (fil and ko-KR) 
(closes #3214)
 2016-07-03 13:18:53 -04:00
Bryan Housel 1b0a0be303 Merge pull request #3215 from SatyaSudheer/master 
Adding man_made=bridge preset issue# 3183
 2016-07-03 11:27:22 -04:00
Bryan Housel 6c53bde330 Merge pull request #3216 from openstreetmap/greenkeeper-eslint-plugin-import-1.10.1 
Update eslint-plugin-import to version 1.10.1 🚀
 2016-07-03 09:08:45 -04:00
greenkeeperio-bot 0074a72cd5 chore(package): update eslint-plugin-import to version 1.10.1 
https://greenkeeper.io/
 2016-07-03 09:08:40 -04:00
Bryan Housel c2f7a62a64 Merge pull request #3212 from openstreetmap/greenkeeper-eslint-3.0.0 
Update eslint to version 3.0.0 🚀
 2016-07-03 09:08:26 -04:00
Satya Sudheer e009163871 update man_made=bridge geometry = area 2016-07-03 11:41:59 +05:30
greenkeeperio-bot 1913c298a9 chore(package): update eslint to version 3.0.0 
https://greenkeeper.io/
 2016-07-02 22:01:02 -04:00
Bryan Housel 5e6a1bdee5 Fix rbush tests.. Disable tests that fail because of sinon.spy issue 2016-07-02 21:59:36 -04:00
Kushan Joshi 7188065a6c disband ui/core 2016-07-02 19:04:51 +05:30
Satya Sudheer 63363a8d67 Adding man_made=bridge preset issue# 3183 2016-07-02 16:47:58 +05:30
Kushan Joshi 9f2a251d31 Fixing Interdependecy between ui.preset and ui.core 2016-07-02 16:00:52 +05:30
Kushan Joshi 94c5f43293 core ui 2016-07-02 15:58:44 +05:30
Bryan Housel 197b936d50 Upgrade rbush to 2.x 2016-07-01 23:12:51 -04:00
Bryan Housel 4b5389c310 Merge branch 'master' into greenkeeper-rbush-2.0.1 2016-07-01 22:39:42 -04:00
Bryan Housel 8bf9c260a7 Switch from sloped_curb=* to kerb=* 
(closes #3210)
 2016-06-30 21:45:18 -04:00
Bryan Housel e664c35e72 Rename "Chemist" preset label to "Drugstore" for en_US 
(closes #3201)

Don't worry - we will leave it as "Chemist" in the en_GB translation.
 2016-06-30 21:29:16 -04:00
Bryan Housel 7d37f1d38a Merge pull request #3207 from waldyrious/patch-1 
Add license title
 2016-06-29 19:19:50 -04:00
Waldir Pimenta b8869761d2 Add license title 
It's not strictly required, but it's useful metadata, and part of the recommended license template text (see http://choosealicense.com/licenses/isc/ and https://opensource.org/licenses/isc-license)
 2016-06-30 00:05:00 +01:00
greenkeeperio-bot c182c1462f chore(package): update rbush to version 2.0.1 
https://greenkeeper.io/
 2016-06-29 12:30:24 -04:00
Bryan Housel acd5c58010 Merge pull request #3200 from openstreetmap/greenkeeper-svg-sprite-1.3.3 
Update svg-sprite to version 1.3.3 🚀
 2016-06-28 20:58:04 -04:00
greenkeeperio-bot 53b3f6944c chore(package): update svg-sprite to version 1.3.3 
https://greenkeeper.io/
 2016-06-28 03:34:32 -04:00
Bryan Housel 6fdb86be04 Don't use multiline yaml, which breaks up comment lines 
(closes #3198)
 2016-06-27 11:40:37 -04:00
Bryan Housel cddc83af02 Merge pull request #3196 from openstreetmap/unvendor_rbush 
Eliminate vendored rbush library
 2016-06-26 21:43:05 -04:00
Bryan Housel 2e10c9e21e Eliminate vendored rbush library 
(re: #3180)
 2016-06-26 21:34:10 -04:00