Commit graph

7852 commits

Author SHA1 Message Date
Bryan Housel
3f389cc643 Update to iD v2.2.1 2017-05-12 10:42:31 -04:00
Niklas Laxström
ff527bbf62 Localisation updates from https://translatewiki.net. 2017-05-11 08:51:49 +02:00
Andy Allan
c6d1bd63da More amf_controller tests converted to use factories. 2017-05-10 18:17:30 +01:00
Andy Allan
13fa0e0435 Refactor more amf_controller tests to use factories. 2017-05-10 18:17:30 +01:00
Andy Allan
f6323031cc Refactor putway method tests to use factories
This involved decoding a lot of magic numbers, to figure out which
were node_ids and which were other things (versions, coordinates etc)
2017-05-10 18:17:30 +01:00
Andy Allan
881015036c Refactor some more amf_controller tests to use factories.
The timestamp truncation thing was a pain to figure out.
2017-05-10 18:17:30 +01:00
Tom Hughes
7d95a576cd Merge remote-tracking branch 'openstreetmap/pull/1538' 2017-05-10 17:01:06 +01:00
Andy Allan
3f3ffdfea1 Refactor old_relation_controller tests to use factories. 2017-05-10 14:11:53 +01:00
Andy Allan
3fa3658efa Update old_ways_controller tests to use factories. 2017-05-10 13:38:10 +01:00
Andy Allan
bdf817103a Convert remaining old_node_controller tests to use factories. 2017-05-10 11:51:43 +01:00
Andy Allan
1df5bd247f Ensure the old nodes are created with the same changeset
Not often important, but the most recent old_node should definitely
have the same changeset as the node itself.
2017-05-10 11:51:43 +01:00
Andy Allan
b2a998cf08 Refactor remaining api_controller tests to use factories. 2017-05-10 11:51:43 +01:00
Tom Hughes
b1d44c77ad Update mailmap 2017-05-10 11:51:16 +01:00
Simon Poole
1b2818ff8a Block anything in the here.com domain
Fixes #1536
Closes #1537
2017-05-10 11:36:40 +01:00
Tom Hughes
cb79ce2833 Parse asset map JSON before passing it to iD 2017-05-10 09:14:09 +01:00
Bryan Housel
4988801dc6 Update to iD v2.2.0 2017-05-09 10:43:31 -04:00
Niklas Laxström
ba726c4f0e Localisation updates from https://translatewiki.net. 2017-05-04 07:57:14 +02:00
Niklas Laxström
65ff082817 Localisation updates from https://translatewiki.net. 2017-05-02 08:08:50 +02:00
Tom Hughes
3a16b68368 Use POST when editing GPX trace details
Fixes #1533
2017-05-01 16:56:02 +01:00
Niklas Laxström
30392717b9 Localisation updates from https://translatewiki.net. 2017-04-27 08:25:14 +02:00
Andy Allan
de1bc30b83 Refactor remaining way_controller tests to use factories. 2017-04-26 09:10:45 +02:00
Andy Allan
2122ec263b Refactor more way_controller tests to use factories. 2017-04-26 08:50:39 +02:00
Andy Allan
d48603d9e0 Add a way_with_nodes factory, and use it in the way_controller tests. 2017-04-26 08:34:01 +02:00
Andy Allan
8da385e0db Refactor deletion tests in way_controller_test to use factories. 2017-04-26 08:33:29 +02:00
Andy Allan
99817bd62a Refactor some way_controller tests to use factories. 2017-04-25 18:42:59 +02:00
Andy Allan
75c5d6619a Refactor some amf_controller tests to use factories. 2017-04-25 17:47:58 +02:00
Andy Allan
7f957bac76 Use factories for all factory associations. 2017-04-25 16:52:29 +02:00
Andy Allan
805abe96d0 Create an old_way_node factory, and start using it for tests. 2017-04-25 16:29:13 +02:00
Andy Allan
05a42281ab Create an old_way factory, and start using it for tests. 2017-04-25 16:29:13 +02:00
Andy Allan
b46028b4f7 Create an old_relation_member factory, and start using it for tests. 2017-04-25 16:29:13 +02:00
Andy Allan
27c3edae25 Create an old_relation factory, and start using it for tests. 2017-04-25 15:19:25 +02:00
Tom Hughes
6ce310b38c Merge remote-tracking branch 'openstreetmap/pull/1527' 2017-04-24 21:05:23 +01:00
daganzdaanda
8b68acec3e Move list of containing relations to top of browse views
Moves the list of containing relations to above the list of
members for ways and relations - nodes have no equivalent list
so no change is needed there.

Fixes #794
Closes #1501
2017-04-24 20:25:22 +01:00
Andy Allan
e0f7bb1b07 Convert the node_controller update tests to use factories. 2017-04-24 20:42:08 +02:00
Andy Allan
d595577a49 Convert the duplicate_tags node controller test to use factories. 2017-04-24 20:41:43 +02:00
Niklas Laxström
6fcc2e55f9 Localisation updates from https://translatewiki.net. 2017-04-24 19:59:18 +02:00
Matt Amos
c7391595d8 Credit the whole of UCL, rather than just the Bartlett / VR centre. 2017-04-22 11:47:12 +01:00
Niklas Laxström
da0126e264 Localisation updates from https://translatewiki.net. 2017-04-20 07:41:04 +02:00
Niklas Laxström
a69c016b40 Localisation updates from https://translatewiki.net. 2017-04-17 09:41:24 +02:00
Tom Hughes
15a8852ea6 Update Potlatch 2 to 2.5-7-gbd74430 build 2017-04-13 18:41:58 +01:00
Niklas Laxström
8f9a72c7f7 Localisation updates from https://translatewiki.net. 2017-04-10 07:27:21 +02:00
Tom Hughes
88f32e3b45 Merge remote-tracking branch 'openstreetmap/pull/1510' 2017-04-08 16:36:48 +01:00
Herve Saint-Amand
2ae479e3f3 Fix indentation in email template
The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512
2017-04-08 16:36:40 +01:00
Niklas Laxström
95abc14b30 Localisation updates from https://translatewiki.net. 2017-04-06 07:25:43 +02:00
Andy Allan
b375050e6c Use node and relation_member factories for testing containing_relations and containing_relation_members 2017-04-05 11:33:33 +01:00
Niklas Laxström
e4e5ec4409 Localisation updates from https://translatewiki.net. 2017-04-03 07:38:26 +02:00
Andy Allan
df721bc653 Convert more node fixtures to factories 2017-03-31 10:51:18 +01:00
Andy Allan
5ab082a047 Add the closed trait to changeset factories. 2017-03-31 10:47:41 +01:00
Andy Allan
1b7ab315bb Add factories for relations, relation_members, ways and way_nodes 2017-03-31 10:40:49 +01:00
Tom Hughes
3d6a3a6de3 Merge remote-tracking branch 'openstreetmap/pull/1508' 2017-03-30 15:45:37 +01:00