rails.git
2 years agoMerge remote-tracking branch 'upstream/pull/2381'
Tom Hughes [Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2381'

2 years agoKeep the behaviour backwards-compatible
ENT8R [Wed, 19 Feb 2020 11:58:47 +0000 (12:58 +0100)]
Keep the behaviour backwards-compatible

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Feb 2020 14:01:18 +0000 (15:01 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoFix macosx-bundle-config link typo
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo

Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.

2 years agoMerge remote-tracking branch 'upstream/pull/2540'
Tom Hughes [Mon, 17 Feb 2020 10:22:12 +0000 (10:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2540'

2 years agoImprove macOS install notes
Andreas Hubel [Mon, 17 Feb 2020 09:21:57 +0000 (10:21 +0100)]
Improve macOS install notes

2 years agoMerge remote-tracking branch 'upstream/pull/2539'
Tom Hughes [Sun, 16 Feb 2020 23:05:55 +0000 (23:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2539'

2 years agoFix macosx-bundle-config link typo
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo

Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.

2 years agoUpdate to iD v2.17.2
Bryan Housel [Fri, 14 Feb 2020 17:01:56 +0000 (12:01 -0500)]
Update to iD v2.17.2

2 years agoUpdate bundle
Tom Hughes [Thu, 13 Feb 2020 20:51:12 +0000 (20:51 +0000)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/2534'
Tom Hughes [Thu, 13 Feb 2020 12:38:24 +0000 (12:38 +0000)]
Merge remote-tracking branch 'upstream/pull/2534'

2 years agofix help page, grid card layout on mobile
Anton Melnichuk [Thu, 13 Feb 2020 12:18:49 +0000 (14:18 +0200)]
fix help page, grid card layout on mobile

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Feb 2020 11:40:38 +0000 (12:40 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAllow the embed page to be embedded in third party frames
Tom Hughes [Wed, 12 Feb 2020 11:18:00 +0000 (11:18 +0000)]
Allow the embed page to be embedded in third party frames

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Feb 2020 13:58:42 +0000 (14:58 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Feb 2020 14:03:08 +0000 (15:03 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Mon, 3 Feb 2020 22:43:15 +0000 (22:43 +0000)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Feb 2020 14:46:30 +0000 (15:46 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Jan 2020 14:55:21 +0000 (15:55 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/2526'
Tom Hughes [Thu, 30 Jan 2020 13:23:38 +0000 (13:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2526'

2 years agoFix border spacing for sidebar tags and routing tables
Andy Allan [Thu, 30 Jan 2020 12:34:29 +0000 (13:34 +0100)]
Fix border spacing for sidebar tags and routing tables

The reset code for border spacing was removed in 5c933868dbff and
led to minor artifacts in these two tables.

2 years agoRemove list styling from various sidebar lists
Andy Allan [Thu, 30 Jan 2020 12:14:53 +0000 (13:14 +0100)]
Remove list styling from various sidebar lists

2 years agoMerge remote-tracking branch 'upstream/pull/2525'
Tom Hughes [Thu, 30 Jan 2020 10:07:59 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2525'

2 years agoUse an unstyled list for the login buttons
Andy Allan [Thu, 30 Jan 2020 09:24:08 +0000 (10:24 +0100)]
Use an unstyled list for the login buttons

2 years agoMerge remote-tracking branch 'upstream/pull/2524'
Tom Hughes [Wed, 29 Jan 2020 17:55:55 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/2524'

2 years agoTweak the dropdown menu hover and active colours
Andy Allan [Wed, 29 Jan 2020 16:49:41 +0000 (17:49 +0100)]
Tweak the dropdown menu hover and active colours

2 years agoFurther tweaks to the navigation dropdown button colours
Andy Allan [Wed, 29 Jan 2020 16:40:36 +0000 (17:40 +0100)]
Further tweaks to the navigation dropdown button colours

2 years agoDon't highlight border when hovering on user-menu button
Andy Allan [Wed, 29 Jan 2020 16:18:12 +0000 (17:18 +0100)]
Don't highlight border when hovering on user-menu button

2 years agoStyling for disabled edit button
Andy Allan [Wed, 29 Jan 2020 16:14:43 +0000 (17:14 +0100)]
Styling for disabled edit button

2 years agoTweak positioning of inbox count on the user menu button
Andy Allan [Wed, 29 Jan 2020 16:00:01 +0000 (17:00 +0100)]
Tweak positioning of inbox count on the user menu button

2 years agoSwitch to bootstrap for dropdowns and tooltips
Andy Allan [Wed, 29 Jan 2020 15:54:29 +0000 (16:54 +0100)]
Switch to bootstrap for dropdowns and tooltips

Due to the javascript involved, it was more straightforward to combine
the two together. Moving to bootstrap v4 for dropdowns required some
redesign of the dropdown menu html, and the opportunity was taken to
move to using standard buttons for those menus.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Jan 2020 16:47:33 +0000 (17:47 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoRe-enable minification of javascript assets
Tom Hughes [Mon, 27 Jan 2020 08:43:30 +0000 (08:43 +0000)]
Re-enable minification of javascript assets

Rails 6 defaults to --skip-javascript when creating new environments
because by default it uses webpacker instead of sprockets to manage
javascript and that meant that I accidentally merged a change that
disabled the minification of javascript.

Fixes #2522

2 years agoMerge remote-tracking branch 'upstream/pull/2521'
Tom Hughes [Sun, 26 Jan 2020 18:48:59 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/2521'

2 years agoMerge remote-tracking branch 'upstream/pull/2519'
Tom Hughes [Sun, 26 Jan 2020 18:46:30 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/2519'

2 years agofurther linting stuff
Holger Jeromin [Sun, 26 Jan 2020 10:26:58 +0000 (11:26 +0100)]
further linting stuff

2 years agofixing linting
Holger Jeromin [Sun, 26 Jan 2020 10:22:50 +0000 (11:22 +0100)]
fixing linting

2 years agoPrevent exceptions while reversing directions
Holger Jeromin [Sun, 26 Jan 2020 10:01:45 +0000 (11:01 +0100)]
Prevent exceptions while reversing directions

2 years agoFix typo: change 'noreferer' to 'noreferrer'
Andreas Geyer-Schulz [Sat, 25 Jan 2020 19:10:23 +0000 (20:10 +0100)]
Fix typo: change 'noreferer' to 'noreferrer'

as the correct rel attribute in external links.

2 years agoUpdate bundle
Tom Hughes [Thu, 23 Jan 2020 18:39:02 +0000 (18:39 +0000)]
Update bundle

Closes #2517

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Jan 2020 15:18:01 +0000 (16:18 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Jan 2020 10:41:08 +0000 (11:41 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate bundle
Tom Hughes [Mon, 20 Jan 2020 09:55:32 +0000 (09:55 +0000)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/2512'
Tom Hughes [Fri, 17 Jan 2020 00:06:13 +0000 (00:06 +0000)]
Merge remote-tracking branch 'upstream/pull/2512'

2 years agoUpdate to iD v2.17.1
Quincy Morgan [Thu, 16 Jan 2020 23:56:46 +0000 (18:56 -0500)]
Update to iD v2.17.1

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Jan 2020 14:37:49 +0000 (15:37 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/2510'
Tom Hughes [Thu, 16 Jan 2020 11:42:18 +0000 (11:42 +0000)]
Merge remote-tracking branch 'upstream/pull/2510'

2 years agoMerge remote-tracking branch 'upstream/pull/2509'
Tom Hughes [Thu, 16 Jan 2020 11:42:12 +0000 (11:42 +0000)]
Merge remote-tracking branch 'upstream/pull/2509'

2 years agoMove the search results to use list-group-flush
Andy Allan [Wed, 15 Jan 2020 16:00:58 +0000 (17:00 +0100)]
Move the search results to use list-group-flush

2 years agoRemove list styling from the lists used in the layers sidebar
Andy Allan [Thu, 16 Jan 2020 10:33:46 +0000 (11:33 +0100)]
Remove list styling from the lists used in the layers sidebar

2 years agoAdd query-result classes for errors and nothing_found messages
Andy Allan [Wed, 15 Jan 2020 15:59:49 +0000 (16:59 +0100)]
Add query-result classes for errors and nothing_found messages

2 years agoMerge remote-tracking branch 'upstream/pull/2508'
Tom Hughes [Wed, 15 Jan 2020 18:24:24 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2508'

2 years agoRemove last custom reset styles
Andy Allan [Wed, 15 Jan 2020 15:16:43 +0000 (16:16 +0100)]
Remove last custom reset styles

2 years agoRemove more reset styles that are handled by bootstrap
Andy Allan [Wed, 15 Jan 2020 15:14:42 +0000 (16:14 +0100)]
Remove more reset styles that are handled by bootstrap

2 years agoRemove some reset styles and clearfix
Andy Allan [Wed, 15 Jan 2020 15:03:13 +0000 (16:03 +0100)]
Remove some reset styles and clearfix

These are included in bootstrap

2 years agoRemove list style reset, and add overrides where necessary
Andy Allan [Wed, 15 Jan 2020 14:51:29 +0000 (15:51 +0100)]
Remove list style reset, and add overrides where necessary

This allows the bootstrap list typography to work without being overridden. It also means
that lists look like normal lists by default, instead of needing to be recreated from
scratch each time. Only the cases where padding and discs are unwanted need to have
custom CSS.

2 years agoRename form-row to standard-form-row to avoid clashing with a bootstrap class
Andy Allan [Wed, 15 Jan 2020 12:23:53 +0000 (13:23 +0100)]
Rename form-row to standard-form-row to avoid clashing with a bootstrap class

2 years agoMerge remote-tracking branch 'upstream/pull/2507'
Tom Hughes [Wed, 15 Jan 2020 14:19:11 +0000 (14:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2507'

2 years agoMerge remote-tracking branch 'upstream/pull/2506'
Tom Hughes [Wed, 15 Jan 2020 14:18:11 +0000 (14:18 +0000)]
Merge remote-tracking branch 'upstream/pull/2506'

2 years agoMerge remote-tracking branch 'upstream/pull/2505'
Tom Hughes [Wed, 15 Jan 2020 12:17:10 +0000 (12:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2505'

2 years agoMerge remote-tracking branch 'upstream/pull/2504'
Tom Hughes [Wed, 15 Jan 2020 12:16:24 +0000 (12:16 +0000)]
Merge remote-tracking branch 'upstream/pull/2504'

2 years agoRework issues display page to be responsive
Andy Allan [Wed, 15 Jan 2020 10:58:47 +0000 (11:58 +0100)]
Rework issues display page to be responsive

This change uses the bootstrap grid to make the issues page responsive,
and avoids having lots of custom widths of divs specified via CSS.

It also changes the display of the reports and comments to be more
like diary entry comments, by having all metadata on one line and shown
before the comment / report text.

2 years agoMinor tweaks to copyright heading
Andy Allan [Wed, 15 Jan 2020 11:09:06 +0000 (12:09 +0100)]
Minor tweaks to copyright heading

This fixes a small bug where the hr was shown even when not required,
by ensuring the test is run before creating the content.

Also fixes where an h1 tag was used instead of a div.

2 years agoMerge remote-tracking branch 'upstream/pull/2495'
Tom Hughes [Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2495'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Jan 2020 15:31:14 +0000 (16:31 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoRemove extra div wrappings from list items
Andy Allan [Thu, 2 Jan 2020 10:48:24 +0000 (11:48 +0100)]
Remove extra div wrappings from list items

These are unnecessary, and also prevent the secondary-actions vertical
border from appearing.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Jan 2020 19:29:03 +0000 (20:29 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoAvoid double escaping a name
Tom Hughes [Thu, 9 Jan 2020 11:05:08 +0000 (11:05 +0000)]
Avoid double escaping a name

2 years agoMerge remote-tracking branch 'upstream/pull/2500'
Tom Hughes [Thu, 9 Jan 2020 11:03:34 +0000 (11:03 +0000)]
Merge remote-tracking branch 'upstream/pull/2500'

2 years agoFix translation names
Tom Hughes [Thu, 9 Jan 2020 11:00:46 +0000 (11:00 +0000)]
Fix translation names

2 years agoDon't validate the revoker for a block if it hasn't changed
Tom Hughes [Thu, 9 Jan 2020 10:59:34 +0000 (10:59 +0000)]
Don't validate the revoker for a block if it hasn't changed

The revoker only has to be a moderator at the time they make the
revocation - as things stood trying to view a block that had been
revoked by somebody that was no longer a moderator failed.

2 years agoMerge remote-tracking branch 'upstream/pull/2499'
Tom Hughes [Thu, 9 Jan 2020 10:36:31 +0000 (10:36 +0000)]
Merge remote-tracking branch 'upstream/pull/2499'

2 years agoMerge remote-tracking branch 'upstream/pull/2498'
Tom Hughes [Thu, 9 Jan 2020 10:31:37 +0000 (10:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2498'

2 years agoFix indentation of query results
Tom Hughes [Thu, 9 Jan 2020 10:26:16 +0000 (10:26 +0000)]
Fix indentation of query results

2 years agoMerge remote-tracking branch 'upstream/pull/2497'
Tom Hughes [Thu, 9 Jan 2020 10:10:10 +0000 (10:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2497'

2 years agoMerge remote-tracking branch 'upstream/pull/2496'
Tom Hughes [Thu, 9 Jan 2020 10:06:25 +0000 (10:06 +0000)]
Merge remote-tracking branch 'upstream/pull/2496'

2 years agoFix typos
Andy Allan [Thu, 9 Jan 2020 09:06:20 +0000 (10:06 +0100)]
Fix typos

2 years agoAvoid double-escaping display names when sent through the translation system
Andy Allan [Wed, 8 Jan 2020 18:07:18 +0000 (19:07 +0100)]
Avoid double-escaping display names when sent through the translation system

They are escaped properly without the h() call, and doing that just double-escapes them

2 years agoUpdate tests to ensure referer is working
Andy Allan [Wed, 8 Jan 2020 17:26:57 +0000 (18:26 +0100)]
Update tests to ensure referer is working

This reinstates the form tests in the controller test, but uses
the system tests to actually click the button and make sure that
it works

2 years agoRemove the custom basic grid css rules
Andy Allan [Wed, 8 Jan 2020 16:36:38 +0000 (17:36 +0100)]
Remove the custom basic grid css rules

This is now unused, and the bootstrap grid is much more powerful.

2 years agoUse bootstrap grid for signup page
Andy Allan [Wed, 8 Jan 2020 16:22:01 +0000 (17:22 +0100)]
Use bootstrap grid for signup page

This allows us to have the two sections one above the other on small screens,
with the call to action text first, and then side-by-side above the sm
breakpoint with the cta on the right.

2 years agoRemove the custom layout css from the terms page
Andy Allan [Wed, 8 Jan 2020 16:04:53 +0000 (17:04 +0100)]
Remove the custom layout css from the terms page

This uses bootstrap utilities where necessary. It also removes the
terms page from a padding override, which was then in turn overridden
by a padding class applied to the form!

2 years agoRefactor the welcome page to use the bootstrap grid and alert box
Andy Allan [Wed, 8 Jan 2020 15:41:17 +0000 (16:41 +0100)]
Refactor the welcome page to use the bootstrap grid and alert box

The two columns work well side-by-side even at small screen widths.

2 years agoRefactor the fixthemap page to use the bootstrap responsive grid
Andy Allan [Wed, 8 Jan 2020 15:27:39 +0000 (16:27 +0100)]
Refactor the fixthemap page to use the bootstrap responsive grid

This ensures that on small screens, the 'how to help' sections
are one above the other, and on larger screens they are side-by-side

2 years agoRemove extra styling for rss icon
Andy Allan [Wed, 8 Jan 2020 15:08:18 +0000 (16:08 +0100)]
Remove extra styling for rss icon

This brings it into line with e.g. the new diary entry icon

2 years agoRework changeset descriptions to use h6 tags, and refactor changeset lists to use...
Andy Allan [Wed, 8 Jan 2020 15:04:37 +0000 (16:04 +0100)]
Rework changeset descriptions to use h6 tags, and refactor changeset lists to use list-group-flush

The descriptions are probably best not as a header, but still needs to be something more prominent than surrounding text.

2 years agoRemove font size override on sidebar tags tables
Andy Allan [Wed, 8 Jan 2020 15:01:07 +0000 (16:01 +0100)]
Remove font size override on sidebar tags tables

2 years agoRefactor the query results to use bootstrap list-group-flush
Andy Allan [Wed, 8 Jan 2020 15:00:18 +0000 (16:00 +0100)]
Refactor the query results to use bootstrap list-group-flush

2 years agoUse a post link to logout
Andy Allan [Wed, 8 Jan 2020 13:01:17 +0000 (14:01 +0100)]
Use a post link to logout

This avoids needing to access the session id, which is currently
only working with the memcache store.

The fallback page is preserved for anyone who wants to logout without
using javascript.

Refs #2488

2 years agoRemove fallback to hostip.info
Tom Hughes [Mon, 6 Jan 2020 19:14:12 +0000 (19:14 +0000)]
Remove fallback to hostip.info

We haven't used hostip.info in production for years, except
for when we did so by accident, leading to a two hour partial
outage when it went down.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Jan 2020 17:04:50 +0000 (18:04 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMake sure custom settings are picked up by tests
Tom Hughes [Sun, 5 Jan 2020 19:44:30 +0000 (19:44 +0000)]
Make sure custom settings are picked up by tests

Version 2.1.0 of the config removes settings.local.yml from
the files read in the test environment.

2 years agoUpdate bundle
Tom Hughes [Sun, 5 Jan 2020 19:04:55 +0000 (19:04 +0000)]
Update bundle

2 years agoAdd some missing _html suffixes
Tom Hughes [Sun, 5 Jan 2020 19:01:54 +0000 (19:01 +0000)]
Add some missing _html suffixes

2 years agoMerge remote-tracking branch 'upstream/pull/2494'
Tom Hughes [Sun, 5 Jan 2020 18:51:42 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2494'

2 years agoSet X-Entity-Ref-ID header on notification emails
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.

2 years agoUse ActionView's safe_join to avoid using raw when joining arrays of text
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

2 years agoUse _html suffix to avoid using raw when displaying translated strings
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.

2 years agoUse _html suffix to avoid using raw when displaying translated strings
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.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Jan 2020 13:54:42 +0000 (14:54 +0100)]
Localisation updates from https://translatewiki.net.