Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution ...

Merge Conflict Resolution

2015-03-05 19:49:15 -05:00

..

intro

Stricter jshint

2013-10-24 16:08:48 -07:00

preset

Fixed address input while nominatim is not available

2014-11-30 22:16:03 +01:00

account.js

design enhancements..

2014-10-31 10:55:00 -04:00

attribution.js

fix whitespace

2013-11-22 00:35:34 +02:00

background.js

Fix help pane button toggling (closes #2471)

2014-12-10 13:30:11 -05:00

cmd.js

Hardcode ctrl-shift-z -> ctrl-y for windows

2013-03-27 12:18:46 -04:00

commit.js

zoom to conflict on active

2015-02-09 17:28:22 -05:00

confirm.js

style cleanup

2015-02-10 13:24:10 -05:00

conflicts.js

refactor Conflicts ui into its own component

2015-03-04 11:46:56 -05:00

contributors.js

Return entities from iD.Connection via callbacks

2015-01-08 14:44:58 -05:00

disclosure.js

Work toward making inspector persistent

2013-05-26 13:36:21 -07:00

entity_editor.js

Make taginfo configurable and default to disabling taginfo related features

2014-10-24 16:26:37 -07:00

feature_info.js

Don't show "0 Hidden Features" warning after editOff

2014-11-18 22:05:20 -05:00

feature_list.js

Return entities from iD.Connection via callbacks

2015-01-08 14:44:58 -05:00

flash.js

…

geolocate.js

Map UI tooltips (#1654)

2013-07-29 13:49:57 -07:00

help.js

Fix help pane button toggling (closes #2471)

2014-12-10 13:30:11 -05:00

inspector.js

Don’t show turn restriction editor for non-highways (fixes #2240)

2014-05-27 14:35:57 -07:00

intro.js

Make the Graph#rebase argument an array

2013-10-31 16:24:31 -07:00

lasso.js

fix lasso

2013-04-02 15:59:09 -04:00

loading.js

Fix Loading

2013-04-16 18:20:23 -07:00

map_data.js

Cleaner code for indeterminate feature checkboxes

2015-02-26 14:33:03 -05:00

modal.js

fix modals

2015-02-09 18:11:38 -05:00

modes.js

Fix tests

2014-11-11 14:32:50 -08:00

notice.js

Configurable minimum editable zoom

2014-11-11 14:37:11 -08:00

preset_icon.js

Fix fill colors

2014-04-15 15:41:57 -07:00

preset_list.js

Make taginfo configurable and default to disabling taginfo related features

2014-10-24 16:26:37 -07:00

preset.js

more straightforward preset form insertion

2014-10-31 17:15:59 -04:00

radial_menu.js

Update GitHub links

2014-01-08 16:14:28 -08:00

raw_member_editor.js

Delete relations that become empty (#2270)

2014-06-26 10:21:03 -07:00

raw_membership_editor.js

Ensure "New Relation..." is always available (fixes #2066)

2014-01-03 13:00:36 -08:00

raw_tag_editor.js

Remove row when clicking trash icon in raw tag editor

2015-01-14 09:57:23 -05:00

restore.js

Clean up

2013-09-29 07:46:45 -07:00

save.js

Capture ⌘-S even in input fields (fixes #2409)

2014-10-20 17:55:12 -07:00

scale.js

case insensitive locale check

2014-07-16 10:27:42 -04:00

selection_list.js

Update save commit dialog to use a feature list

2013-10-18 17:11:52 -04:00

sidebar.js

Hide inspector when dragging (fixes #2229)

2014-05-23 18:03:13 -07:00

source_switch.js

Move flush to context

2013-05-18 09:20:57 -07:00

spinner.js

Add configurable image path

2013-04-16 17:20:21 -07:00

splash.js

Update GitHub links

2014-01-08 16:14:28 -08:00

status.js

Notify users of API status

2013-04-16 12:36:58 -04:00

success.js

jshint fixes

2013-10-24 15:33:52 -07:00

tag_reference.js

Make taginfo configurable and default to disabling taginfo related features

2014-10-24 16:26:37 -07:00

toggle.js

changing animation for map overlays.

2013-03-28 17:43:40 -04:00

undo_redo.js

Clarify undo/redo tooltips (fixes #1670)

2013-08-13 15:23:25 -07:00

view_on_osm.js

Work toward making inspector persistent

2013-05-26 13:36:21 -07:00

zoom.js

Fix build

2014-10-13 16:48:59 -07:00