Commit graph

8960 commits

Author SHA1 Message Date
Tom Hughes
75189bd17d Merge remote-tracking branch 'upstream/pull/2060' 2018-11-14 13:13:56 +00:00
Andy Allan
234afb3f42 Remove custom deny_access handlers
Since these pages are not accessed by normal users, except for url fiddling, it's fine to respond with a generic access denied.
2018-11-14 14:10:51 +01:00
Tom Hughes
dd302f4f2c Merge remote-tracking branch 'upstream/pull/2061' 2018-11-14 12:43:35 +00:00
Andy Allan
c89b88c8d0 Add a changeset to exercise that part of the contact rendering 2018-11-14 12:25:21 +01:00
Andy Allan
0d55c40ca8 Ensure that the blocked template rendering works 2018-11-14 12:19:23 +01:00
Andy Allan
d7f41756f9 Check that a request that requires authentication is redirected when the user hasn't seen the terms 2018-11-14 12:19:23 +01:00
Tom Hughes
94a48482e0 Merge remote-tracking branch 'upstream/pull/2058' 2018-11-14 10:48:18 +00:00
Andy Allan
252b9ef08a Pluralize changesets controller 2018-11-14 10:34:28 +01:00
Tom Hughes
4deffa5e40 Skip CSRF verification for changeset comment actions
Fixes #2057
2018-11-13 13:17:19 +00:00
translatewiki.net
3790dd2aba Localisation updates from https://translatewiki.net. 2018-11-12 08:48:53 +01:00
Tom Hughes
418e632d23 Update Potlatch 2 to 2.5-57-gaa163622 build 2018-11-09 16:07:35 +00:00
Tom Hughes
9d97e4e99a Update Potlatch 2 to 2.5-56-g550aab49 build 2018-11-09 14:33:00 +00:00
Tom Hughes
ccdec3ed4c Attempt to send pretty 403 errors to web browsers 2018-11-08 19:09:56 +00:00
Tom Hughes
6ca22de4f2 Merge remote-tracking branch 'upstream/pull/2051' 2018-11-08 17:51:23 +00:00
Tom Hughes
70d6880e10 Merge remote-tracking branch 'upstream/pull/2052' 2018-11-08 17:44:57 +00:00
Tom Hughes
10294f4849 Merge remote-tracking branch 'upstream/pull/2050' 2018-11-08 17:31:30 +00:00
translatewiki.net
9d5beba1d4 Localisation updates from https://translatewiki.net. 2018-11-08 10:08:59 +01:00
Tom Hughes
5682fb4d24 Merge remote-tracking branch 'upstream/pull/2053' 2018-11-07 15:55:38 +00:00
Andy Allan
d70529f12b Remove unnecessary include from redaction model test 2018-11-07 16:48:48 +01:00
Andy Allan
efa37f6a83 Remove unnecessary require statements from tests 2018-11-07 16:42:11 +01:00
Andy Allan
26777c4464 Pluralize diary entries controller 2018-11-07 16:31:04 +01:00
Andy Allan
e85c56d151 Pluralize old_ controllers 2018-11-07 16:05:56 +01:00
Andy Allan
05117aa928 Pluralize nodes, ways and relations controllers 2018-11-07 15:55:26 +01:00
Andy Allan
79207ee594 Use CanCanCan for redaction authorizations 2018-11-07 13:28:58 +01:00
Andy Allan
368ce0000d Migrate UserBlocksController to use CanCanCan 2018-11-07 13:07:08 +01:00
Andy Allan
47498efcc3 Reduce the max class length after splitting the changeset comments controller tests out 2018-11-07 11:25:12 +01:00
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
9bd634405b Fix rubocop warning 2018-11-07 09:16:14 +00:00
Tom Hughes
be0d3b49fd Merge remote-tracking branch 'upstream/pull/2049' 2018-11-07 09:03:01 +00:00
Dominik Moritz
fde98f7ead Update leaflet.locate.js 2018-11-07 09:01:24 +00:00
Tom Hughes
cdb42d2a6c Avoid ordering points from public and private traces
Closes #2046
2018-11-07 08:57:14 +00:00
Tom Hughes
a39c645602 Merge remote-tracking branch 'upstream/pull/2044' 2018-11-05 21:22:48 +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