Commit graph

571 commits

Author SHA1 Message Date
Adam Hoyle
46875fdde3
Merge branch 'master' into feature/add-communities-page 2021-12-14 10:42:42 +00:00
Adam Hoyle
a1db3f9ae4 Fix: only call store_translations once per locale 2021-12-14 10:39:25 +00:00
Adam Hoyle
e412ac319c Fix: local chapter filtering is duplicating the logic elsewhere in the file. 2021-12-14 10:37:35 +00:00
Adam Hoyle
6b8c58d2eb Skip path rebuilding 2021-12-14 10:17:02 +00:00
Adam Hoyle
764f808d5a Remove hand rolled i18n support 2021-11-24 22:47:19 +00:00
Adam Hoyle
ad900553cb Add relevant osm-community-index data into I18n 2021-11-24 22:22:32 +00:00
Tom Hughes
aad81eb74c Switch to Argon2 for password hashing 2021-11-03 20:39:31 +00:00
Adam Hoyle
f234bf3a46 Pay heed to rubocop 2021-10-17 23:34:26 +01:00
Adam Hoyle
0eb2afa83a Merge branch 'master' into feature/add-communities-page 2021-10-17 22:33:02 +01:00
Adam Hoyle
06c2db433d Merge branch 'master' into feature/add-communities-page 2021-09-27 19:30:25 +01:00
Adam Hoyle
a57bc158fd Improve encapsulation / location of osm-community-index files 2021-09-08 20:44:35 +01:00
Tom Hughes
64604a852f Add a privileged scope that allows authorization to be skipped 2021-08-26 17:22:25 +01:00
Tom Hughes
f4d1d97848 Add a privileged scope that allows email addresses to be returned 2021-08-26 17:22:25 +01:00
Tom Hughes
6c6e8883f7 Introduce privileged scopes that only an administrator can enable 2021-08-26 17:22:24 +01:00
Tom Hughes
7d46f5db60 Fix new rubocop warnings 2021-08-17 18:17:18 +01:00
Tom Hughes
fa8818337f Fix locale matching for iD 2021-07-27 17:38:17 +01:00
Josh Soref
907587e745 spelling: abcdefghijklmnopqrstuvwxyz
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-07-21 10:45:38 -04:00
Tom Hughes
d3c800fdb4 Fix new rubocop warnings 2021-06-29 18:29:00 +01:00
Tom Hughes
8d76be71bb Merge remote-tracking branch 'upstream/pull/3177' 2021-06-24 08:43:18 +01:00
Tom Hughes
baa32464cd Drop last vestiges of ruby 2.5 support 2021-06-08 20:33:25 +01:00
Andy Allan
4c785792fb Switch to using 'rails test:all' in documentation and CI
Fixes #3116.

This allows us to drop our custom patch for running system tests,
as well as opening up all the usual rails test goodies like running
individual files or directories.
2021-05-19 13:39:37 +01:00
Tom Hughes
e222329d04 Add support for OAuth2 using doorkeeper 2021-05-18 12:05:32 +01:00
Tom Hughes
6db5b2e6f3 Fix rubocop Rake/MethodDefinitionInTask warnings 2021-05-13 19:28:26 +01:00
Andy Allan
93ecedf02a Use the rake extension for remaining files, for consistency 2021-04-28 12:05:25 +01:00
Tom Hughes
4a6b1e54a5 Switch GPX MIME type detection to use marcel 2021-03-30 18:26:23 +01:00
Tom Hughes
ff3a30d245 Fix new rubocop warnings 2021-03-02 08:24:15 +00:00
Andy Allan
78bf2993e4 Refactor richtext fields to use a custom bootstrap_form input.
This allows us to use form_group_builder and get all the label and
help text handling in line with other bootstrap_form inputs.
2021-01-13 14:05:39 +00:00
Tom Hughes
0ff89c31e4 Remove both Potlatch versions
Fixes #2622
2021-01-05 21:18:45 +00:00
Tom Hughes
eada36ff96 Switch to using the zeitwork autoloader 2020-12-30 20:30:21 +00:00
Andy Allan
547459314b Refactor diary entry forms to use a custom form builder 2020-12-24 13:32:41 +00:00
Tom Hughes
f4885874f0 Merge remote-tracking branch 'upstream/pull/3016' 2020-12-23 15:24:10 +00:00
Andy Allan
2519841efe Return the centre of the image if the bbox has no extent
Fixes #3007. If all the provided points in the gpx file have the same
lat/lon, then an image where they are all at the centre seems plausible.
2020-12-23 15:01:01 +00:00
Andy Allan
4f304e2301 Remove SystemTimer and use stdlib Timeout directly
SystemTimer was only needed on ruby 1.8, and we dropped support for
that a long time ago.
2020-12-23 14:25:58 +00:00
Tom Hughes
2490fdc496 Ignore GPX archive entries that aren't regular files
Fixes #3008
2020-12-16 11:17:51 +00:00
Tom Hughes
2ecfd61ee9 Fix new rubocop warnings 2020-11-17 08:17:34 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
4347d9d3b0 Merge remote-tracking branch 'upstream/pull/2921' into master 2020-11-13 10:49:35 +00:00
Tom Hughes
582402ba8f Prefer keyword arguments when method has optional boolean arguments 2020-11-13 10:22:55 +00:00
Andy Allan
52c688f55a Prefer string interpolation to concatenation 2020-10-28 17:15:14 +01:00
Tom Hughes
2dc50b4431 Fix new rubocop warnings 2020-10-09 08:26:38 +01:00
Tom Hughes
c2af89c00e Fix rubocop Style/SoleNestedConditional warnings 2020-09-02 18:54:55 +01:00
Tom Hughes
b7432e9432 Handle new rubocop warnings 2020-09-02 07:18:21 +01:00
Tom Hughes
2651db7254 Fix Lint/MissingSuper warnings 2020-08-09 19:06:04 +01:00
Tom Hughes
ea59d95f4a Fix some new rubocop warnings 2020-08-06 22:27:30 +01:00
Tom Hughes
0e2a66e8de Fix new rubocop warnings 2020-08-06 18:42:16 +01:00
Tom Hughes
4d2ea31516 Don't fall back to name:en if it's not in the user's language list
Fix to #2755
2020-08-06 14:21:30 +01:00
Tom Hughes
2d3972249c Fix some rubocop todos 2020-08-02 19:38:58 +01:00
Tom Hughes
c4abe8eb28 Fix the CrossSiteScripting warnings from Brakeman 2020-07-22 20:57:16 +01:00
Tom Hughes
9f993fe8c8 Fix new rubocop warnings 2020-07-07 10:44:52 +01:00
Tom Hughes
bf22c69286 Improve locale selection algorithm
Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.
2020-06-04 17:33:11 +01:00