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

9944 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andy Allan
c4c1f8ded3 Reformat params hashes to avoid super-long lines 2019-12-18 15:58:37 +01:00
Andy Allan
2722cc60be Move Style/Documentation into the main config file 
I don't think anyone intends to write documentation for the app
 2019-12-18 15:34:11 +01:00
Tom Hughes
6f8966e7c1 Note events use "opened" not "open" as the status 2019-12-16 22:26:33 +00:00
Tom Hughes
e7dbab2b82 Rename translations for trace#delete to trace#destroy 
Fixes #2465
 2019-12-16 22:12:13 +00:00
Tom Hughes
4ee60c0f8f Make all translation lookup errors throw exceptions in test mode 2019-12-16 21:54:11 +00:00
Tom Hughes
ac6a872a48 Avoid errors when /edit is called on an invalid object 2019-12-16 21:23:09 +00:00
translatewiki.net
60e1ddb6be Localisation updates from https://translatewiki.net. 2019-12-16 16:08:08 +01:00
hikemaniac
e6d7471ab6 Fixed comment textarea going off the sidebar, added border-radius to form fields 2019-12-15 16:04:29 +01:00
Tom Hughes
1e4ced7c10 Update to rails 6.0.2 2019-12-13 18:54:06 +00:00
Tom Hughes
ae46cdc665 Update bundle 2019-12-13 18:53:32 +00:00
Tom Hughes
a2ad08b2e2 Use correct link for settings page 2019-12-12 19:12:38 +00:00
Tom Hughes
9153fd3559 Fix link in error page when a user has public edits disabled 2019-12-12 18:50:30 +00:00
mmd
ffe636e6bd Add In-Reply-To, References headers to email 
Closes https://github.com/openstreetmap/openstreetmap-website/issues/2430
 2019-12-12 18:25:29 +01:00
translatewiki.net
aab9473f69 Localisation updates from https://translatewiki.net. 2019-12-12 15:36:38 +01:00
Tom Hughes
cfbd10b27b Fix rubocop warning 2019-12-11 17:48:37 +00:00
Tom Hughes
061231ec7e Switch back to the upstream actionpack-page_caching gem 2019-12-11 17:31:35 +00:00
Tom Hughes
2f419c7ab0 Merge remote-tracking branch 'upstream/pull/2461' 2019-12-11 17:31:16 +00:00
Andy Allan
040302286f Remove ignoring of nearby column 
This is the final stage in the process. Now that the migrations are run,
and apps restarted, it is safe to remove the ignore_column declaration.
 2019-12-11 18:08:31 +01:00