Commit Graph

1995 Commits

Author SHA1 Message Date
Ansis Brammanis
87ef7ecf91 Make use of message area 2013-02-15 16:18:54 -05:00
Ansis Brammanis
bf3a635da5 Extract tag editor ui 2013-02-15 15:58:05 -05:00
Ansis Brammanis
6a1ef84546 Usecapture when blocking click 2013-02-15 15:45:24 -05:00
Ansis Brammanis
147fce1f49 Merge branch 'tree-intersects'
Conflicts:
	js/id/behavior/lasso.js
2013-02-15 13:40:01 -05:00
Ansis Brammanis
56ed48f0a3 Fix switch to tag view 2013-02-15 13:22:48 -05:00
Ansis Brammanis
af6377dc32 Merge branch 'presets' 2013-02-15 13:16:37 -05:00
Ansis Brammanis
51976ff0a1 Very rough preset selection grid 2013-02-15 13:15:03 -05:00
Ansis Brammanis
a3f895dd72 Switching between preset and tag view 2013-02-15 11:42:12 -05:00
Ansis Brammanis
9547fdd510 reorganize inspector 2013-02-15 10:53:35 -05:00
Ansis Brammanis
f6a37fb532 Merge pull request #775 from arno974/patch-4
Update locale/fr.js
2013-02-15 07:45:50 -08:00
Van De Casteele
4506248c8b Update locale/fr.js
Minor corrections. Just changed the sense of a sentence about users' contributions
2013-02-15 11:08:42 -04:30
Ansis Brammanis
d08decf868 Add vi and nl translations 2013-02-15 10:30:57 -05:00
Ansis Brammanis
e729ec9ade Merge pull request #771 from webmapper/master
Translations for the Dutch locale added
2013-02-15 07:25:17 -08:00
Ansis Brammanis
7ac8bc58fb Merge pull request #770 from alperdincer/patch-4
New fields are translated and some fixes
2013-02-15 07:24:38 -08:00
Ansis Brammanis
b5feab6c2c Merge pull request #773 from arno974/patch-3
Update locale/fr.js
2013-02-15 07:23:40 -08:00
Ansis Brammanis
957632f07f Merge pull request #774 from 1ec5/master
Vietnamese translation
2013-02-15 07:22:52 -08:00
Minh Nguyễn
11e97a4381 Fixed a number of typos. 2013-02-15 06:40:09 -08:00
Minh Nguyễn
51a341298e Vietnamese translation 2013-02-15 06:16:33 -08:00
Van De Casteele
76922ea59f Update locale/fr.js
Translation of the updates
2013-02-15 08:57:04 -04:30
Edward Mac Gillavry
21b23ea7f4 Finished translating all strings to Dutch 2013-02-15 12:43:51 +01:00
edward
157d4a154d Nieuwe NL vertaling 2013-02-15 10:38:59 +01:00
Alper Dincer
988867902c New fields are translated and some fixes 2013-02-15 09:51:06 +02:00
John Firebaugh
5b9c6e2531 Update discarded tags to match P2 2013-02-14 16:24:38 -08:00
John Firebaugh
c663ed243e Merge pull request #764 from saleiva/master
Some changes to the spanish translation
2013-02-14 15:59:52 -08:00
John Firebaugh
6e7ac40e6a Merge pull request #767 from Neogeografen/patch-3
Update locale/da.js
2013-02-14 15:59:20 -08:00
Ansis Brammanis
97679c7679 taglist and presetui coexist 2013-02-14 18:13:28 -05:00
Neogeografen
01700bf32e Update locale/da.js
Finish Danish translation.
2013-02-14 23:34:22 +01:00
Ansis Brammanis
8c89efe563 Extract ui.Taglist 2013-02-14 16:59:07 -05:00
Ansis Brammanis
b7d398ab81 add it translation 2013-02-14 16:08:16 -05:00
Ansis Brammanis
19dd354a8b Merge pull request #765 from sabas/master
Italian translation
2013-02-14 13:04:47 -08:00
sabas
9f861b7458 Italian translation 2013-02-14 21:54:59 +01:00
saleiva
0d2b37315f Update locale/es.js
Unifying zona and área - línea and ruta. 
Removing unnecessary articles.
Making some texts shorter.
2013-02-14 21:48:55 +01:00
Ansis Brammanis
c103c79c29 Merge branch 'master' into release 2013-02-14 14:22:25 -05:00
Ansis Brammanis
342e0071d8 Update version 2013-02-14 14:20:53 -05:00
Ansis Brammanis
a3d5b4b83e Merge branch 'master' into release
Conflicts:
	index.html
2013-02-14 14:07:01 -05:00
Ansis Brammanis
0bb805f557 Merge remote-tracking branch 'systemed/master' into presets
Conflicts:
	css/app.css
	index.html
	js/id/connection.js
	js/id/modes/select.js
	js/id/ui/inspector.js
	js/id/util.js
	test/spec/modes/add_point.js
2013-02-14 11:38:18 -05:00
Tom MacWright
2ebc938127 Merge pull request #762 from papuass/lv-locale
Updated lv locale
2013-02-14 05:20:56 -08:00
Martins Brunenieks
4a761cbb8c Updated lv locale
Translations and spelling fixes
2013-02-14 11:35:39 +02:00
John Firebaugh
d7d3f174ae Lasso only nodes for now (fixes #734)
Given the (lack of) operations available on mixed node/way
selections, this seems just as good as selecting contained
ways as well.
2013-02-13 16:53:40 -08:00
John Firebaugh
e3d9d3a4c4 Refine Way#isArea
Closed ways that are multipolygon inners shouldn't be
rendered as areas just because they have a source=* tag,
for example.
2013-02-13 16:44:36 -08:00
John Firebaugh
c0b8cd74de Reopen radial menu when clicking on selected entity (fixes #758) 2013-02-13 16:23:58 -08:00
John Firebaugh
372e009888 Assign id at top level
So you can do id.graph(), etc. in the console for debugging.
2013-02-13 16:15:49 -08:00
John Firebaugh
5e66307500 Fix incorrect parentWays after reloading a split way
When recalculating parent ways/relations during rebase, a
graph should not add modified or deleted entities as parents.
Such entities will already be correctly marked as parents or
not.

Graph had the correct behavior for deleted entities, but not for
modified entities. This had the effect that if you split a way
that was partially off screen, and then panned so that the way was
re-retrieved, Graph#rebase would mistakenly add back the original
way as a parent of all the nodes that were split into the new
section, making them appear as shared.

Fixes #751.
2013-02-13 16:03:23 -08:00
Ansis Brammanis
7102fea04d add history.intersects to context 2013-02-13 18:12:53 -05:00
Tom MacWright
bf50403c43 Merge branch 'master' of github.com:systemed/iD 2013-02-13 18:12:49 -05:00
Tom MacWright
b8c79b8b48 Fix map.extent 2013-02-13 18:12:38 -05:00
John Firebaugh
d71f9dcec9 Merge pull request #757 from LuisGC/patch-1
Completed Spanish translations
2013-02-13 15:05:54 -08:00
Luis GC
b2f1de654c Completed Spanish translations 2013-02-14 00:01:56 +01:00
Tom MacWright
eb2a133ac6 Hate multiline bracketless ifs 2013-02-13 17:57:58 -05:00
Ansis Brammanis
1050faab8f Only delete saved on hitting reset, fixes #744 2013-02-13 17:42:46 -05:00