cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10164 commits 4 branches 1 tag 499 MiB
Commit graph

10164 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
45a1d298a9 Move default_format_xml to api_controller 2019-12-30 17:26:00 +01:00
mmd-osm
75a49786f8 API JSON output 2019-12-30 16:37:52 +01: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
Andy Allan
dfedf85b6c 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 10:29:07 +01:00
Andy Allan
1ff7e3ac71 Replace custom css class with bootstrap inline utility 
This has actually been broken since the controller was renamed,
but nobody noticed.
 2019-12-19 19:31:52 +01:00
Andy Allan
1586e2ba80 Use badges for the trace visibility labels 
Our green is currently just on the side of triggering black text,
hence the override to make it look consistent with the other badges.
 2019-12-19 19:18:00 +01:00
Andy Allan
a3e3be007e Use text-danger style for pending trace warning 2019-12-19 19:15:36 +01:00
Andy Allan
f8d61f287c Remove font-size overrides for traces and user lists 
This makes them much easier to read
 2019-12-19 18:03:09 +01:00
Andy Allan
410fe87045 Use a warning alert for reporting new issues 
This removes custom colouring for the alert. The list overrides
need to stay until we unpick more of our custom styling.
 2019-12-19 17:50:22 +01:00
Andy Allan
3776a6d321 Use offwhite instead of grey for browse pages tag tables 2019-12-19 17:43:03 +01:00
Andy Allan
118347444f Remove more header font size overrides 
This smooths out inconsistencies in the hierarchies, for example when
using header sizes beyond h3 in profile descriptions.
 2019-12-19 17:29:21 +01:00
Andy Allan
6edf2d4374 Minimially invasive fix for sidebar heading sizes 
I'd prefer to avoid overriding the heading sizes, but this will involve
more extensive changes to the layout. For example, the h2 heading has
specific padding and margins that break when moving to h3.

Fixes #2467
 2019-12-19 17:09:51 +01:00
translatewiki.net
8381836f60 Localisation updates from https://translatewiki.net. 2019-12-19 15:18:57 +01:00
Tom Hughes
09defac787 Update COP names 2019-12-18 22:46:56 +00:00
Tom Hughes
aa7256d617 Update to rails 6.0.2.1 2019-12-18 22:15:59 +00:00
hikemaniac
75d09e2233 Let all textareas only be vertically resized 2019-12-18 20:32:56 +01:00
Tom Hughes
01a506a254 Merge remote-tracking branch 'upstream/pull/2466' 2019-12-18 18:29:36 +00:00
Tom Hughes
32fa124698 Merge remote-tracking branch 'upstream/pull/2452' 2019-12-18 18:23:42 +00:00