Commit graph

9774 commits

Author SHA1 Message Date
Tom Hughes
d615dfabbc Update bundle 2020-01-05 19:04:55 +00:00
Tom Hughes
5a668bfbe4 Add some missing _html suffixes 2020-01-05 19:01:54 +00:00
Tom Hughes
a570f59187 Merge remote-tracking branch 'upstream/pull/2494' 2020-01-05 18:51:42 +00:00
Tom Hughes
6c22bf4b9a Set X-Entity-Ref-ID header on notification emails
This disables threading in gmail completely - without it all
notifications of a given type are grouped together.
2020-01-02 21:45:41 +00:00
Andy Allan
53f2c36f1d Use ActionView's safe_join to avoid using raw when joining arrays of text 2020-01-02 18:07:23 +01:00
Andy Allan
5aa255e13f Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2020-01-02 17:43:34 +01:00
Andy Allan
8dba8cd4a0 Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2020-01-02 17:13:41 +01:00
translatewiki.net
a336bb9067 Localisation updates from https://translatewiki.net. 2020-01-02 14:54:42 +01:00
Tom Hughes
e7332b0c41 Merge remote-tracking branch 'upstream/pull/2491' 2020-01-02 13:29:26 +00:00
Tom Hughes
fa7ba58d5e Merge remote-tracking branch 'upstream/pull/2490' 2020-01-02 13:28:47 +00:00
Andy Allan
4ca2721c63 Remove the dashed underline from prose headings
No other headings are underlined, and the underlines look more like
a section separator (e.g. dashed hr) and so visually separated the
heading from its content.
2020-01-02 13:40:30 +01:00
Andy Allan
ca8195c8a3 Reinstate background colour for sidebars
This is required when the sidebar overlaps the map, for example when
it is not full height on the welcome message.
2020-01-02 10:50:02 +01:00
Tom Hughes
438496c657 Fix hostip.info fallback 2020-01-01 22:28:08 +00:00
Tom Hughes
e0df631848 Switch GeoIP code to use GeoIPv2 databases 2020-01-01 18:50:48 +00:00
Tom Hughes
ae83f2afc2 Update bundle 2020-01-01 18:33:46 +00:00
translatewiki.net
df4980ad58 Localisation updates from https://translatewiki.net. 2019-12-31 07:50:13 +01:00
Tom Hughes
2f1705db7c Test language specific versions of about and copyright pages 2019-12-30 22:52:31 +00:00
Tom Hughes
23e763ea95 Mark language and direction for about page 2019-12-30 22:49:17 +00:00
Tom Hughes
bb2c5677df Add some missing route tests for the site controller 2019-12-30 22:37:24 +00:00
Tom Hughes
3426976606 Merge remote-tracking branch 'upstream/pull/2444' 2019-12-30 22:34:24 +00:00
Tom Hughes
29aac6e149 Merge remote-tracking branch 'upstream/pull/2462' 2019-12-30 22:29:24 +00:00
mmd-osm
480eaa1b36 Added helper function set_references for mail header 2019-12-30 23:04:15 +01:00
Tom Hughes
1c5642637a Merge remote-tracking branch 'upstream/pull/2471' 2019-12-30 21:40:10 +00:00
Tom Hughes
1597a2f879 Merge remote-tracking branch 'upstream/pull/2470' 2019-12-30 21:37:32 +00:00
Tom Hughes
5ff4e4e331 Merge remote-tracking branch 'upstream/pull/2469' 2019-12-30 21:29:00 +00:00
Tom Hughes
dcd5559070 Merge remote-tracking branch 'upstream/pull/2473' 2019-12-30 21:17:58 +00:00
mmd-osm
f47aaa58c3 travis: update structure.sql 2019-12-30 12:55:59 +01:00
mmd-osm
71d709d7a2 travis: add missing packages 2019-12-30 09:58:31 +01:00
Tom Hughes
c524cbf096 Use settings.local.yml to enable memcache during travis runs 2019-12-30 01:01:42 +00:00
Tom Hughes
06a1446970 Update bundle 2019-12-29 21:11:23 +00:00
Tom Hughes
e0f3fdbac7 Merge remote-tracking branch 'upstream/pull/2475' 2019-12-29 19:16:33 +00:00
translatewiki.net
0db30c611a Localisation updates from https://translatewiki.net. 2019-12-26 12:54:57 +01:00
Tom Hughes
f0467745bf Merge remote-tracking branch 'upstream/pull/2480' 2019-12-26 10:42:04 +00:00
Kristjan
81c244e273
fixed "end tag" -> "source"
Fixed inattentiveness from my last commit.
2019-12-26 11:23:45 +01:00
Tom Hughes
99bf5743b6 Merge remote-tracking branch 'upstream/pull/2477' 2019-12-26 09:51:27 +00:00
Tom Hughes
03d5eb4b05 Merge remote-tracking branch 'upstream/pull/2476' 2019-12-26 09:47:52 +00:00
Kristjan
0d3f269aa8
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:50 +01:00
Kristjan
ec56eaf0f2
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:22 +01:00
Kristjan
f771df86d2
removed end tag ("source" is a self-closing tag) 2019-12-24 23:43:49 +01:00
Quincy Morgan
c8a182acbb Fix errant CSS color properties 2019-12-24 10:47:44 -05:00
Simon Legner
7a81258ddc Translate units used by leaflet-locatecontrol 2019-12-24 00:29:30 +01:00
Tom Hughes
ab5616f354 Merge remote-tracking branch 'upstream/pull/2474' 2019-12-23 21:24:30 +00:00
Quincy Morgan
cbaf57e174 Fix CSS errors 2019-12-23 16:23:39 -05:00
Quincy Morgan
c10259532f Update to iD v2.17.0 2019-12-23 14:54:58 -05:00
translatewiki.net
5072613920 Localisation updates from https://translatewiki.net. 2019-12-23 16:09:25 +01:00
mmd-osm
3d384d90d6 travis: change dist to bionic 2019-12-22 14:42:39 +01:00
Tom Hughes
dbd7af822b Require plugins in .rubocop_todo.yml
Fixes #2472
2019-12-22 12:48:05 +00:00
Andy Allan
dddef7672e Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2019-12-22 11:28:18 +01:00
Andy Allan
281d7992f8
Merge pull request #2464 from hikemaniac/fix-comment-textarea
Improve textarea behaviour
2019-12-22 10:21:14 +00:00
Andy Allan
217f616630 Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2019-12-20 14:32:00 +01:00