rails.git
16 months agoAdded trailing/leading whitespace errors to locale
J Guthrie [Sun, 4 Nov 2018 16:17:44 +0000 (16:17 +0000)]
Added trailing/leading whitespace errors to locale

16 months agoSpecifiy invalid chars in username error message
J Guthrie [Sun, 4 Nov 2018 16:06:23 +0000 (16:06 +0000)]
Specifiy invalid chars in username error message
 - Refactored list of invalid chars out to constant

16 months agoAllow note comments with no body
Tom Hughes [Mon, 5 Nov 2018 09:24:51 +0000 (09:24 +0000)]
Allow note comments with no body

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Nov 2018 07:57:46 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoMerge remote-tracking branch 'upstream/pull/2009'
Tom Hughes [Sun, 4 Nov 2018 14:50:14 +0000 (14:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2009'

16 months agoMerge remote-tracking branch 'upstream/pull/2042'
Tom Hughes [Sun, 4 Nov 2018 14:49:27 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2042'

16 months agoLimit notes sizes to 2000 characters
mmd-osm [Sat, 3 Nov 2018 17:32:02 +0000 (18:32 +0100)]
Limit notes sizes to 2000 characters

16 months agoMerge remote-tracking branch 'upstream/pull/2023'
Tom Hughes [Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)]
Merge remote-tracking branch 'upstream/pull/2023'

16 months agoMove abilities to a sepatarate top level directory
Tom Hughes [Sat, 3 Nov 2018 12:28:00 +0000 (12:28 +0000)]
Move abilities to a sepatarate top level directory

16 months agoMerge remote-tracking branch 'upstream/pull/2038'
Tom Hughes [Sat, 3 Nov 2018 11:58:56 +0000 (11:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2038'

16 months agoOnly use DelayedJob in production
Tom Hughes [Sat, 3 Nov 2018 11:57:25 +0000 (11:57 +0000)]
Only use DelayedJob in production

In development just let the default async adaptor be used so
that people don't need to run a daemon.

16 months agoOn hover, change border to a subtle darker orange, increase strokeWidth
J Guthrie [Fri, 2 Nov 2018 01:23:37 +0000 (01:23 +0000)]
On hover, change border to a subtle darker orange, increase strokeWidth

16 months agoUpdate to sassc 2.x
Tom Hughes [Thu, 1 Nov 2018 22:29:27 +0000 (22:29 +0000)]
Update to sassc 2.x

16 months agoUpdate bundle
Tom Hughes [Thu, 1 Nov 2018 18:23:43 +0000 (18:23 +0000)]
Update bundle

16 months agoMerge remote-tracking branch 'upstream/pull/2037'
Tom Hughes [Thu, 1 Nov 2018 18:01:25 +0000 (18:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2037'

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Nov 2018 07:19:56 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoFix new rubocop warnings
Tom Hughes [Wed, 31 Oct 2018 18:49:21 +0000 (18:49 +0000)]
Fix new rubocop warnings

16 months agoUpdate bundle
Tom Hughes [Wed, 31 Oct 2018 18:42:54 +0000 (18:42 +0000)]
Update bundle

16 months agoMerge remote-tracking branch 'upstream/pull/2039'
Tom Hughes [Wed, 31 Oct 2018 18:33:20 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/2039'

16 months agoMove notifier.rb into app/mailers
Andy Allan [Wed, 31 Oct 2018 16:17:03 +0000 (17:17 +0100)]
Move notifier.rb into app/mailers

This is the expected location for mailers

16 months agoUse deliver_later for all email sending
Andy Allan [Wed, 31 Oct 2018 15:38:12 +0000 (16:38 +0100)]
Use deliver_later for all email sending

16 months agoSet up Delayed Job as the backend for Active Job
Andy Allan [Wed, 31 Oct 2018 14:31:32 +0000 (15:31 +0100)]
Set up Delayed Job as the backend for Active Job

This persists jobs into the database, and uses locking to ensure that
workers from multiple machines avoid treading on each other.

Jobs can be run by using `bundle exec rake jobs:work`

Fixes #2015

16 months agoFix error messages when users should not be able to do things
Andy Allan [Wed, 31 Oct 2018 10:42:49 +0000 (11:42 +0100)]
Fix error messages when users should not be able to do things

16 months agoAdd testing for moderator users and issues
Andy Allan [Wed, 31 Oct 2018 10:41:32 +0000 (11:41 +0100)]
Add testing for moderator users and issues

16 months agoRemove unnecessary token granting from the user_preferences tests
Andy Allan [Wed, 31 Oct 2018 10:36:24 +0000 (11:36 +0100)]
Remove unnecessary token granting from the user_preferences tests

Sufficient permissions are granted by the basic authorisation, so this
isn't testing anything.

16 months agoMerge branch 'master' into cancancan
Andy Allan [Wed, 31 Oct 2018 10:16:47 +0000 (11:16 +0100)]
Merge branch 'master' into cancancan

16 months agoConvert some model mixins to concerns
Tom Hughes [Mon, 29 Oct 2018 19:14:55 +0000 (19:14 +0000)]
Convert some model mixins to concerns

16 months agoUpdate mailmap
Tom Hughes [Mon, 29 Oct 2018 12:48:32 +0000 (12:48 +0000)]
Update mailmap

16 months agoUpdate translation keys for renaming of user to users
Tom Hughes [Mon, 29 Oct 2018 12:45:17 +0000 (12:45 +0000)]
Update translation keys for renaming of user to users

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Oct 2018 07:12:55 +0000 (08:12 +0100)]
Localisation updates from https://translatewiki.net.

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Oct 2018 08:31:58 +0000 (10:31 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoCheck the oauth token and then use the capabilities directly
Andy Allan [Wed, 24 Oct 2018 14:48:54 +0000 (16:48 +0200)]
Check the oauth token and then use the capabilities directly

17 months agoRework capabilities to avoid assumptions about missing tokens
Andy Allan [Wed, 24 Oct 2018 10:07:00 +0000 (12:07 +0200)]
Rework capabilities to avoid assumptions about missing tokens

The logic about missing tokens implying logged in users (and that
all logged in users have access to any method protected by a token
capability) is correct. However, I believe it is both confusing and
brittle, and leaves a security-related door ajar for future foot-gun
incidents.

Instead, apply Abilities as normal, and keep the Capabilities
involvement only for situations where a token is provided. This
reduces the cognitive burden when considering Abilities in isolation.

17 months agoRework the default denied access handler to give different responses to tokens, logge...
Andy Allan [Wed, 24 Oct 2018 07:39:02 +0000 (09:39 +0200)]
Rework the default denied access handler to give different responses to tokens, logged in users and other users

17 months agoUpdate translation keys for renaming of user to users
Tom Hughes [Mon, 22 Oct 2018 09:59:05 +0000 (10:59 +0100)]
Update translation keys for renaming of user to users

Fixes #2031

17 months agoEnable line breaks in performatted text within rich text
Christopher Bazin [Tue, 29 May 2018 04:07:53 +0000 (21:07 -0700)]
Enable line breaks in performatted text within rich text

This stops redaction details being truncated at the edge of the
page when they have long lines of preformatted text.

Also use a div instead of a paragraph for redaction details so
that formatting is consistent with other rich text blocks.

Closes #1885
Fixes #1845

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Oct 2018 06:08:50 +0000 (08:08 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoCalculate bounding box when deleting relations
Simon Poole [Sun, 21 Oct 2018 18:32:12 +0000 (19:32 +0100)]
Calculate bounding box when deleting relations

Closes #2030
Fixes #2020

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Oct 2018 06:27:45 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoAvoid swapping min and max longitude in RTL mode
superDoss [Wed, 17 Oct 2018 19:37:18 +0000 (22:37 +0300)]
Avoid swapping min and max longitude in RTL mode

Closes #2027

17 months agoCombine site permissions declarations
Andy Allan [Wed, 17 Oct 2018 11:33:47 +0000 (13:33 +0200)]
Combine site permissions declarations

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Oct 2018 07:35:52 +0000 (09:35 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoadd australia copyright notice for PSMA Australia
Andrew Harvey [Sun, 14 Oct 2018 12:10:30 +0000 (23:10 +1100)]
add australia copyright notice for PSMA Australia

17 months agoResize change bounding boxes on a zoom change
Tom Hughes [Sun, 14 Oct 2018 11:28:26 +0000 (12:28 +0100)]
Resize change bounding boxes on a zoom change

17 months agoEnable automatic translation export in the test environment
Tom Hughes [Thu, 11 Oct 2018 18:14:55 +0000 (19:14 +0100)]
Enable automatic translation export in the test environment

Fixes #2016

17 months agoAdjust minimum changeset bbox to 20 pixels
Tom Hughes [Thu, 11 Oct 2018 17:52:00 +0000 (18:52 +0100)]
Adjust minimum changeset bbox to 20 pixels

17 months agoImprove variable naming
Tom Hughes [Thu, 11 Oct 2018 17:51:45 +0000 (18:51 +0100)]
Improve variable naming

17 months agoMerge remote-tracking branch 'upstream/pull/2018'
Tom Hughes [Thu, 11 Oct 2018 17:47:47 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2018'

17 months agoTidy up notes#search
Tom Hughes [Thu, 11 Oct 2018 17:32:31 +0000 (18:32 +0100)]
Tidy up notes#search

17 months agoUse "user" as user id parameter for notes searches
Tom Hughes [Thu, 11 Oct 2018 17:30:53 +0000 (18:30 +0100)]
Use "user" as user id parameter for notes searches

17 months agoMerge remote-tracking branch 'upstream/pull/1955'
Tom Hughes [Thu, 11 Oct 2018 16:41:47 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1955'

17 months agoSuppress changeset pagination for inactive users
Tom Hughes [Thu, 11 Oct 2018 08:33:24 +0000 (09:33 +0100)]
Suppress changeset pagination for inactive users

Fixes #2024

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Oct 2018 07:13:43 +0000 (09:13 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoFix Rubocop issue
ENT8R [Thu, 11 Oct 2018 06:36:13 +0000 (08:36 +0200)]
Fix Rubocop issue

17 months agoFix some issues and improve code
ENT8R [Wed, 10 Oct 2018 17:29:11 +0000 (19:29 +0200)]
Fix some issues and improve code

17 months agoRemove temporary development code
Andy Allan [Wed, 10 Oct 2018 14:54:16 +0000 (16:54 +0200)]
Remove temporary development code

17 months agoRefactor to show the Issues link based on the calculated permissions
Andy Allan [Wed, 10 Oct 2018 14:42:01 +0000 (16:42 +0200)]
Refactor to show the Issues link based on the calculated permissions

17 months agoMove issues and reports to authorization system
Andy Allan [Wed, 10 Oct 2018 14:34:44 +0000 (16:34 +0200)]
Move issues and reports to authorization system

17 months agoFix typo in method name
Andy Allan [Wed, 10 Oct 2018 09:55:00 +0000 (11:55 +0200)]
Fix typo in method name

17 months agoRefactor site#welcome to use abilities instead of require_user
Andy Allan [Wed, 10 Oct 2018 09:49:45 +0000 (11:49 +0200)]
Refactor site#welcome to use abilities instead of require_user

17 months agoChange abilities based on upstream renamings
Andy Allan [Wed, 10 Oct 2018 09:40:41 +0000 (11:40 +0200)]
Change abilities based on upstream renamings

17 months agoMerge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into...
Andy Allan [Wed, 10 Oct 2018 09:26:30 +0000 (11:26 +0200)]
Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz

17 months agoMake paragraph breaks more visible in changeset and note comments
Tom Hughes [Tue, 9 Oct 2018 14:14:35 +0000 (15:14 +0100)]
Make paragraph breaks more visible in changeset and note comments

Fixes #2022

17 months agoFix Rubocop issue
ENT8R [Tue, 9 Oct 2018 12:50:55 +0000 (14:50 +0200)]
Fix Rubocop issue

17 months agoFix an issue where the query did not work if a display name or an id was specified
ENT8R [Tue, 9 Oct 2018 12:37:55 +0000 (14:37 +0200)]
Fix an issue where the query did not work if a display name or an id was specified

17 months agoMerge branch 'master' into notes-search
ENT8R [Tue, 9 Oct 2018 09:41:22 +0000 (11:41 +0200)]
Merge branch 'master' into notes-search

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 9 Oct 2018 08:29:33 +0000 (10:29 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoConverted to dot notation - fixes jshint
J Guthrie [Sat, 6 Oct 2018 23:52:11 +0000 (00:52 +0100)]
Converted to dot notation - fixes jshint

17 months agoConvert degrees min-width to pixels min-width
J Guthrie [Sat, 6 Oct 2018 23:33:54 +0000 (00:33 +0100)]
Convert degrees min-width to pixels min-width

17 months agoRename CSS class matches for change in controller name
Tom Hughes [Thu, 4 Oct 2018 21:32:10 +0000 (22:32 +0100)]
Rename CSS class matches for change in controller name

17 months agoRemove temorary routes
Tom Hughes [Wed, 3 Oct 2018 21:50:43 +0000 (22:50 +0100)]
Remove temorary routes

17 months agoImprove formatting
Tom Hughes [Wed, 3 Oct 2018 21:39:27 +0000 (22:39 +0100)]
Improve formatting

17 months agoMerge remote-tracking branch 'upstream/pull/2010'
Tom Hughes [Wed, 3 Oct 2018 21:39:17 +0000 (22:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2010'

17 months agoUpdated min bounds algorithm
J Guthrie [Wed, 3 Oct 2018 21:07:20 +0000 (22:07 +0100)]
Updated min bounds algorithm

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Wed, 3 Oct 2018 20:18:47 +0000 (22:18 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoMerge remote-tracking branch 'upstream/pull/2014'
Tom Hughes [Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/2014'

17 months agoMerge remote-tracking branch 'upstream/pull/2012'
Tom Hughes [Wed, 3 Oct 2018 17:54:19 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2012'

17 months agoRename user_controller to users_controller
Andy Allan [Wed, 3 Oct 2018 13:31:10 +0000 (15:31 +0200)]
Rename user_controller to users_controller

17 months agoRemove rubocop reference to quad_tile code
Andy Allan [Wed, 3 Oct 2018 12:07:10 +0000 (14:07 +0200)]
Remove rubocop reference to quad_tile code

17 months agoMerge branch 'master' into messages
Andy Allan [Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)]
Merge branch 'master' into messages

17 months agoBump max blocklength for additional routes
Andy Allan [Wed, 3 Oct 2018 12:00:38 +0000 (14:00 +0200)]
Bump max blocklength for additional routes

17 months agoChangeset boundary is enlarged if it was on a single point
J Guthrie [Tue, 2 Oct 2018 22:56:42 +0000 (23:56 +0100)]
Changeset boundary is enlarged if it was on a single point

17 months agoChangeset border turns blue on hover
J Guthrie [Tue, 2 Oct 2018 22:39:27 +0000 (23:39 +0100)]
Changeset border turns blue on hover

17 months agoUse sshfs in preference to nfs for vagrant file sharing
Tom Hughes [Fri, 28 Sep 2018 18:51:26 +0000 (19:51 +0100)]
Use sshfs in preference to nfs for vagrant file sharing

17 months agoUpdate vagrant config to use Ubuntu 18.04
Tom Hughes [Fri, 28 Sep 2018 18:51:09 +0000 (19:51 +0100)]
Update vagrant config to use Ubuntu 18.04

18 months agoUpdate wiki page data
Tom Hughes [Wed, 26 Sep 2018 22:28:40 +0000 (23:28 +0100)]
Update wiki page data

18 months agoStop wiki update script trying to be "helpful"
Tom Hughes [Wed, 26 Sep 2018 21:43:30 +0000 (22:43 +0100)]
Stop wiki update script trying to be "helpful"

Instead of trying to advise how to import some (but not all) of
the modules, just require them in the normal way.

Closes #1763

18 months agoFix any_relations always being false
Xuyang Jia [Sat, 22 Sep 2018 16:40:44 +0000 (17:40 +0100)]
Fix any_relations always being false

Closes #1976

18 months agoFix Style/NumericPredicate rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:34:58 +0000 (17:34 +0100)]
Fix Style/NumericPredicate rubocop warnings

18 months agoFix Style/SafeNavigation rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:21:06 +0000 (17:21 +0100)]
Fix Style/SafeNavigation rubocop warnings

18 months agoFix new rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:12:29 +0000 (17:12 +0100)]
Fix new rubocop warnings

18 months agoUpdate bundle
Tom Hughes [Sat, 22 Sep 2018 16:08:49 +0000 (17:08 +0100)]
Update bundle

18 months agoMerge remote-tracking branch 'upstream/pull/2000'
Tom Hughes [Sat, 22 Sep 2018 16:03:50 +0000 (17:03 +0100)]
Merge remote-tracking branch 'upstream/pull/2000'

18 months agoMerge remote-tracking branch 'upstream/pull/2001'
Tom Hughes [Sat, 22 Sep 2018 16:02:50 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2001'

18 months agoRemove Imperial from hosting credits
Tom Hughes [Sat, 22 Sep 2018 15:57:53 +0000 (16:57 +0100)]
Remove Imperial from hosting credits

Fixes #1944

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Sep 2018 09:16:54 +0000 (11:16 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoFix incorrect reference to 12.04 in installation notes
Andy Allan [Wed, 19 Sep 2018 13:34:49 +0000 (14:34 +0100)]
Fix incorrect reference to 12.04 in installation notes

18 months agoSet the rubocop target version to 2.3
Andy Allan [Wed, 19 Sep 2018 13:25:31 +0000 (14:25 +0100)]
Set the rubocop target version to 2.3

This allows rubocop to run additional cops that would not apply to
older ruby versions

18 months agoRemove bogus translation
Tom Hughes [Thu, 13 Sep 2018 18:36:32 +0000 (19:36 +0100)]
Remove bogus translation

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Sep 2018 06:17:04 +0000 (08:17 +0200)]
Localisation updates from https://translatewiki.net.