Commit graph

7607 commits

Author SHA1 Message Date
Tom Hughes
e4f1588aa1 Update Leaflet.contextmenu to the 1.2.1 release 2017-02-12 19:19:14 +00:00
Tom Hughes
e58a5c69d3 Make context menu entries translateable 2017-02-12 19:19:14 +00:00
Tom Hughes
430978fab7 Improve context menu initialisation to avoid namespace pollution 2017-02-12 19:19:13 +00:00
Tom Hughes
043d29fd7e Merge remote-tracking branch 'openstreetmap/pull/1030' into next 2017-02-12 15:04:50 +00:00
Nick Ingalls
a4eef7dab8 Remove invalid YML
Closes #1434
2017-02-09 22:31:14 +00:00
Tom Hughes
c439f957ae Only add traces for POST requests 2017-02-09 21:07:44 +00:00
Tom Hughes
92fe7a8506 Only create diary entries for POST requests 2017-02-09 21:07:18 +00:00
Tom Hughes
349862f1b7 Test that GET on message#new can't send a message 2017-02-09 20:39:03 +00:00
Tom Hughes
afa82bd2b1 Render message properly on error 2017-02-09 20:20:55 +00:00
Tom Hughes
4709d90594 Only send messages for POST requests 2017-02-09 19:37:48 +00:00
Tom Hughes
d798cc3bf7 Remove fake qqq locale 2017-02-09 08:47:59 +00:00
Niklas Laxström
1d75ed6801 Localisation updates from https://translatewiki.net. 2017-02-09 08:16:23 +01:00
Herve Saint-Amand
448a68447f Don't display a box at all if the note event doesn't include a comment body
Before this it just displays en empty box, which looks wrong.
2017-02-08 22:22:21 +00:00
Tom Hughes
579e323d09 Only record a visible object if it exists
Fixes #1430
2017-02-08 09:54:14 +00:00
Bryan Housel
7606d1369a Update to iD v2.1.2 2017-02-07 11:53:11 -05:00
Bryan Housel
94559b9c42 Update to iD v2.1.1 2017-02-06 17:08:25 -05:00
Tom Hughes
333113b8e1 Merge remote-tracking branch 'openstreetmap/pull/1426' 2017-02-06 19:10:25 +00:00
Tom Hughes
faf648dad0 Remove fake qqq locale 2017-02-06 07:11:25 +00:00
Niklas Laxström
eb8f89d2a0 Localisation updates from https://translatewiki.net. 2017-02-06 08:05:21 +01:00
Tom Hughes
f435fce007 Link GPX fixture files instead of stubbing 2017-02-05 17:26:31 +00:00
Tom Hughes
71c2fc671f Cleanup double comment markers 2017-02-05 17:25:54 +00:00
Tom Hughes
94ab5c3635 Make TraceController#list sort by id instead of timestamp
The effect is much the same but id is guaranteed to give a stable
sort if two traces have the same timestamp.
2017-02-05 16:18:56 +00:00
Tom Hughes
0814b4096c Merge remote-tracking branch 'openstreetmap/pull/1347' into master 2017-02-05 16:02:20 +00:00
Tom Hughes
a28f264ad1 Fix rubocop warnings 2017-02-05 14:33:48 +00:00
Tom Hughes
c7dc3ee722 Use .first in place of [0] 2017-02-05 13:57:25 +00:00
Tom Hughes
c57d2b29fc Merge remote-tracking branch 'openstreetmap/pull/1401' 2017-02-05 13:50:07 +00:00
Tom Hughes
30f9f95ef6 Update bundle 2017-02-05 11:33:28 +00:00
Tom Hughes
c8671c137a Update rubocop 2017-02-05 11:12:37 +00:00
Bryan Housel
d9c1ba2315 Update to iD v2.1.0 2017-02-04 01:18:42 -05:00
Tom Hughes
7793cd27ab Merge remote-tracking branch 'openstreetmap/pull/1423' 2017-02-02 17:21:41 +00:00
Andy Allan
1041ead253 Convert the test_users_nearby to user factories. 2017-02-02 13:52:26 +00:00
Andy Allan
3b26ff0c40 Use factory for user language tests 2017-02-02 13:33:15 +00:00
Andy Allan
b83271de92 Refactor the friend_users test, and remove the tests which duplicate the (renamed) test_friends_with above. 2017-02-02 13:24:46 +00:00
Andy Allan
f96c563c10 Convert test_friend_with to use factories, and use alice/bob/charlie for easier understanding. 2017-02-02 13:20:51 +00:00
Andy Allan
584748fe0a User factory for uniqueness tests 2017-02-02 13:09:39 +00:00
Andy Allan
df6469c76b Convert class method tests to use User factory.
Also improve the tests by being explicit about which results should
be returned, rather than just hoping that the fixtures cover all
possibilities.
2017-02-02 13:05:43 +00:00
Andy Allan
0bd2e9ea8c Add status traits to user factory. 2017-02-02 12:55:32 +00:00
Andy Allan
38fc6331af Add moderator_user and administrator_user factories. 2017-02-02 12:38:19 +00:00
Andy Allan
c55169659c Add a user_role factory
Naming the association in the model makes the relationship easier
to express in the factory.
2017-02-02 12:35:29 +00:00
Andy Allan
9e591d8ccb Add with_home_location trait for user factories. 2017-02-02 12:08:36 +00:00
Andy Allan
589e9802a9 Create a simple user factory, and convert some basic tests. 2017-02-01 17:42:05 +00:00
Frederik Ramm
ad2b4fe12a Reduce maximum changeset size to 10k changes
Ten thousand changes ought to be enough for any normal mapping activity.

Automatic edits and imports are controlled by scripts anyway so it doesn't
make a difference to them as they just have to adapt the limit.

The reason for my suggestion is that large changesets are becoming
increasingly difficult to handle due to frequent timeouts when trying
to load and process them.

The changeset size limit is returned by the API in the "capabilities" request
so client software that honours that information will automatically pick up
the new limit.

Closes #1259
2017-01-31 18:15:42 +00:00
Tom Hughes
34d663f01a Remove fake qqq locale 2017-01-30 16:01:52 +00:00
Niklas Laxström
3eb5a9568b Localisation updates from https://translatewiki.net. 2017-01-30 16:50:12 +01:00
Herve Saint-Amand
223a12caf8 That new message in the HTML version of the mail should also be added to the plain text version of the mail
Duh.
2017-01-28 23:29:44 +00:00
Herve Saint-Amand
74e28f8bd0 Use each_with_object and make the code pithier 2017-01-28 23:27:04 +00:00
Herve Saint-Amand
a371aad9ac Renamed apply_inline_css to style_message as suggested 2017-01-28 23:08:25 +00:00
Herve Saint-Amand
f83b719f03 Set border=0 on that img
IE9 shows a big nasty blue border on linked images if you don't specify border=0
2017-01-27 23:20:11 +00:00
Andy Allan
8a6e8ae128 Convert client applications fixtures into a factory
Closes #1415
2017-01-26 18:03:51 +00:00
Tom Hughes
e1cac818b1 Merge remote-tracking branch 'openstreetmap/pull/1416' 2017-01-26 17:51:13 +00:00