Commit Graph

5799 Commits

Author SHA1 Message Date
Bryan Housel 528cb5fae0 Fix conflicts, reference js/lib/id for built modules 2016-06-15 11:01:46 -04:00
Bryan Housel 26c9649039 Merge branch '3118-modes' of https://github.com/davidchouse/iD into davidchouse-3118-modes 2016-06-15 10:47:40 -04:00
Bryan Housel 4fd6b94973 Consistent single quotes in .html 2016-06-15 10:43:48 -04:00
Bryan Housel 9f1fff0828 Eliminate unused var lint warnings from tests 2016-06-15 10:30:06 -04:00
Kushan Joshi ea6c7f2f19 Merge pull request #3170 from openstreetmap/fix-spec-lint
Fix spec lint
2016-06-15 19:42:20 +05:30
Martin Raifer 02e9f1f55a export "getPrototypeOf" as var instead of const
to make it run in phantomjs (for tests) and browsers that don't support ES6's const yet.
2016-06-15 09:26:52 -04:00
Martin Raifer 2b488b5567 refactor "util" into ES6 modules for #3118 2016-06-15 09:26:52 -04:00
Kushan Joshi 6d580f66c2 Remaining files and add eslint test/spec to package.json 2016-06-15 18:36:48 +05:30
Kushan Joshi 3f3b287d62 Remove linting errors spec/services 2016-06-15 18:26:11 +05:30
Kushan Joshi 5a87558f97 Remove linting errors from spec/util 2016-06-15 18:26:11 +05:30
Kushan Joshi 4b2431a4e3 Remove linting error spec/ui 2016-06-15 18:26:11 +05:30
Kushan Joshi 1db442b9e8 Remove linting errors fromspec/svg 2016-06-15 18:26:11 +05:30
Kushan Joshi 9dcb6856ab Remove linting errors from spec/renderer 2016-06-15 18:26:11 +05:30
Kushan Joshi 295b8544eb Remove linting errors from spec/modes & spec/presets 2016-06-15 18:26:11 +05:30
Kushan Joshi fe92a53e31 Add linting to spec/lib 2016-06-15 18:26:11 +05:30
Kushan Joshi 6c542505a4 Add linting to spec/core 2016-06-15 18:26:11 +05:30
Kushan Joshi 084ede853f Add linting to spec/geo 2016-06-15 18:26:11 +05:30
Kushan Joshi 0e4b1c9d04 Add linting to spec/behavior 2016-06-15 18:26:11 +05:30
David Culverhouse 4dd09b07ca Merging Makefile 2016-06-15 00:38:04 -04:00
David Culverhouse 8313ce284d Merge remote-tracking branch 'openstreetmap/master' 2016-06-15 00:22:31 -04:00
David Culverhouse 34904f0525 Migrate "modes" into ES6 modules for #3118 2016-06-15 00:11:32 -04:00
Tom MacWright 6c7786ab27 Merge pull request #3168 from beaugunderson/3118-presets
migrate presets to ES6 modules for #3118
2016-06-14 23:59:30 -04:00
Beau Gunderson 4dbce64b7d migrate presets to ES6 modules for #3118 2016-06-14 20:44:05 -07:00
Tom MacWright f36812d8a4 Merge pull request #3165 from openstreetmap/3118-validations
refactor validations into ES6 modules for #3118
2016-06-14 19:33:46 -04:00
Martin Raifer 25e5c9256d delete now unneeded file 2016-06-14 22:05:22 +02:00
Martin Raifer 6f1744700a refactor validations into ES6 modules #3118 2016-06-14 21:55:11 +02:00
Bryan Housel dbecdcf9a8 OS X -> macOS 2016-06-14 13:57:35 -04:00
Tom MacWright dd3c73f144 Merge pull request #3161 from openstreetmap/inter-require
Start inter-requiring actions
2016-06-14 12:05:49 -04:00
Tom MacWright 1186931711 Update readme 2016-06-14 11:28:16 -04:00
Tom MacWright 91cb904a1b Remove postinstall again 2016-06-14 11:21:38 -04:00
Tom MacWright 2a50ec58a2 Merge branch 'inter-require' of github.com:openstreetmap/iD into inter-require 2016-06-14 11:12:25 -04:00
Tom MacWright fea45e2062 Remove phantomjs travis build pattern 2016-06-14 11:12:16 -04:00
Bryan Housel e8e1d758b6 Remove mapillary-js source map 2016-06-14 10:28:15 -04:00
Tom MacWright a2ea0f81ed Merge pull request #3164 from kepta/inter-require
Adding linting support to modules/actions
2016-06-14 09:59:33 -04:00
Kushan Joshi ff1ee79f6e Fix minor linting errors in modules/actions 2016-06-14 18:52:48 +05:30
Kushan Joshi 092e7be197 Lint modules directory 2016-06-14 18:50:56 +05:30
Tom MacWright 9e03edc493 Start inter-requiring actions 2016-06-14 09:09:44 -04:00
Kushan Joshi f4f29efe74 Merge pull request #3163 from kepta/lint-spec-actions
Making spec/actions lint free
2016-06-14 18:36:34 +05:30
Kushan Joshi 4609282e04 Making spec/actions lint free 2016-06-14 16:34:52 +05:30
Bryan Housel e98db81a27 Switch dist/modules/actions.js -> js/lib/id/actions.js 2016-06-13 14:04:44 -04:00
Bryan Housel 2ef7fdead5 Merge branch 'master' into baby-steps 2016-06-13 12:31:09 -04:00
Bryan Housel 9c1e9c9b11 Explicitly test all the highway types for onewayness 2016-06-13 10:56:52 -04:00
Bryan Housel 8d6c31deca Add a few points around Macau, Hong Kong, drop precision where not needed 2016-06-12 22:44:21 -04:00
Kushan Joshi 87c321b2fa Add Macau and Hong Kong to drive-left data 2016-06-11 17:55:34 +05:30
Bryan Housel 63fc7c4770 Fix imperial units test in maxspeed
(closes #3156)
2016-06-11 01:40:20 -04:00
Bryan Housel c08774c2da Put tile and collision on the debug legend too 2016-06-11 01:20:53 -04:00
Bryan Housel 452df4068e Add background imagery debug and debug legend 2016-06-11 01:07:26 -04:00
Bryan Housel eb19b17fd7 Add dataset debugging
(re: #3158)
2016-06-10 13:40:52 -04:00
Bryan Housel e22bd1eceb Pass projection to iD.svg.Layers in tests 2016-06-10 13:06:28 -04:00
Bryan Housel 6314c276e8 More debug versatility 2016-06-10 10:36:28 -04:00