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

Merge Conflict Resolution

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

..

add_entity.js

…

add_member.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

add_midpoint.js

Avoid consecutive identical nodes when adding a midpoint

2013-09-01 12:57:10 -07:00

change_member.js

Add iD.actions.ChangeMember

2013-05-22 17:41:06 -07:00

change_preset.js

Test / fix ChangePreset action

2013-05-29 08:44:59 -07:00

change_tags.js

…

circularize.js

Add tests for circularizing concave ways, straight line ways, Add isCircular() test..

2014-04-23 16:11:42 -04:00

connect.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

copy_entity.js

Pend some failing tests

2015-03-03 21:06:28 -05:00

delete_member.js

Delete relations that become empty (#2270)

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

delete_multiple.js

Don't allow deleting incomplete relations

2013-05-16 16:43:41 -07:00

delete_node.js

Delete relations that become empty

2013-08-27 12:27:11 -07:00

delete_relation.js

Delete relations that become empty

2013-08-27 12:27:11 -07:00

delete_way.js

Test; simplify

2015-02-12 10:24:40 -08:00

discard_tags.js

Don't upload tags with empty values

2014-01-02 15:03:21 -05:00

disconnect.js

Improve test cases for disconnect action to cover shared area nodes..

2014-04-01 17:26:25 -04:00

join.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

merge_polygon.js

Expand tests

2014-02-09 18:45:47 -08:00

merge_remote_changes.js

fill remoteGraph with loadMultiple, finally do proper undeletion

2015-03-03 23:43:37 -05:00

merge.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

move_node.js

…

move.js

…

noop.js

…

orthogonalize.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

restrict_turn.js

Better inferRestriction for no_u_turn

2014-09-02 16:43:31 -04:00

reverse.js

Reverse cardinal directions for relation member roles

2013-11-21 10:08:16 -08:00

split.js

Moved area-keys to data, and process it during runtime

2014-10-23 15:52:29 -07:00

straighten.js

Remove repetition of entity IDs in tests

2013-10-31 15:57:47 -07:00

unrestrict_turn.js

Implement basic restriction toggling

2014-05-18 16:02:47 -07:00