Commit Graph

176 Commits

Author SHA1 Message Date
Bryan Housel
a908c6722b Merge pull request #2720 from openstreetmap/mapillary-streetsigns2
Mapillary street signs
2016-02-16 16:52:30 -05:00
Bryan Housel
a62f41b611 Cleanup MapillaryImageryLayer, Mapillary service 2016-02-08 23:46:26 -05:00
John Firebaugh
8a3314e5d3 Disallow disconnecting that would damage relations
Fixes #1714
2016-02-07 20:27:39 -08:00
Bryan Housel
4ffabf8933 Mapillary code cleanup 2016-02-07 01:05:20 -05:00
peterneubauer
ea819c0d09 adding a first traffic sign layer, rendering not working properly yet. 2016-02-07 01:02:22 -05:00
Bryan Housel
83b0a8ca68 No need to make FAQ link translatable
(closes #2973)
2016-02-06 14:05:10 -05:00
Kushan Joshi
bf334ed8a3 for "best" imagery
(closes #2902)
2016-02-05 00:59:41 +05:30
Bryan Housel
aa5c2ac3e8 Quote string with # 2016-01-29 21:01:11 -05:00
Kushan Joshi
427d08a7b8 Splitting success.help_html
In ref issue: https://github.com/openstreetmap/iD/issues/2940
2016-01-29 20:32:04 -05:00
Kushan Joshi
459f2929ce Link to wiki for changeset comments
Added the link:http://wiki.openstreetmap.org/wiki/Good_changeset_comments
below the comment box

Issue: https://github.com/openstreetmap/iD/issues/2923
2016-01-29 20:31:19 -05:00
Bryan Housel
7afa0e4ad2 Option to collapse preset fields section
(closes #2894)
2016-01-29 00:40:37 -05:00
Bryan Housel
ee66674c64 Localize some of the features in the walkthrough (closes #2881) 2015-12-21 15:12:04 -05:00
Bryan Housel
f4c9f7487a Add search to walkthrough (closes #2363) 2015-12-19 23:21:14 -05:00
Bryan Housel
edd19cbd0a Display Help button in walkthrough, stay on it longer (closes #2364) 2015-12-17 15:15:26 -05:00
Bryan Housel
07fae18da0 Add button images to walkthrough text (closes #2404) 2015-12-15 15:02:19 -05:00
Bryan Housel
de2e716d44 Reword "merge lines" to "merge features" (closes #2861) 2015-12-07 23:43:35 -08:00
Bryan Housel
165aae86d4 Change "IE9 and above" to "IE11 and above" 2015-12-02 16:20:13 -05:00
Bryan Housel
aa91ff49f8 Icons for operations, turn restrictions, bug/translate (closes #2766) 2015-10-30 14:06:29 -04:00
John Firebaugh
ecb9398d5c Disable joining ways with conflicting tags 2015-10-18 13:42:14 -07:00
Bryan Housel
594b4c19cf Disable fullscreen button, add keyboard shortcuts 2015-09-05 23:11:11 -04:00
Bryan Housel
a478fcd918 Fix broken link and other help improvements (closes #2760) 2015-09-01 13:15:53 -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
641cf98e70 Add tooltip to minimap toggle control 2015-06-15 22:28:40 -04:00
Rowan Hogan
bd5eb5e972 Adds minimap toggle to background menu. Also resolves CSS issue with GPX layer in minimap. 2015-06-14 11:11:56 +10:00
Rowan Hogan
29d4944970 Adds link to keyboard shortcuts reference in help. 2015-06-13 14:32:30 +10:00
tristen
6316e52b55 Merge pull request #2573 from openstreetmap/distance-measurement
Infobox / distance measurement
2015-05-27 11:11:03 -04:00
tristen
249125ce16 Tweaks to the infobox interface
- Variable height depending on the context list
- Added width that alligns with the grid
- Re-use classnames shared by the interface
- Changes to the unit toggle
  -- Shortened name to current unit of measurement (Accounted for this change in i8n)
  -- Display as a button to match other toggle/button like elements in the interface
2015-05-27 10:17:17 -04:00
Bryan Housel
1287e4cad9 Change distance-measurement hotkey to cmd-I 2015-05-26 12:27:50 -04:00
Bryan Housel
995a9f4d50 Label commit message as "Changeset comment" (closes #2600) 2015-04-22 12:07:11 -04:00
Bryan Housel
982276261e i18n for distance measurement widget 2015-04-01 21:00:37 -04:00
John Firebaugh
b6a3e8a58c login ⇢ log in 2015-03-24 12:44:45 -07:00
Harkirat Singh
643370de34 fixes issue #2504 2015-03-25 00:27:48 +05:30
Bryan Housel
1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
Bryan Housel
d4643b1b89 Change link text: "Or download your changes" 2015-03-05 19:47:48 -05:00
Bryan Housel
c503b9f96c fill remoteGraph with loadMultiple, finally do proper undeletion 2015-03-03 23:43:37 -05:00
Bryan Housel
e3139e250e improvements to iD.actions.MergeRemoteChanges
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
2015-03-02 13:07:24 -05:00
Bryan Housel
80f5f65f63 More bugfixes and style updates:
* working Previous/Next buttons
* remove behaviors from save mode
  (users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
  instead of context.graph() (which may not)
2015-02-27 15:45:43 -05:00
Bryan Housel
0ed12da6fa WIP: style, replace expand/contract list with prev/next buttons 2015-02-26 22:39:22 -05:00
Bryan Housel
cdd0ca1acf WIP: Use history.perform/replace/pop instead of context.perform
This means
* no more weird saves to localStoage of partially merged graphs
* pop cleanly cancels back to history state before merges happen
  (removed the annotated undo states)
2015-02-17 00:47:12 -05:00
Bryan Housel
d755145ae6 WIP: usernames in messages, show # of total 2015-02-14 11:20:19 -05:00
Richard Fairhurst
0953475f04 Don't delete ways from route/boundary relations 2015-02-12 10:21:23 -08:00
samanpwbb
cef46853ea rework list interactions 2015-02-09 15:20:29 -05:00
samanpwbb
e49ebe2784 rework save UI 2015-02-09 14:28:55 -05:00
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
samanpwbb
78e4271071 finish basic layout/style pass 2015-02-06 19:07:57 -05:00
Bryan Housel
1200919fb3 quote "yes" and "no" in YAML
(re: #2286)
2015-01-24 22:38:37 -05:00
Bryan Housel
3fc99e1df5 Allow undeletions 2015-01-13 16:28:06 -05:00
Bryan Housel
fb0d17e713 WIP: Add choices ui for resolving conflicts 2015-01-11 23:13:31 -05:00
Bryan Housel
95c92e9a59 WIP: conflict save dialog
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel
3bbf31902a Add accessor to get conflict details from iD.actions.MergeRemoteChanges 2014-12-29 22:47:44 -05:00