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

10810 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
582402ba8f Prefer keyword arguments when method has optional boolean arguments 2020-11-13 10:22:55 +00:00
Tom Hughes
63221710a4 Merge remote-tracking branch 'upstream/pull/2955' into master 2020-11-13 09:52:18 +00:00
Tom Hughes
fa2177710b Merge remote-tracking branch 'upstream/pull/2958' into master 2020-11-13 09:49:30 +00:00
Tom Hughes
74e6b468ac Merge remote-tracking branch 'upstream/pull/2957' into master 2020-11-13 09:49:10 +00:00
dependabot[bot]
3fdf5942f4
Bump webmock from 3.9.5 to 3.10.0 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-13 05:03:47 +00:00
dependabot[bot]
5c69fc77f9
Bump composite_primary_keys from 12.0.2 to 12.0.3 
Bumps [composite_primary_keys](https://github.com/drnic/composite_primary_keys) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/drnic/composite_primary_keys/releases)
- [Changelog](https://github.com/composite-primary-keys/composite_primary_keys/blob/master/History.rdoc)
- [Commits](https://github.com/drnic/composite_primary_keys/compare/12.0.2...12.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-13 05:03:07 +00:00
Andy Allan
78b9d92207 Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00
Andy Allan
1f242978af Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00
Andy Allan
e6d7da3a62 Preload traces for the selected points 
It doesn't make a huge difference, since rails caches all the results
of the queries generated by point.trace lookups, but at least it cuts
down on the logs.
 2020-11-11 17:52:33 +00:00
Andy Allan
a15a3744da Use point.trace instead of an additional gpx_file variable 
Every point knows which trace it's associated with, so there's no
need to search for it separately
 2020-11-11 17:51:52 +00:00
Andy Allan
a65cb84288 Remove unused code 2020-11-11 16:43:58 +00:00
Andy Allan
c8e1b3c662 Prefer string interpolation to concatenation in erb files 2020-11-11 14:44:42 +00:00
Tom Hughes
a2bb4388e4 Merge remote-tracking branch 'upstream/pull/2954' into master 2020-11-11 12:24:27 +00:00
Andy Allan
01b72f7adf Fix missing html layout for user_mailer emails 
This was caused by renaming the mailer without renaming the layout. Added a test to cover this in future.

Fixes #2903
 2020-11-11 11:19:20 +00:00
Tom Hughes
b1d8d73525 Merge remote-tracking branch 'upstream/pull/2953' into master 2020-11-11 08:21:49 +00:00
Tom Hughes
953aa7fd4d Merge remote-tracking branch 'upstream/pull/2952' into master 2020-11-11 08:21:47 +00:00
Tom Hughes
6c1f535d5f Merge remote-tracking branch 'upstream/pull/2951' into master 2020-11-11 08:21:45 +00:00
dependabot[bot]
e541f2b8b4
Bump autoprefixer-rails from 10.0.1.3 to 10.0.2.0 
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.1.3 to 10.0.2.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.1.3...10.0.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-11 05:03:13 +00:00