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

10506 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
c04d05686f Resolve some extra-long lines 2020-10-28 11:07:34 +01:00
Tom Hughes
b704f59769 Merge remote-tracking branch 'upstream/pull/2916' into master 2020-10-28 08:25:02 +00:00
Tom Hughes
c5df0e1e3b Merge remote-tracking branch 'upstream/pull/2915' into master 2020-10-28 08:25:00 +00:00
dependabot[bot]
b0711f5f3a
Bump puma from 5.0.3 to 5.0.4 
Bumps [puma](https://github.com/puma/puma) from 5.0.3 to 5.0.4.
- [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.3...v5.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-28 05:02:41 +00:00
Quincy Morgan
27fb39770f Update to iD v2.19.1 2020-10-27 21:17:47 -04:00
Tom Hughes
d41737c6a0 Merge remote-tracking branch 'upstream/pull/2914' into master 2020-10-27 22:44:07 +00:00
Quincy Morgan
b1694ce39e Update to iD v2.19.0 2020-10-27 17:46:24 -04:00
Tom Hughes
10c4529014 Merge remote-tracking branch 'upstream/pull/2912' into master 2020-10-27 08:10:27 +00:00
Tom Hughes
1be2439b19 Merge remote-tracking branch 'upstream/pull/2911' into master 2020-10-27 08:10:25 +00:00
Tom Hughes
19b5e0d806 Merge remote-tracking branch 'upstream/pull/2910' into master 2020-10-27 08:10:23 +00:00
dependabot[bot]
c415076ca0
Bump bootsnap from 1.4.8 to 1.4.9 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.8 to 1.4.9.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.8...v1.4.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-27 05:02:12 +00:00
dependabot[bot]
18fe77ff18
Bump eslint from 7.12.0 to 7.12.1 
Bumps [eslint](https://github.com/eslint/eslint) from 7.12.0 to 7.12.1.
- [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.12.0...v7.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-27 05:01:35 +00:00
dependabot[bot]
e22fb2f6bb
Bump puma from 5.0.2 to 5.0.3 
Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.3.
- [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.2...v5.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-27 05:01:29 +00:00
translatewiki.net
c1de6a5f91 Localisation updates from https://translatewiki.net. 2020-10-26 16:06:52 +01:00
Tom Hughes
594cd80a4b Merge remote-tracking branch 'upstream/pull/2907' into master 2020-10-26 08:14:18 +00:00
Tom Hughes
12c435be8a Merge remote-tracking branch 'upstream/pull/2906' into master 2020-10-26 08:14:14 +00:00
dependabot[bot]
7b03899e97
Bump strong_migrations from 0.7.1 to 0.7.2 
Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.1 to 0.7.2.
- [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.1...v0.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 05:02:44 +00:00
dependabot[bot]
98dbb05364
Bump eslint from 7.11.0 to 7.12.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.11.0 to 7.12.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.11.0...v7.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 05:01:36 +00:00
translatewiki.net
0084ed303a Localisation updates from https://translatewiki.net. 2020-10-22 13:08:56 +02:00
Tom Hughes
8a42bc2eff Merge remote-tracking branch 'upstream/pull/2890' 2020-10-21 20:53:15 +01:00
Tom Hughes
2f03522c42 Fix close handler for welcome message 2020-10-21 20:51:10 +01:00
Tom Hughes
e9ad6d852c Merge remote-tracking branch 'upstream/pull/2901' 2020-10-21 20:51:03 +01:00
Andy Allan
415a05f96a
Merge pull request #2902 from seav/patch-1 
Link to official OWG Banner Policy page
 2020-10-21 17:36:26 +02:00
Eugene Alvin Villar
fe13c2f0ef
Link to official OWG Banner Policy page 
- Link to the official Banner Policy page on the OWG website instead of a GitHub ticket discussion
- Reformat Markdown lists so that the rendered HTML results in properly nested lists
 2020-10-21 23:25:51 +08:00
Andy Allan
c233bec67b Use flexbox to position the close icon on the sidebars 
This ensures that the text and the close icon don't overlap, regardless
of the length of the title. The title div grows to use all available
space, while ensuring the text breaks if necessary to prevent it from
pushing the close icon offscreen.
 2020-10-21 17:11:28 +02:00
Tom Hughes
843635e1b3 Merge remote-tracking branch 'upstream/pull/2899' 2020-10-21 15:12:05 +01:00
Tom Hughes
e80571c22c Merge remote-tracking branch 'upstream/pull/2898' 2020-10-21 15:11:15 +01:00
Andy Allan
2559226be3 Avoid various uses of html_safe 
We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.
 2020-10-21 15:43:14 +02:00
Andy Allan
790ffed9b8 Remove unused translation 
The code that used this was removed in 9a9e13af90
 2020-10-21 15:38:53 +02:00
Andy Allan
465926ebeb Remove unused translations 
The code that used these translations was removed in aaeca5b534
 2020-10-21 15:37:57 +02:00
Tom Hughes
bb2ffab9ec Merge remote-tracking branch 'upstream/pull/2896' 2020-10-20 13:21:24 +01:00
Andy Allan
8fb3aa48e2 Fix call to UserMailer in message delivery 
Fixes #2895
 2020-10-20 13:58:08 +02:00
Tom Hughes
61a0df75a7 Merge remote-tracking branch 'upstream/pull/2894' 2020-10-20 08:17:16 +01:00
Tom Hughes
69a2e4c297 Merge remote-tracking branch 'upstream/pull/2893' 2020-10-20 08:17:12 +01:00
dependabot[bot]
1b4be3e4b1
Bump aws-sdk-s3 from 1.83.0 to 1.83.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.1.
- [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-10-20 05:03:51 +00:00
dependabot[bot]
8a38709f34
Bump omniauth-facebook from 7.0.0 to 8.0.0 
Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-20 05:02:46 +00:00
Tom Hughes
e72092161b Update test results for presence of zh-HK translations 2020-10-19 19:26:17 +01:00
Tom Hughes
c8bf130074 Merge remote-tracking branch 'upstream/pull/2892' 2020-10-19 19:23:48 +01:00
Tom Hughes
a388c3093a Merge remote-tracking branch 'upstream/pull/2891' 2020-10-19 19:23:46 +01:00
translatewiki.net
b39251810b Localisation updates from https://translatewiki.net. 2020-10-19 15:01:22 +02:00
dependabot[bot]
271b094ad0
Bump webmock from 3.9.2 to 3.9.3 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.2 to 3.9.3.
- [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.2...v3.9.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-19 05:02:17 +00:00
dependabot[bot]
d41b619c79
Bump faraday from 1.0.1 to 1.1.0 
Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.0.1...v1.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-19 05:01:26 +00:00
Hidde Wieringa
cde4ac61a2
Also fix private road 2020-10-17 17:00:40 +02:00
Hidde Wieringa
2fe408d5f9
Update icon for destination access in map key 2020-10-17 16:56:42 +02:00
Tom Hughes
705e37f45a Merge remote-tracking branch 'upstream/pull/2888' 2020-10-16 08:26:56 +01:00
dependabot[bot]
222f746d64
Bump activerecord-import from 1.0.6 to 1.0.7 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.6...v1.0.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-16 05:02:14 +00:00
Tom Hughes
96f426a2ea Merge remote-tracking branch 'upstream/pull/2887' 2020-10-15 08:12:25 +01:00
Tom Hughes
ad9f0b6247 Merge remote-tracking branch 'upstream/pull/2884' 2020-10-15 08:12:21 +01:00
dependabot[bot]
bfeec6112a
Bump i18n-js from 3.7.1 to 3.8.0 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-15 05:01:21 +00:00
Andy Allan
2c1033f62d Rename Notifier to UserMailer 
It's a convention in rails to name your mailers with a Mailer suffix, and is also common to name the class after the recipient (e.g. User, Admin). So UserMailer seems a reasonable choice.
 2020-10-14 15:04:58 +02:00