CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-24 00:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,116 Commits 2 Branches 0 Tags
052d2a39bbd7d980b2a08bb8246c012acb40219e
Commit Graph

8116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Housel bc7b78179b Merge pull request #2681 from frewsxcv/patch-1 
Use HTTPS if location protocol is HTTPS in iD.Connection
 2015-07-17 15:01:26 -04:00
Bryan Housel 5627f14fdb Merge pull request #2729 from rory/irish-postcode 
Add Irish postcode field
 2015-07-17 12:07:07 -04:00
Bryan Housel fa9ffd6684 Merge pull request #2728 from jmespadero/plant-nursery 
Preset for landuse/plant_nursery
 2015-07-17 11:53:20 -04:00
Bryan Housel 4c6b75a868 In mergeChildren(), not a conflict if child versions same 2015-07-17 10:02:21 -04:00
Minh Nguyễn 042bb7fb24 Fixed lint errors 2015-07-15 08:57:45 -07:00
Rory McCann 6888f9a660 Add Irish postcode field 2015-07-13 16:21:58 +02:00
Paul Annekov 8a933a5fa5 Moved the button, updated text 2015-07-11 20:42:46 +03:00
Paul Annekov 1a3c75da2b Added ability to exit from full screen 2015-07-11 20:26:50 +03:00
Paul Annekov 61ac67ac6c Added tooltip, cross browser requestFullScreen call and key binding 2015-07-11 10:21:49 +03:00
Paul Annekov 24802c9399 Added button to switch to full screen mode 2015-07-10 23:44:03 +03:00
jmespadero f422f73141 Added plant_nursery.json preset 2015-07-10 10:33:53 +02:00
jmespadero 8433f17f93 Added landuse=plant_nursery 2015-07-10 09:35:03 +02:00
Bryan Housel ee00564a6c Add preset for area:highway=* (closes #2627) 2015-07-08 21:34:49 -04:00
Bryan Housel d0cb74638f Add presets for Casino and Adult Gaming Center (closes #2684) 2015-07-08 21:18:49 -04:00
Bryan Housel 642ff3afa2 Merge pull request #2721 from 1ec5/1ec5-corridor-terms 
Additional terms for corridor
 2015-07-06 11:07:23 -04:00
Minh Nguyễn 8da0226636 Additional terms for corridor 2015-07-05 10:54:54 -07:00
Bryan Housel 46812abd1b Restore complete list of keys for address preset (closes #2698) 2015-07-01 16:15:07 -04:00
Bryan Housel 845999558f Preset searching should consider tag values (closes #2719) 2015-07-01 13:20:23 -04:00
Bryan Housel 4a480f63bb Attempt to make crossing/crosswalk less confusing 
re: https://lists.openstreetmap.org/pipermail/hot/2015-June/009578.html
 2015-06-30 23:24:04 -04:00
Bryan Housel 58cb66f472 Add highway=corridor and universal level field 
For now, `highway=corridor`:
  * styled like highway=pedestrian
  * and matches 'paths' feature filter.

(closes #2687, closes #2218)
 2015-06-30 22:02:22 -04:00
Bryan Housel 56a563d345 Use space key to toggle radial menu (closes #2706) 2015-06-30 17:44:25 -04:00
Bryan Housel b785b906b4 Put success close click handler on button, not span (closes #2717) 2015-06-30 15:33:27 -04:00
Bryan Housel f2dea4eb3c Translatable options strings and fix recycling icon 2015-06-30 10:55:31 -04:00
Bryan Housel 70ad4e7d52 Merge branch 'recycling_type' of https://github.com/ebrelsford/iD into ebrelsford-recycling_type 2015-06-30 10:45:11 -04:00
Bryan Housel 720b26142f Presets (volcano, saddle, adit, tree_row) 
Squashed commit of the following:

commit a100cc377da4d0790582fb2bd69e691d99084f0c
Author: Bryan Housel <bryan@7thposition.com>
Date:   Tue Jun 30 10:26:12 2015 -0400

    run make

commit cedd5d1c3dd43576ee42a6ab211d2f26eaaa732c
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 18:53:36 2015 +0200

    Update volcano.json

commit 38c4a782f6941064f3c8132bce61896ea14e70e9
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:28:28 2015 +0200

    Solver problem in man_made/adit/depth

commit 5e6d35dc3ed822ff1716cf0c80e6606545e337bd
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:12:13 2015 +0200

    Solver problem in man_made/adit/resource

commit bb582143ce90ec00b5d2a7b1efd8fb2415cca16d
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:54:29 2015 +0200

    Revert changes to ES locale

commit 8537162ad1bc6f6377c90f41cd6f24c103561ca5
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:50:49 2015 +0200

    Some natural and man_made presets

commit 4c41d88f63950787ca5372414ebcda4609458d26
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Fri Jun 26 15:57:38 2015 +0200

    Some natural/* and man_made/* translations
 2015-06-30 10:27:24 -04:00
Corey Farwell 56708858fb Use HTTPS if location protocol is HTTPS in iD.Connection 
Relevant to https://github.com/strava/iD/issues/5#issuecomment-109800372
 2015-06-27 14:06:58 -07:00
Bryan Housel 728036be51 Don't write unsavable changes to localStorage (closes #2705) 2015-06-20 12:21:29 -04:00
Bryan Housel 60fdb60a8a Refactor validations 2015-06-19 14:58:09 -04:00
Bryan Housel ca47d2662d Let conflict resolution restore deleted childnodes if force_local 2015-06-18 11:48:49 -04:00
Bryan Housel ee6479ff48 During localstorage restore, fetch older version of childnode if needed 
This together with 8398fd7 closes #2142
 2015-06-18 11:47:14 -04:00
Bryan Housel f4d93c442e Add connection#loadEntityVersion to fetch specific version 2015-06-18 11:46:43 -04:00
Bryan Housel 8398fd7cf1 Fetch missing childnodes when restoring from localstorage 
(see #2142)
TODO: fetch older version if the node has been deleted.
 2015-06-18 09:56:11 -04:00
Eric Brelsford 7fa70da140 Include recycling_type field 2015-06-17 16:02:15 -04:00
Eric Brelsford dbaf8a1465 Add recycling_type preset field 
Fixes #2689
 2015-06-17 14:18:30 -04:00
Bryan Housel 4c3ebbec2b Merge branch 'rhokbrisbane-keyboard_shortcuts' 2015-06-17 00:55:32 -04:00
Bryan Housel d1253c6ef1 use iD.ui.cmd for fast pan and zoom shortcuts 2015-06-17 00:41:35 -04:00
Bryan Housel a04abacf1e Merge pull request #2694 from 1ec5/1ec5-wikipedia-url 
Tighten up Wikipedia URL handling
 2015-06-17 00:31:47 -04:00
Minh Nguyễn 4b656286ac Added Wikipedias gom:, lrc: 
osmlab/wmf-sitematrix@b0fbe92a8f
 2015-06-16 11:39:08 -07:00
Bryan Housel cc9612f3ea jshint 2015-06-15 22:51:15 -04:00
Bryan Housel 6aa4b3a873 Merge branch 'keyboard_shortcuts' of https://github.com/rhokbrisbane/iD into rhokbrisbane-keyboard_shortcuts 2015-06-15 22:32:20 -04:00
Bryan Housel b77f2e3ee0 Merge branch 'rhokbrisbane-add-task-outline-to-minimap' 2015-06-15 22:29:22 -04:00
Bryan Housel 641cf98e70 Add tooltip to minimap toggle control 2015-06-15 22:28:40 -04:00
Bryan Housel 26ca610d0d Merge branch 'add-task-outline-to-minimap' of https://github.com/rhokbrisbane/iD into rhokbrisbane-add-task-outline-to-minimap 2015-06-15 22:02:42 -04:00
Bryan Housel fda8146972 Merge pull request #2686 from ebrelsford/cycleway-preset 
Add cycleway preset field for highways with bike lanes
 2015-06-15 21:35:03 -04:00
Eric Brelsford 95b1eb6cce Use the cycleway's strings.options property to get options 2015-06-15 16:37:42 -04:00
Eric Brelsford ca9dde8c33 Decide when to use cycleway itself or cycleway:* 2015-06-15 16:32:34 -04:00
Eric Brelsford 1814133371 Remove dropdown to change cycleway on both sides 2015-06-15 13:23:16 -04:00
Eric Brelsford e098c3a372 Remove cycleway field where it is less relevant 
Removed from highway=path and highway=track
 2015-06-15 13:11:31 -04:00
Rowan Hogan 336f7420e5 Merge branch master into add-task-outline-to-minimap 2015-06-15 10:14:07 +10:00
Rowan Hogan 42c99a4400 Merge branch 'master' into keyboard_shortcuts 2015-06-15 10:12:31 +10:00