]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 14 Nov 2018 12:43:35 +0000 (12:43 +0000)]
Merge remote-tracking branch 'upstream/pull/2061'
Andy Allan [Wed, 14 Nov 2018 11:25:21 +0000 (12:25 +0100)]
Add a changeset to exercise that part of the contact rendering
Andy Allan [Wed, 14 Nov 2018 11:18:53 +0000 (12:18 +0100)]
Ensure that the blocked template rendering works
Andy Allan [Wed, 14 Nov 2018 11:09:46 +0000 (12:09 +0100)]
Check that a request that requires authentication is redirected when the user hasn't seen the terms
Tom Hughes [Wed, 14 Nov 2018 10:48:18 +0000 (10:48 +0000)]
Merge remote-tracking branch 'upstream/pull/2058'
Andy Allan [Wed, 7 Nov 2018 16:12:23 +0000 (17:12 +0100)]
Pluralize changesets controller
Tom Hughes [Tue, 13 Nov 2018 13:17:19 +0000 (13:17 +0000)]
Skip CSRF verification for changeset comment actions
Fixes #2057
translatewiki.net [Mon, 12 Nov 2018 07:48:53 +0000 (08:48 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 9 Nov 2018 16:07:35 +0000 (16:07 +0000)]
Update Potlatch 2 to
2.5-57-gaa163622 build
Tom Hughes [Fri, 9 Nov 2018 14:33:00 +0000 (14:33 +0000)]
Update Potlatch 2 to
2.5-56-g550aab49 build
Tom Hughes [Thu, 8 Nov 2018 19:09:56 +0000 (19:09 +0000)]
Attempt to send pretty 403 errors to web browsers
Tom Hughes [Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2051'
Tom Hughes [Thu, 8 Nov 2018 17:44:57 +0000 (17:44 +0000)]
Merge remote-tracking branch 'upstream/pull/2052'
Tom Hughes [Thu, 8 Nov 2018 17:31:30 +0000 (17:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2050'
translatewiki.net [Thu, 8 Nov 2018 09:08:59 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 7 Nov 2018 15:55:38 +0000 (15:55 +0000)]
Merge remote-tracking branch 'upstream/pull/2053'
Andy Allan [Wed, 7 Nov 2018 15:48:48 +0000 (16:48 +0100)]
Remove unnecessary include from redaction model test
Andy Allan [Wed, 7 Nov 2018 15:42:11 +0000 (16:42 +0100)]
Remove unnecessary require statements from tests
Andy Allan [Wed, 7 Nov 2018 15:31:04 +0000 (16:31 +0100)]
Pluralize diary entries controller
Andy Allan [Wed, 7 Nov 2018 15:02:22 +0000 (16:02 +0100)]
Pluralize old_ controllers
Andy Allan [Wed, 7 Nov 2018 14:53:04 +0000 (15:53 +0100)]
Pluralize nodes, ways and relations controllers
Andy Allan [Wed, 7 Nov 2018 12:28:58 +0000 (13:28 +0100)]
Use CanCanCan for redaction authorizations
Andy Allan [Wed, 7 Nov 2018 12:07:08 +0000 (13:07 +0100)]
Migrate UserBlocksController to use CanCanCan
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
Andy Allan [Wed, 7 Nov 2018 10:07:29 +0000 (11:07 +0100)]
Use relative translations for changeset comments
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
Andy Allan [Wed, 7 Nov 2018 08:58:21 +0000 (09:58 +0100)]
Rename comments_feed to index
Andy Allan [Wed, 31 Oct 2018 19:01:01 +0000 (20:01 +0100)]
Rename comment to create
Andy Allan [Wed, 31 Oct 2018 18:56:26 +0000 (19:56 +0100)]
Split changeset comment handling into a changeset_comments controller
Tom Hughes [Wed, 7 Nov 2018 09:16:14 +0000 (09:16 +0000)]
Fix rubocop warning
Tom Hughes [Wed, 7 Nov 2018 09:03:01 +0000 (09:03 +0000)]
Merge remote-tracking branch 'upstream/pull/2049'
Dominik Moritz [Wed, 7 Nov 2018 05:04:16 +0000 (21:04 -0800)]
Update leaflet.locate.js
Tom Hughes [Wed, 7 Nov 2018 08:57:14 +0000 (08:57 +0000)]
Avoid ordering points from public and private traces
Closes #2046
Tom Hughes [Mon, 5 Nov 2018 21:22:48 +0000 (21:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2044'
Tom Hughes [Mon, 5 Nov 2018 19:07:26 +0000 (19:07 +0000)]
Use character validate to exclude URL characters for trace tags
Tom Hughes [Mon, 5 Nov 2018 18:58:08 +0000 (18:58 +0000)]
Improve character validator error messages
Tom Hughes [Mon, 5 Nov 2018 18:54:19 +0000 (18:54 +0000)]
Merge character validators
Tom Hughes [Mon, 5 Nov 2018 18:29:17 +0000 (18:29 +0000)]
Merge leading and trailing whitespace validators
Tom Hughes [Mon, 5 Nov 2018 17:06:48 +0000 (17:06 +0000)]
Improve consistency of text validations
J Guthrie [Mon, 5 Nov 2018 15:41:35 +0000 (15:41 +0000)]
Added tests for validators
J Guthrie [Mon, 5 Nov 2018 15:40:37 +0000 (15:40 +0000)]
Changed User model to not allow nil display_name (w/ tests)
J Guthrie [Mon, 5 Nov 2018 01:55:25 +0000 (01:55 +0000)]
Converted invalid_chars validator to use locale
J Guthrie [Sun, 4 Nov 2018 18:52:45 +0000 (18:52 +0000)]
Fix rubocop errors
J Guthrie [Sun, 4 Nov 2018 18:28:27 +0000 (18:28 +0000)]
Create invalid_char validators and apply to 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)
J Guthrie [Sun, 4 Nov 2018 16:40:01 +0000 (16:40 +0000)]
Fix rubucop errors
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)
J Guthrie [Sun, 4 Nov 2018 16:17:44 +0000 (16:17 +0000)]
Added trailing/leading whitespace errors to locale
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
Tom Hughes [Mon, 5 Nov 2018 09:24:51 +0000 (09:24 +0000)]
Allow note comments with no body
translatewiki.net [Mon, 5 Nov 2018 07:57:46 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 4 Nov 2018 14:50:14 +0000 (14:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2009'
Tom Hughes [Sun, 4 Nov 2018 14:49:27 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2042'
mmd-osm [Sat, 3 Nov 2018 17:32:02 +0000 (18:32 +0100)]
Limit notes sizes to 2000 characters
Tom Hughes [Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)]
Merge remote-tracking branch 'upstream/pull/2023'
Tom Hughes [Sat, 3 Nov 2018 12:28:00 +0000 (12:28 +0000)]
Move abilities to a sepatarate top level directory
Tom Hughes [Sat, 3 Nov 2018 11:58:56 +0000 (11:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2038'
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.
J Guthrie [Fri, 2 Nov 2018 01:23:37 +0000 (01:23 +0000)]
On hover, change border to a subtle darker orange, increase strokeWidth
Tom Hughes [Thu, 1 Nov 2018 22:29:27 +0000 (22:29 +0000)]
Update to sassc 2.x
Tom Hughes [Thu, 1 Nov 2018 18:23:43 +0000 (18:23 +0000)]
Update bundle
Tom Hughes [Thu, 1 Nov 2018 18:01:25 +0000 (18:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2037'
translatewiki.net [Thu, 1 Nov 2018 07:19:56 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 31 Oct 2018 18:49:21 +0000 (18:49 +0000)]
Fix new rubocop warnings
Tom Hughes [Wed, 31 Oct 2018 18:42:54 +0000 (18:42 +0000)]
Update bundle
Tom Hughes [Wed, 31 Oct 2018 18:33:20 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/2039'
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
Andy Allan [Wed, 31 Oct 2018 15:38:12 +0000 (16:38 +0100)]
Use deliver_later for all email sending
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
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
Andy Allan [Wed, 31 Oct 2018 10:41:32 +0000 (11:41 +0100)]
Add testing for moderator users and issues
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.
Andy Allan [Wed, 31 Oct 2018 10:16:47 +0000 (11:16 +0100)]
Merge branch 'master' into cancancan
Tom Hughes [Mon, 29 Oct 2018 19:14:55 +0000 (19:14 +0000)]
Convert some model mixins to concerns
Tom Hughes [Mon, 29 Oct 2018 12:48:32 +0000 (12:48 +0000)]
Update mailmap
Tom Hughes [Mon, 29 Oct 2018 12:45:17 +0000 (12:45 +0000)]
Update translation keys for renaming of user to users
translatewiki.net [Mon, 29 Oct 2018 07:12:55 +0000 (08:12 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Oct 2018 08:31:58 +0000 (10:31 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 24 Oct 2018 14:48:54 +0000 (16:48 +0200)]
Check the oauth token and then use the capabilities directly
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.
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
Tom Hughes [Mon, 22 Oct 2018 09:59:05 +0000 (10:59 +0100)]
Update translation keys for renaming of user to users
Fixes #2031
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
translatewiki.net [Mon, 22 Oct 2018 06:08:50 +0000 (08:08 +0200)]
Localisation updates from https://translatewiki.net.
Simon Poole [Sun, 21 Oct 2018 18:32:12 +0000 (19:32 +0100)]
Calculate bounding box when deleting relations
Closes #2030
Fixes #2020
translatewiki.net [Thu, 18 Oct 2018 06:27:45 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.
superDoss [Wed, 17 Oct 2018 19:37:18 +0000 (22:37 +0300)]
Avoid swapping min and max longitude in RTL mode
Closes #2027
Andy Allan [Wed, 17 Oct 2018 11:33:47 +0000 (13:33 +0200)]
Combine site permissions declarations
translatewiki.net [Mon, 15 Oct 2018 07:35:52 +0000 (09:35 +0200)]
Localisation updates from https://translatewiki.net.
Andrew Harvey [Sun, 14 Oct 2018 12:10:30 +0000 (23:10 +1100)]
add australia copyright notice for PSMA Australia
Tom Hughes [Sun, 14 Oct 2018 11:28:26 +0000 (12:28 +0100)]
Resize change bounding boxes on a zoom change
Tom Hughes [Thu, 11 Oct 2018 18:14:55 +0000 (19:14 +0100)]
Enable automatic translation export in the test environment
Fixes #2016
Tom Hughes [Thu, 11 Oct 2018 17:52:00 +0000 (18:52 +0100)]
Adjust minimum changeset bbox to 20 pixels
Tom Hughes [Thu, 11 Oct 2018 17:51:45 +0000 (18:51 +0100)]
Improve variable naming
Tom Hughes [Thu, 11 Oct 2018 17:47:47 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2018'
Tom Hughes [Thu, 11 Oct 2018 17:32:31 +0000 (18:32 +0100)]
Tidy up notes#search
Tom Hughes [Thu, 11 Oct 2018 17:30:53 +0000 (18:30 +0100)]
Use "user" as user id parameter for notes searches
Tom Hughes [Thu, 11 Oct 2018 16:41:47 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1955'
Tom Hughes [Thu, 11 Oct 2018 08:33:24 +0000 (09:33 +0100)]
Suppress changeset pagination for inactive users
Fixes #2024
translatewiki.net [Thu, 11 Oct 2018 07:13:43 +0000 (09:13 +0200)]
Localisation updates from https://translatewiki.net.