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

11229 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
dd8e5f04e3 Add a test for i18n interpolation into plain and html parts 
I spent some time working on an alternative translation strategy, without realising some of the plain text implications.
 2020-12-02 13:02:25 +00:00
Andy Allan
48b85a7fee
Merge pull request #2969 from tuckerrc/diary-updated-date 
Add last updated date to diary entry page
 2020-12-02 11:30:22 +00:00
dependabot[bot]
1869320f3e
Bump aws-sdk-s3 from 1.85.0 to 1.86.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.85.0 to 1.86.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-02 05:01:33 +00:00
Tom Hughes
404f99af1a Merge remote-tracking branch 'upstream/pull/2989' into master 2020-12-01 22:26:02 +00:00
Sarah Hoffmann
a7b95e2a63 Improve guessing of labels for Nominatim results 
This adapts to two changes in place handling by Nominatim:

* Place links that are computed by Nominatim are now found in
  extratags['linked_places']. Keep the check for extratags['place']
  as this may contain an explicitly mapped place label.
* Use address rank for guessing the admin level. This gets normalised
  by Nominatim with respect to country-specific use of admin_level.

Also adds additional labels for admin levels, so that we now have
complete coverage for all levels that are in use in OSM.
 2020-12-01 22:52:40 +01:00
Tom Hughes
c418523ed8 Merge remote-tracking branch 'upstream/pull/2988' into master 2020-12-01 08:18:59 +00:00
Tom Hughes
aae3ccd7ba Merge remote-tracking branch 'upstream/pull/2987' into master 2020-12-01 08:18:56 +00:00
Tom Hughes
1ff2ec6705 Merge remote-tracking branch 'upstream/pull/2986' into master 2020-12-01 08:18:53 +00:00
dependabot[bot]
088bc084ef
Bump puma from 5.0.4 to 5.1.0 
Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.1.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.0.4...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-01 05:00:58 +00:00
translatewiki.net
78137c93b5 Localisation updates from https://translatewiki.net. 2020-11-30 17:11:29 +01:00
dependabot[bot]
3bb43e707e
Bump listen from 3.3.1 to 3.3.3 
Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-30 05:03:14 +00:00
dependabot[bot]
1ff6cdc997
Bump rubocop-performance from 1.9.0 to 1.9.1 
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-30 05:02:46 +00:00
Tom Hughes
fccf20edb2 Merge remote-tracking branch 'upstream/pull/2985' into master 2020-11-27 08:53:16 +00:00
Tom Hughes
fcf868c445 Merge remote-tracking branch 'upstream/pull/2984' into master 2020-11-27 08:53:13 +00:00
dependabot[bot]
e7c89a97e1
Bump autoprefixer-rails from 10.0.2.0 to 10.0.3.0 
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.2.0 to 10.0.3.0.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.2.0...10.0.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-27 05:02:12 +00:00
dependabot[bot]
03b0171c76
Bump capybara from 3.33.0 to 3.34.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.33.0...3.34.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-27 05:01:30 +00:00
Tucker Chapman
c274d22fd6 Update translate string and only show if different from creation time 2020-11-26 22:04:54 -05:00
translatewiki.net
c6144501cd Localisation updates from https://translatewiki.net. 2020-11-26 18:03:18 +01:00
Andy Allan
cc1d9592df Avoid calling raw in plain text email templates 
Rails doesn't escape text in text/plain outputs, since before Rails 4.

See https://github.com/rails/rails/pull/8235
 2020-11-25 18:28:35 +00:00
Andy Allan
342e25dd5a Remove duplicate translation strings, and use short form translation lookups 2020-11-25 18:28:35 +00:00
Andy Allan
8f157ab2b1 Rename subject translation key, for consistency 2020-11-25 18:28:35 +00:00
Andy Allan
030591e318 Use rails t helper to allow relative translation keys in email subjects 
This makes it easier to rename methods and translation keys.
 2020-11-25 18:28:35 +00:00
