]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years agoUse CanCanCan for redaction authorizations
Andy Allan [Wed, 7 Nov 2018 12:28:58 +0000 (13:28 +0100)]
Use CanCanCan for redaction authorizations

6 years agoMigrate UserBlocksController to use CanCanCan
Andy Allan [Wed, 7 Nov 2018 12:07:08 +0000 (13:07 +0100)]
Migrate UserBlocksController to use CanCanCan

6 years agoReduce the max class length after splitting the changeset comments controller tests out
Andy Allan [Wed, 7 Nov 2018 10:25:12 +0000 (11:25 +0100)]
Reduce the max class length after splitting the changeset comments controller tests out

6 years agoUse relative translations for changeset comments
Andy Allan [Wed, 7 Nov 2018 10:07:29 +0000 (11:07 +0100)]
Use relative translations for changeset comments

6 years agoRename hide_comment and unhide_comment to destroy and restore
Andy Allan [Wed, 7 Nov 2018 09:51:43 +0000 (10:51 +0100)]
Rename hide_comment and unhide_comment to destroy and restore

This preserves the API endpoints and HTTP methods, which could be changed in the next API version

6 years agoRename comments_feed to index
Andy Allan [Wed, 7 Nov 2018 08:58:21 +0000 (09:58 +0100)]
Rename comments_feed to index

6 years agoRename comment to create
Andy Allan [Wed, 31 Oct 2018 19:01:01 +0000 (20:01 +0100)]
Rename comment to create

6 years agoSplit changeset comment handling into a changeset_comments controller
Andy Allan [Wed, 31 Oct 2018 18:56:26 +0000 (19:56 +0100)]
Split changeset comment handling into a changeset_comments controller

6 years agoFix rubocop warning
Tom Hughes [Wed, 7 Nov 2018 09:16:14 +0000 (09:16 +0000)]
Fix rubocop warning

6 years agoMerge remote-tracking branch 'upstream/pull/2049'
Tom Hughes [Wed, 7 Nov 2018 09:03:01 +0000 (09:03 +0000)]
Merge remote-tracking branch 'upstream/pull/2049'

6 years agoUpdate leaflet.locate.js
Dominik Moritz [Wed, 7 Nov 2018 05:04:16 +0000 (21:04 -0800)]
Update leaflet.locate.js

6 years agoAvoid ordering points from public and private traces
Tom Hughes [Wed, 7 Nov 2018 08:57:14 +0000 (08:57 +0000)]
Avoid ordering points from public and private traces

Closes #2046

6 years agoMerge remote-tracking branch 'upstream/pull/2044'
Tom Hughes [Mon, 5 Nov 2018 21:22:48 +0000 (21:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2044'

6 years agoUse character validate to exclude URL characters for trace tags
Tom Hughes [Mon, 5 Nov 2018 19:07:26 +0000 (19:07 +0000)]
Use character validate to exclude URL characters for trace tags

6 years agoImprove character validator error messages
Tom Hughes [Mon, 5 Nov 2018 18:58:08 +0000 (18:58 +0000)]
Improve character validator error messages

6 years agoMerge character validators
Tom Hughes [Mon, 5 Nov 2018 18:54:19 +0000 (18:54 +0000)]
Merge character validators

6 years agoMerge leading and trailing whitespace validators
Tom Hughes [Mon, 5 Nov 2018 18:29:17 +0000 (18:29 +0000)]
Merge leading and trailing whitespace validators

6 years agoImprove consistency of text validations
Tom Hughes [Mon, 5 Nov 2018 17:06:48 +0000 (17:06 +0000)]
Improve consistency of text validations

6 years agoAdded tests for validators
J Guthrie [Mon, 5 Nov 2018 15:41:35 +0000 (15:41 +0000)]
Added tests for validators

6 years agoChanged User model to not allow nil display_name (w/ tests)
J Guthrie [Mon, 5 Nov 2018 15:40:37 +0000 (15:40 +0000)]
Changed User model to not allow nil display_name (w/ tests)

6 years agoConverted invalid_chars validator to use locale
J Guthrie [Mon, 5 Nov 2018 01:55:25 +0000 (01:55 +0000)]
Converted invalid_chars validator to use locale

6 years agoFix rubocop errors
J Guthrie [Sun, 4 Nov 2018 18:52:45 +0000 (18:52 +0000)]
Fix rubocop errors

6 years agoCreate invalid_char validators and apply to models
J Guthrie [Sun, 4 Nov 2018 18:28:27 +0000 (18:28 +0000)]
Create invalid_char validators and apply to models

6 years agoAdded more non-ascii chars to validation (matching list of chars in other models)
J Guthrie [Sun, 4 Nov 2018 16:47:02 +0000 (16:47 +0000)]
Added more non-ascii chars to validation (matching list of chars in other models)

6 years agoFix rubucop errors
J Guthrie [Sun, 4 Nov 2018 16:40:01 +0000 (16:40 +0000)]
Fix rubucop errors

6 years agoMake invalid char list more explicit (between ascii and non ascii chars)
J Guthrie [Sun, 4 Nov 2018 16:22:41 +0000 (16:22 +0000)]
Make invalid char list more explicit (between ascii and non ascii chars)

6 years 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

6 years 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

6 years 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

6 years 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.

6 years 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'

6 years 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'

6 years 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

6 years 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'

6 years 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

6 years 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'

6 years 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.

6 years 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

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

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

6 years 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'

6 years 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.

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

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

6 years 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'

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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.

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

6 years 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

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

6 years 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

6 years 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.

6 years 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.

6 years 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

6 years 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.

6 years 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

6 years 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

6 years 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

6 years 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.

6 years 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

6 years 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.

6 years 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

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

6 years 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.

6 years 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

6 years 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

6 years 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

6 years 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

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

6 years 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'

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

6 years 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

6 years 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'

6 years 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

6 years 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.

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

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

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

6 years 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

6 years 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

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

6 years 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

6 years 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

6 years 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

6 years 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

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

6 years 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

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

6 years 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.

6 years 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

6 years 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

6 years 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

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

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

6 years 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'

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