]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 5 Jan 2020 19:01:54 +0000 (19:01 +0000)]
Add some missing _html suffixes
Tom Hughes [Sun, 5 Jan 2020 18:51:42 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2494'
Tom Hughes [Thu, 2 Jan 2020 18:47:14 +0000 (18:47 +0000)]
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.
Andy Allan [Thu, 2 Jan 2020 17:07:23 +0000 (18:07 +0100)]
Use ActionView's safe_join to avoid using raw when joining arrays of text
Andy Allan [Thu, 2 Jan 2020 16:43:34 +0000 (17:43 +0100)]
Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
Andy Allan [Thu, 2 Jan 2020 16:13:41 +0000 (17:13 +0100)]
Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
translatewiki.net [Thu, 2 Jan 2020 13:54:42 +0000 (14:54 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 2 Jan 2020 13:29:26 +0000 (13:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2491'
Tom Hughes [Thu, 2 Jan 2020 13:28:47 +0000 (13:28 +0000)]
Merge remote-tracking branch 'upstream/pull/2490'
Andy Allan [Thu, 2 Jan 2020 12:40:30 +0000 (13:40 +0100)]
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.
Andy Allan [Thu, 2 Jan 2020 09:50:02 +0000 (10:50 +0100)]
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.
Tom Hughes [Wed, 1 Jan 2020 22:28:08 +0000 (22:28 +0000)]
Fix hostip.info fallback
Tom Hughes [Wed, 1 Jan 2020 18:50:48 +0000 (18:50 +0000)]
Switch GeoIP code to use GeoIPv2 databases
Tom Hughes [Wed, 1 Jan 2020 18:33:17 +0000 (18:33 +0000)]
Update bundle
translatewiki.net [Tue, 31 Dec 2019 06:50:13 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 30 Dec 2019 22:52:31 +0000 (22:52 +0000)]
Test language specific versions of about and copyright pages
Tom Hughes [Mon, 30 Dec 2019 22:49:17 +0000 (22:49 +0000)]
Mark language and direction for about page
Tom Hughes [Mon, 30 Dec 2019 22:37:24 +0000 (22:37 +0000)]
Add some missing route tests for the site controller
Tom Hughes [Mon, 30 Dec 2019 22:34:24 +0000 (22:34 +0000)]
Merge remote-tracking branch 'upstream/pull/2444'
Tom Hughes [Mon, 30 Dec 2019 22:29:24 +0000 (22:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2462'
mmd-osm [Mon, 30 Dec 2019 22:04:15 +0000 (23:04 +0100)]
Added helper function set_references for mail header
Tom Hughes [Mon, 30 Dec 2019 21:40:10 +0000 (21:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2471'
Tom Hughes [Mon, 30 Dec 2019 21:37:32 +0000 (21:37 +0000)]
Merge remote-tracking branch 'upstream/pull/2470'
Tom Hughes [Mon, 30 Dec 2019 21:29:00 +0000 (21:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2469'
Tom Hughes [Mon, 30 Dec 2019 21:17:58 +0000 (21:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2473'
mmd-osm [Mon, 30 Dec 2019 11:55:59 +0000 (12:55 +0100)]
travis: update structure.sql
mmd-osm [Sun, 22 Dec 2019 11:16:48 +0000 (12:16 +0100)]
travis: add missing packages
Tom Hughes [Mon, 30 Dec 2019 00:50:34 +0000 (00:50 +0000)]
Use settings.local.yml to enable memcache during travis runs
Tom Hughes [Sun, 29 Dec 2019 21:11:23 +0000 (21:11 +0000)]
Update bundle
Tom Hughes [Sun, 29 Dec 2019 19:16:33 +0000 (19:16 +0000)]
Merge remote-tracking branch 'upstream/pull/2475'
translatewiki.net [Thu, 26 Dec 2019 11:54:57 +0000 (12:54 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 26 Dec 2019 10:42:04 +0000 (10:42 +0000)]
Merge remote-tracking branch 'upstream/pull/2480'
Kristjan [Thu, 26 Dec 2019 10:23:45 +0000 (11:23 +0100)]
fixed "end tag" -> "source"
Fixed inattentiveness from my last commit.
Tom Hughes [Thu, 26 Dec 2019 09:51:27 +0000 (09:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2477'
Tom Hughes [Thu, 26 Dec 2019 09:47:52 +0000 (09:47 +0000)]
Merge remote-tracking branch 'upstream/pull/2476'
Kristjan [Tue, 24 Dec 2019 22:44:50 +0000 (23:44 +0100)]
removed end tag ("source" is a self-closing tag)
Kristjan [Tue, 24 Dec 2019 22:44:22 +0000 (23:44 +0100)]
removed end tag ("source" is a self-closing tag)
Kristjan [Tue, 24 Dec 2019 22:43:49 +0000 (23:43 +0100)]
removed end tag ("source" is a self-closing tag)
Quincy Morgan [Tue, 24 Dec 2019 15:47:44 +0000 (10:47 -0500)]
Fix errant CSS color properties
Simon Legner [Mon, 23 Dec 2019 23:29:30 +0000 (00:29 +0100)]
Translate units used by leaflet-locatecontrol
Tom Hughes [Mon, 23 Dec 2019 21:24:30 +0000 (21:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2474'
Quincy Morgan [Mon, 23 Dec 2019 21:23:39 +0000 (16:23 -0500)]
Fix CSS errors
Quincy Morgan [Mon, 23 Dec 2019 19:54:58 +0000 (14:54 -0500)]
Update to iD v2.17.0
translatewiki.net [Mon, 23 Dec 2019 15:09:25 +0000 (16:09 +0100)]
Localisation updates from https://translatewiki.net.
mmd-osm [Sun, 22 Dec 2019 10:58:06 +0000 (11:58 +0100)]
travis: change dist to bionic
Tom Hughes [Sun, 22 Dec 2019 12:48:05 +0000 (12:48 +0000)]
Require plugins in .rubocop_todo.yml
Fixes #2472
Andy Allan [Sun, 22 Dec 2019 10:28:18 +0000 (11:28 +0100)]
Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
Andy Allan [Sun, 22 Dec 2019 10:21:14 +0000 (10:21 +0000)]
Merge pull request #2464 from hikemaniac/fix-comment-textarea
Improve textarea behaviour
Andy Allan [Fri, 20 Dec 2019 13:32:00 +0000 (14:32 +0100)]
Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
Andy Allan [Fri, 20 Dec 2019 09:29:07 +0000 (10:29 +0100)]
Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
Andy Allan [Thu, 19 Dec 2019 18:18:52 +0000 (19:18 +0100)]
Replace custom css class with bootstrap inline utility
This has actually been broken since the controller was renamed,
but nobody noticed.
Andy Allan [Thu, 19 Dec 2019 18:18:00 +0000 (19:18 +0100)]
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.
Andy Allan [Thu, 19 Dec 2019 18:15:36 +0000 (19:15 +0100)]
Use text-danger style for pending trace warning
Andy Allan [Thu, 19 Dec 2019 17:03:09 +0000 (18:03 +0100)]
Remove font-size overrides for traces and user lists
This makes them much easier to read
Andy Allan [Thu, 19 Dec 2019 16:50:22 +0000 (17:50 +0100)]
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.
Andy Allan [Thu, 19 Dec 2019 16:29:21 +0000 (17:29 +0100)]
Remove more header font size overrides
This smooths out inconsistencies in the hierarchies, for example when
using header sizes beyond h3 in profile descriptions.
Andy Allan [Thu, 19 Dec 2019 16:05:11 +0000 (17:05 +0100)]
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
translatewiki.net [Thu, 19 Dec 2019 14:18:57 +0000 (15:18 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 18 Dec 2019 22:46:56 +0000 (22:46 +0000)]
Update COP names
Tom Hughes [Wed, 18 Dec 2019 22:14:57 +0000 (22:14 +0000)]
Update to rails 6.0.2.1
hikemaniac [Wed, 18 Dec 2019 19:32:56 +0000 (20:32 +0100)]
Let all textareas only be vertically resized
Tom Hughes [Wed, 18 Dec 2019 18:29:36 +0000 (18:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2466'
Tom Hughes [Wed, 18 Dec 2019 18:23:42 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2452'
Andy Allan [Wed, 18 Dec 2019 14:58:37 +0000 (15:58 +0100)]
Reformat params hashes to avoid super-long lines
Andy Allan [Wed, 18 Dec 2019 14:34:11 +0000 (15:34 +0100)]
Move Style/Documentation into the main config file
I don't think anyone intends to write documentation for the app
Tom Hughes [Mon, 16 Dec 2019 22:26:33 +0000 (22:26 +0000)]
Note events use "opened" not "open" as the status
Tom Hughes [Mon, 16 Dec 2019 22:12:13 +0000 (22:12 +0000)]
Rename translations for trace#delete to trace#destroy
Fixes #2465
Tom Hughes [Mon, 16 Dec 2019 21:39:05 +0000 (21:39 +0000)]
Make all translation lookup errors throw exceptions in test mode
Tom Hughes [Mon, 16 Dec 2019 21:23:09 +0000 (21:23 +0000)]
Avoid errors when /edit is called on an invalid object
translatewiki.net [Mon, 16 Dec 2019 15:08:08 +0000 (16:08 +0100)]
Localisation updates from https://translatewiki.net.
hikemaniac [Sun, 15 Dec 2019 15:04:29 +0000 (16:04 +0100)]
Fixed comment textarea going off the sidebar, added border-radius to form fields
Tom Hughes [Fri, 13 Dec 2019 18:54:06 +0000 (18:54 +0000)]
Update to rails 6.0.2
Tom Hughes [Fri, 13 Dec 2019 18:53:32 +0000 (18:53 +0000)]
Update bundle
Tom Hughes [Thu, 12 Dec 2019 19:12:38 +0000 (19:12 +0000)]
Use correct link for settings page
Tom Hughes [Thu, 12 Dec 2019 18:44:56 +0000 (18:44 +0000)]
Fix link in error page when a user has public edits disabled
mmd [Thu, 12 Dec 2019 09:40:01 +0000 (10:40 +0100)]
Add In-Reply-To, References headers to email
Closes https://github.com/openstreetmap/openstreetmap-website/issues/2430
translatewiki.net [Thu, 12 Dec 2019 14:36:38 +0000 (15:36 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 11 Dec 2019 17:48:37 +0000 (17:48 +0000)]
Fix rubocop warning
Tom Hughes [Wed, 11 Dec 2019 17:31:35 +0000 (17:31 +0000)]
Switch back to the upstream actionpack-page_caching gem
Tom Hughes [Wed, 11 Dec 2019 17:31:16 +0000 (17:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2461'
Andy Allan [Wed, 11 Dec 2019 17:08:31 +0000 (18:08 +0100)]
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.
Tom Hughes [Wed, 11 Dec 2019 16:36:40 +0000 (16:36 +0000)]
Merge remote-tracking branch 'upstream/pull/2460'
Andy Allan [Wed, 11 Dec 2019 16:22:23 +0000 (17:22 +0100)]
Wrap table header rows in thead
Tom Hughes [Wed, 11 Dec 2019 16:00:14 +0000 (16:00 +0000)]
Merge remote-tracking branch 'upstream/pull/2459'
Andy Allan [Wed, 11 Dec 2019 15:51:04 +0000 (16:51 +0100)]
Use a new colour name for the vibrant greens
Andy Allan [Wed, 11 Dec 2019 15:20:16 +0000 (16:20 +0100)]
Use paramatered colours for greys
Andy Allan [Wed, 11 Dec 2019 14:57:23 +0000 (15:57 +0100)]
Combine the two different offwhite background colours, and use the lighter one
Tom Hughes [Wed, 11 Dec 2019 10:40:41 +0000 (10:40 +0000)]
Use squiggly heredocs
Tom Hughes [Wed, 11 Dec 2019 10:21:08 +0000 (10:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2458'
Andy Allan [Wed, 11 Dec 2019 09:54:19 +0000 (10:54 +0100)]
Use squiggly heredocs instead of rails strip_heredoc
Squiggly heredocs were introduced in ruby 2.3 and I prefer the ability
to indent the closing heredoc marker.
Andy Allan [Wed, 4 Dec 2019 14:45:58 +0000 (15:45 +0100)]
Use bootstrap typography
Andy Allan [Wed, 4 Dec 2019 14:26:13 +0000 (15:26 +0100)]
Use bootstrap cards to spruce up the help page
Andy Allan [Wed, 4 Dec 2019 14:16:24 +0000 (15:16 +0100)]
Custom bootstrap with all components disabled
This lets us work through things slowly as we use more features
Andy Allan [Wed, 4 Dec 2019 13:21:14 +0000 (14:21 +0100)]
Add bootstrap 4
Andy Allan [Wed, 4 Dec 2019 12:20:45 +0000 (13:20 +0100)]
Rename bootstrap-tooltips file
This avoids clashing with including upstream bootstrap
translatewiki.net [Mon, 9 Dec 2019 15:02:49 +0000 (16:02 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 6 Dec 2019 07:09:08 +0000 (07:09 +0000)]
Update bundle
Closes #2454
translatewiki.net [Thu, 5 Dec 2019 14:35:38 +0000 (15:35 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 4 Dec 2019 21:06:19 +0000 (21:06 +0000)]
Use delete method correctly when deleting traces
Fixes #2453
Tom Hughes [Wed, 4 Dec 2019 19:58:21 +0000 (19:58 +0000)]
Fix erblint warnings