Tom Hughes
5d96da3b67 Merge remote-tracking branch 'upstream/pull/2983' into master 2020-11-25 16:59:23 +00:00
Andy Allan
7b0de13c61 Allow smtp settings to be configured through the settings system 
This allows easier configuration using the settings.local.yml files

Fixes #2571
 2020-11-25 16:12:49 +00:00
Tom Hughes
a6dd1ec4b8 Merge remote-tracking branch 'upstream/pull/2970' into master 2020-11-25 15:18:39 +00:00
Andy Allan
5368f9f9b4
Merge pull request #2971 from tomhughes/table 
Add bootstrap classes to markdown tables
 2020-11-25 11:55:05 +00:00
Andy Allan
b83c0acbd1 Fix trace tag interpolation, and add a test 2020-11-25 11:34:35 +00:00
Tom Hughes
06a976acb8 Merge remote-tracking branch 'upstream/pull/2981' into master 2020-11-25 10:20:59 +00:00
dependabot[bot]
8f417eddca
Bump strong_migrations from 0.7.2 to 0.7.3 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.2...v0.7.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-25 05:01:17 +00:00
translatewiki.net
dbe67d0a75 Localisation updates from https://translatewiki.net. 2020-11-23 15:29:08 +01:00
Tom Hughes
43685d4380 Merge remote-tracking branch 'upstream/pull/2976' into master 2020-11-23 08:14:52 +00:00
Tom Hughes
3fabea77cf Merge remote-tracking branch 'upstream/pull/2975' into master 2020-11-23 08:14:47 +00:00
dependabot[bot]
94dc8cd8d7
Bump eslint from 7.13.0 to 7.14.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.13.0 to 7.14.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.13.0...v7.14.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-23 05:04:33 +00:00
dependabot[bot]
7dcc6e01cf
Bump aws-sdk-s3 from 1.84.1 to 1.85.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.1 to 1.85.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-23 05:02:29 +00:00
translatewiki.net
ca41f1f981 Localisation updates from https://translatewiki.net. 2020-11-19 15:55:28 +01:00
Tom Hughes
d516ba5335 Add bootstrap classes to markdown tables 2020-11-19 10:17:21 +00:00
Andy Allan
f635b98b8c Refactor trace notifications to reduce lego translations 
Fixes #2268.

Unfortunately there's still a lego translation when both halves of the sentence are joined together, but this at least reduces the number of combinations to translate.
 2020-11-18 18:14:55 +00:00
Tucker Chapman
f4239f8fc5 Add last updated date to diary entry page 2020-11-17 20:33:27 -05:00
Tom Hughes
4e78f3ae5b Fix erblint warning 2020-11-17 09:23:22 +00:00
Tom Hughes
2ecfd61ee9 Fix new rubocop warnings 2020-11-17 08:17:34 +00:00
Tom Hughes
8d2fbc63a4 Merge remote-tracking branch 'upstream/pull/2967' into master 2020-11-17 08:14:44 +00:00
Tom Hughes
835a1f9fcb Merge remote-tracking branch 'upstream/pull/2966' into master 2020-11-17 08:14:41 +00:00
dependabot[bot]
241f9c422c
Bump rubocop-performance from 1.8.1 to 1.9.0 
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.8.1...v1.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-17 05:01:07 +00:00
translatewiki.net
39a04dc751 Localisation updates from https://translatewiki.net. 2020-11-16 15:24:21 +01:00
dependabot[bot]
6219878fb5
Bump listen from 3.3.0 to 3.3.1 
Bumps [listen](https://github.com/guard/listen) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-16 05:54:53 +00:00
mxdanger
aad1c1b933 Add updated authentication logos 2020-11-13 20:02:00 -08:00
Tom Hughes
99e537859a Fix HTML escaping issues with user role icons 2020-11-13 15:13:37 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
45d4242f9d Improve readability 2020-11-13 10:51:01 +00:00
Tom Hughes
4347d9d3b0 Merge remote-tracking branch 'upstream/pull/2921' into master 2020-11-13 10:49:35 +00:00