cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11229 commits 4 branches 1 tag 499 MiB
Commit graph

5883 commits

Author SHA1 Message Date
Andy Allan
5cd417f8e8 Use relative translations for changeset comments 2018-11-07 11:07:29 +01:00
Andy Allan
04afeeb32f 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
 2018-11-07 10:51:43 +01:00
Andy Allan
4b0d56f7e1 Rename comments_feed to index 2018-11-07 10:22:07 +01:00
Andy Allan
b7e871cb46 Rename comment to create 2018-11-07 10:22:07 +01:00
Andy Allan
19c2b92fb7 Split changeset comment handling into a changeset_comments controller 2018-11-07 10:20:14 +01:00
Tom Hughes
cdb42d2a6c Avoid ordering points from public and private traces 
Closes #2046
 2018-11-07 08:57:14 +00:00
Tom Hughes
b7438167c0 Use character validate to exclude URL characters for trace tags 2018-11-05 21:16:21 +00:00
Tom Hughes
56f7e692cd Improve character validator error messages 2018-11-05 21:16:21 +00:00
Tom Hughes
d73a5d4bc0 Merge character validators 2018-11-05 18:54:19 +00:00
Tom Hughes
b4ef61a9f3 Merge leading and trailing whitespace validators 2018-11-05 18:29:17 +00:00
Tom Hughes
873ac155ca Improve consistency of text validations 2018-11-05 17:06:48 +00:00
J Guthrie
1e57189366 Added tests for validators 2018-11-05 16:23:30 +00:00
J Guthrie
6cde8c9b0c Changed User model to not allow nil display_name (w/ tests) 2018-11-05 15:40:37 +00:00
J Guthrie
e091246ffc Converted invalid_chars validator to use locale 2018-11-05 14:27:07 +00:00
J Guthrie
3b68061e87 Fix rubocop errors 2018-11-05 14:27:06 +00:00
J Guthrie
c2f23fea6a Create invalid_char validators and apply to models 2018-11-05 14:27:03 +00:00
J Guthrie
64816e50b5 Added more non-ascii chars to validation (matching list of chars in other models) 2018-11-05 14:24:30 +00:00
J Guthrie
7d6c5d7cd7 Fix rubucop errors 2018-11-05 14:24:29 +00:00
J Guthrie
b439bac920 Make invalid char list more explicit (between ascii and non ascii chars) 2018-11-05 14:24:29 +00:00
J Guthrie
c3254b7e93 Added trailing/leading whitespace errors to locale 2018-11-05 14:24:25 +00:00
J Guthrie
88e048deea Specifiy invalid chars in username error message 
- Refactored list of invalid chars out to constant
 2018-11-05 14:24:24 +00:00
Tom Hughes
e93e5fbe63 Allow note comments with no body 2018-11-05 09:24:51 +00:00
Tom Hughes
efd50cd529 Merge remote-tracking branch 'upstream/pull/2009' 2018-11-04 14:50:14 +00:00
Tom Hughes
acfbc09198 Merge remote-tracking branch 'upstream/pull/2042' 2018-11-04 14:49:27 +00:00
mmd-osm
d9a48d66f9 Limit notes sizes to 2000 characters 2018-11-03 18:32:02 +01:00
Tom Hughes
16bef0c8ec Merge remote-tracking branch 'upstream/pull/2023' 2018-11-03 14:34:18 +00:00
Tom Hughes
8c269aba4e Move abilities to a sepatarate top level directory 2018-11-03 12:56:50 +00:00
Tom Hughes
391fb933f5 Merge remote-tracking branch 'upstream/pull/2038' 2018-11-03 11:58:56 +00:00
J Guthrie
d5e6acaace On hover, change border to a subtle darker orange, increase strokeWidth 2018-11-02 01:23:37 +00:00
Tom Hughes
5b062f0315 Merge remote-tracking branch 'upstream/pull/2039' 2018-10-31 18:33:20 +00:00
Andy Allan
4395b79bf7 Move notifier.rb into app/mailers 
This is the expected location for mailers
 2018-10-31 17:19:18 +01:00
Andy Allan
b54362d458 Use deliver_later for all email sending 2018-10-31 16:38:12 +01:00
Andy Allan
f11221f05b Merge branch 'master' into cancancan 2018-10-31 11:16:47 +01:00
Tom Hughes
82f3dc6823 Convert some model mixins to concerns 2018-10-29 19:14:55 +00:00
Tom Hughes
22af018298 Update translation keys for renaming of user to users 2018-10-29 12:48:20 +00:00
Andy Allan
0888f43d7b Check the oauth token and then use the capabilities directly 2018-10-24 16:48:54 +02:00
Andy Allan
71b21ec473 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.
 2018-10-24 12:07:00 +02:00
Andy Allan
a50ad1c895 Rework the default denied access handler to give different responses to tokens, logged in users and other users 2018-10-24 09:39:02 +02:00
Tom Hughes
a5124ed409 Update translation keys for renaming of user to users 
Fixes #2031
 2018-10-22 11:00:03 +01:00
Christopher Bazin
248f63f728 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
 2018-10-22 10:44:16 +01:00
Simon Poole
07ffb4c3f6 Calculate bounding box when deleting relations 
Closes #2030
Fixes #2020
 2018-10-21 19:32:12 +01:00
superDoss
3a1a17b522 Avoid swapping min and max longitude in RTL mode 
Closes #2027
 2018-10-17 22:31:08 +01:00
Andy Allan
ce761b3193 Combine site permissions declarations 2018-10-17 13:33:47 +02:00
Andrew Harvey
9da461cc2e add australia copyright notice for PSMA Australia 2018-10-14 23:10:30 +11:00
Tom Hughes
6b194ed627 Resize change bounding boxes on a zoom change 2018-10-14 12:28:26 +01:00
Tom Hughes
091818da5d Adjust minimum changeset bbox to 20 pixels 2018-10-11 18:52:00 +01:00
Tom Hughes
bdcc33ae7f Improve variable naming 2018-10-11 18:51:45 +01:00
Tom Hughes
1aa63d92bc Merge remote-tracking branch 'upstream/pull/2018' 2018-10-11 18:47:47 +01:00
Tom Hughes
aef5273e95 Tidy up notes#search 2018-10-11 18:32:31 +01:00
Tom Hughes
db13180c70 Use "user" as user id parameter for notes searches 2018-10-11 18:30:53 +01:00