CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-26 07:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,583 Commits 2 Branches 0 Tags
4971a204094de667a88d2fa8eaa8fbb99eb184f3
Commit Graph

357 Commits

Author SHA1 Message Date
Bryan Housel
cdbca258af Cleanup scripts in index.html 2016-06-16 11:55:00 -04:00
Bryan Housel
7cad599052 Merge branch 'modules-core' of https://github.com/kepta/iD into kepta-modules-core 2016-06-16 11:47:25 -04:00
Bryan Housel
0c0642e321 Attempt to put services into module 2016-06-16 11:11:00 -04:00
Kushan Joshi
59e6581aa5 Modularize iD.core 2016-06-16 18:41:37 +05:30
Kushan Joshi
2db0f636b1 modularize iD.operations 2016-06-16 00:42:43 +05:30
Kushan Joshi
b2095a502a convert iD.geo to geo modules 2016-06-15 21:11:10 +05:30
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
Martin Raifer
2b488b5567 refactor "util" into ES6 modules for #3118 2016-06-15 09:26:52 -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
Beau Gunderson
4dbce64b7d migrate presets to ES6 modules for #3118 2016-06-14 20:44:05 -07:00
Martin Raifer
6f1744700a refactor validations into ES6 modules #3118 2016-06-14 21:55:11 +02:00
Tom MacWright
9e03edc493 Start inter-requiring actions 2016-06-14 09:09:44 -04:00
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
eb19b17fd7 Add dataset debugging 
(re: #3158)
 2016-06-10 13:40:52 -04:00
Tom MacWright
266504d4e2 Baby steps mode 2016-06-06 16:54:24 -04:00
Minh Nguyễn
669cad74f6 Add wikidata asynchronously based on wikipedia 
ref #2680
 2016-05-23 19:16:02 -04:00
John Firebaugh
a85361545d Preserve connectivity when pasting 
Fixes #2584
 2016-02-29 12:09:14 -05:00
Bryan Housel
45e4e730a8 iD.svg.Surface -> iD.svg.Layers 2016-02-24 15:41:22 -05:00
Bryan Housel
1f337aa960 Move more data layers from Background into Surface 2016-02-23 16:15:26 -05:00
Bryan Housel
6c1df37298 Move GPX, Mapillary Images, Mapillary Signs into svg namespace 2016-02-18 17:11:57 -05:00
Bryan Housel
dd9e399971 Merge pull request #2984 from openstreetmap/phantomjs-2 
Test with phantomjs 2.1 and mocha-phantomjs-core
 2016-02-16 22:35:22 -05:00
John Firebaugh
79df184052 Test with phantomjs 2.1 and mocha-phantomjs-core 2016-02-08 19:02:37 -08:00
Bryan Housel
f173441fe3 WIP: Mapillary service 2016-02-08 15:46:37 -05:00
Bryan Housel
a083ae3001 Call service reset functions from iD.flush() 
Also fix misspelling nominatum -> nominatim
 2016-02-08 12:02:57 -05:00
Bryan Housel
3e65156754 Refactor services 2016-02-08 10:31:34 -05:00
Bryan Housel
4ffabf8933 Mapillary code cleanup 2016-02-07 01:05:20 -05:00
Bryan Housel
d22a3ea2d0 jshint, style, fix test harness 2016-02-07 01:02:23 -05:00
John Firebaugh
82d1a92b23 Remove unused d3.typeahead module 
All use has been replaced with d3.combobox.
 2016-01-24 12:45:55 -08:00
Bryan Housel
882457a351 Add Breathe behavior for interpolated select halos (closes #1814) 2015-12-17 22:25:46 -05:00
Bryan Housel
3af17cb011 Add iD.svg.Icon svg icon builder 2015-10-30 14:00:36 -04:00
John Firebaugh
ecb9398d5c Disable joining ways with conflicting tags 2015-10-18 13:42:14 -07:00
Bryan Housel
60fdb60a8a Refactor validations 2015-06-19 14:58:09 -04:00
Bryan Housel
c10b83f28f iD.actions.Revert (see #537) 2015-04-26 01:08:31 -04:00
Bryan Housel
d216afd59f Map-in-Map overview 
* press 'M' to toggle
* shows current zoom-6
* with locator overlay and bounding box
 2015-03-16 00:23:22 -04:00
Bryan Housel
a7e67ccfd9 refactor Conflicts ui into its own component 2015-03-04 11:46:56 -05:00
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
Bryan Housel
1603b638f6 Add Copy/Paste behaviors, context copybuffer 2015-01-07 10:41:05 -05:00
Bryan Housel
4b6abf7a42 Added iD.actions.CopyEntity 2014-12-28 22:01:10 -05:00
Bryan Housel
381142356b add Diff3 library 2014-12-13 22:49:44 -05:00
Bryan Housel
eff18cb257 add tests for iD.actions.MergeRemoteChanges 2014-12-09 00:59:25 -05:00
Bryan Housel
3e97bd7d89 stub out iD.actions.MergeRemoteChanges 2014-12-06 22:11:54 -05:00
Bryan Housel
6b6ca8d523 initial checkin of features unit tests 2014-10-28 21:37:04 -04:00
Bryan Housel
35e7474829 Rename Features to Map Data.. 
* move GPX and Mapillary layers to Map Data
* put feature filters and layer data into show/hide containers
* cleanup css
 2014-10-28 21:37:01 -04:00
Bryan Housel
8fd177935d Feature filtering (in progress) 
(rebased to master post-Mapillary merge)
 2014-10-28 21:37:00 -04:00
Sajjad Anwar
c8d4b73b15 Add tests and documentation for custom presets 2014-10-23 15:52:29 -07:00
Sajjad Anwar
dffeedffc9 Moved area-keys to data, and process it during runtime 2014-10-23 15:52:29 -07:00
John Firebaugh
0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00