Commit graph

8749 commits

Author SHA1 Message Date
Tom Hughes
4c7279ba1f Merge remote-tracking branch 'upstream/pull/2000' 2018-09-22 17:03:50 +01:00
Tom Hughes
c356e670ce Merge remote-tracking branch 'upstream/pull/2001' 2018-09-22 17:02:50 +01:00
Tom Hughes
ad3ca54e28 Remove Imperial from hosting credits
Fixes #1944
2018-09-22 16:57:53 +01:00
translatewiki.net
a3b094cc09 Localisation updates from https://translatewiki.net. 2018-09-20 11:16:54 +02:00
Andy Allan
83f78ce64a Fix incorrect reference to 12.04 in installation notes 2018-09-19 14:34:49 +01:00
Andy Allan
071d7619c5 Set the rubocop target version to 2.3
This allows rubocop to run additional cops that would not apply to
older ruby versions
2018-09-19 14:25:31 +01:00
Tom Hughes
1ebd7ca9b0 Remove bogus translation 2018-09-17 17:16:20 +01:00
translatewiki.net
797a249b07 Localisation updates from https://translatewiki.net. 2018-09-17 08:17:04 +02:00
Tom Hughes
f84fe0006c Remove bogus translation 2018-09-13 19:41:22 +01:00
translatewiki.net
9cd74649fb Localisation updates from https://translatewiki.net. 2018-09-13 11:04:58 +02:00
Tom Hughes
b4d90ec7f4 Test that friends are shown correctly on the user profile
Fixes #1992
2018-09-12 18:03:12 +01:00
mmd-osm
df671aeccc Set img.button size to 20x20 for directions.png 2018-09-11 19:49:10 +02:00
Tom Hughes
f906373be2 Update translation keys for renaming of user#view to user#show 2018-09-11 16:33:46 +01:00
Tom Hughes
5becbc6ee0 Update bundle 2018-09-10 22:43:58 +01:00
Tom Hughes
4f129ad3f5 Update bowser to 1.9.4 2018-09-10 22:33:46 +01:00
Tom Hughes
983f7325ae Update leaflet to 1.3.4 2018-09-10 22:30:01 +01:00
Tom Hughes
1a66467ef6 Avoid flickering welcome banner
Make the welcome banner default to being hidden and then show
it (by adding a class) if there is no cookie.

Fixes #1951
2018-09-10 21:21:43 +01:00
Tom Hughes
a7cdb0298d Limit map to the maximum zoom of the current base layer
Fix maximum zoom levels for various layers and ensure that the
map can't be zoomed beyond the limit of the current base layer.

Fixes #1978
2018-09-10 20:37:36 +01:00
Tom Hughes
297b0a0e16 Merge remote-tracking branch 'upstream/pull/1987' 2018-09-10 19:09:31 +01:00
Tom Hughes
276599d34f Merge remote-tracking branch 'upstream/pull/1986' 2018-09-10 19:01:28 +01:00
Tom Hughes
0e0c89b95c Merge remote-tracking branch 'upstream/pull/1985' 2018-09-10 18:58:27 +01:00
Tom Hughes
995a5f89c2 Merge remote-tracking branch 'upstream/pull/1984' 2018-09-10 18:53:13 +01:00
Tom Hughes
568a447a8c Merge remote-tracking branch 'upstream/pull/1983' 2018-09-10 18:53:09 +01:00
Tom Hughes
744fadccd9 Rename CSS class matches for changes in action names 2018-09-10 14:12:56 +01:00
translatewiki.net
29eb778043 Localisation updates from https://translatewiki.net. 2018-09-10 08:30:56 +02:00
Wil
1d2a3841ab Resolve 34 Rubocop Lint/AmbiguousOperator conflicts 2018-09-10 11:43:50 +08:00
Andy Allan
cf107bca70 Remove Lint/ShadowingOuterLocalVariable - already fixed 2018-09-10 11:34:04 +08:00
Wil
a182820139 Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts 2018-09-10 11:28:16 +08:00
Andy Allan
100babbe6c Just pass the object, rather than the id, to _path methods where possible 2018-09-10 11:09:30 +08:00
Andy Allan
4dd4831c0a Just pass the user object, rather than the display_name, to the user_path helper 2018-09-10 10:54:29 +08:00
Andy Allan
3f2ba044e5 Rename diary_entry#list to #index 2018-09-10 10:26:28 +08:00
Andy Allan
a3606e00b4 Rename user#list to user#index 2018-09-10 10:03:34 +08:00
Andy Allan
a8ecb1bf4b Use full url escaping when required in trace tests 2018-09-10 09:37:52 +08:00
Tom Hughes
5a2d2f97ce Update changeset browse view for renaming of changeset#list to changeset#index 2018-09-09 12:36:34 +01:00
Tom Hughes
ba05009de1 Update trace RSS for renaming of trace#view to trace#show 2018-09-09 11:50:05 +01:00
Tom Hughes
bc4e65394f Improve tests for trace RSS feeds 2018-09-09 11:50:05 +01:00
translatewiki.net
5cead9d5ab Localisation updates from https://translatewiki.net. 2018-09-06 21:37:01 +02:00
Tom Hughes
f03ed73755 Fix rubocop warnings 2018-09-05 19:33:54 +01:00
Tom Hughes
983e21db2e Merge remote-tracking branch 'upstream/pull/1974' 2018-09-05 19:06:16 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01:00
Tom Hughes
a0dc300840 Merge remote-tracking branch 'upstream/pull/1972' 2018-09-05 18:41:17 +01:00
Andy Allan
84e19eba83 Remove temporary routes
These were preserved to avoid users hitting errors, if we deployed
while they were filling in the related forms.
2018-09-05 15:40:05 +08:00
Andy Allan
de6aa3f015 Rename changeset#list to changeset#index 2018-09-05 15:17:11 +08:00
Andy Allan
5a06a3dffe Rename diary_entry#view to diary_entry#show 2018-09-05 14:52:36 +08:00
Andy Allan
19c26e70a3 Rename user#view to user#show 2018-09-05 14:21:01 +08:00
Tom Hughes
6027c42ee7 Hide note comments made by deleted users
Fixes #1970
2018-09-04 22:22:39 +01:00
Ilya Zverev
67925e6d98 Do not display two coordinates on 'where am I' click
Closes #1968
2018-09-03 17:46:26 +01:00
translatewiki.net
d792a3bab5 Localisation updates from https://translatewiki.net. 2018-09-03 08:23:19 +02:00
Tom Hughes
eeb8bbba49 Require people replying to diary notifications to be subscribed 2018-08-30 18:34:15 +01:00
Tom Hughes
a1b179fa38 Merge remote-tracking branch 'upstream/pull/1964' 2018-08-30 18:26:05 +01:00