]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 30 Nov 2022 12:19:57 +0000 (12:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3688'
Tom Hughes [Wed, 30 Nov 2022 12:06:24 +0000 (12:06 +0000)]
Merge remote-tracking branch 'upstream/pull/3820'
Andy Allan [Wed, 30 Nov 2022 11:06:41 +0000 (11:06 +0000)]
Use mail_to help to avoid handcrafting mailto links
This also reworks the user suspended page to avoid having html in
the translation strings.
Tom Hughes [Tue, 29 Nov 2022 18:08:49 +0000 (18:08 +0000)]
Update bundle
translatewiki.net [Mon, 28 Nov 2022 12:12:01 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
快乐的老鼠宝宝 [Thu, 24 Nov 2022 16:20:40 +0000 (00:20 +0800)]
fix(README.md): typo and grammar
translatewiki.net [Thu, 24 Nov 2022 12:13:38 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
快乐的老鼠宝宝 [Thu, 24 Nov 2022 09:04:46 +0000 (17:04 +0800)]
docs(README.md): add communities name translate guide
In https://github.com/openstreetmap/openstreetmap-website/issues/3653 and https://github.com/openstreetmap/openstreetmap-website/issues/3814 noticed that communities name listed in https://www.openstreetmap.org/communities can't found in TranslateWiki
Andy Allan [Wed, 23 Nov 2022 15:44:26 +0000 (15:44 +0000)]
Merge pull request #3676 from harry-wood/notes-disappear-time
Display how long until a note will disappear
Tom Hughes [Tue, 22 Nov 2022 18:50:35 +0000 (18:50 +0000)]
Update node modules
Tom Hughes [Tue, 22 Nov 2022 18:47:24 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/3301'
Tom Hughes [Tue, 22 Nov 2022 18:32:02 +0000 (18:32 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 22 Nov 2022 18:16:22 +0000 (18:16 +0000)]
Update bundle
translatewiki.net [Mon, 21 Nov 2022 12:11:49 +0000 (13:11 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 20 Nov 2022 18:31:04 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3809'
Tom Hughes [Sun, 20 Nov 2022 18:31:02 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3808'
dependabot[bot] [Fri, 18 Nov 2022 23:01:18 +0000 (23:01 +0000)]
Bump leaflet from 1.9.2 to 1.9.3
Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.9.2...v1.9.3)
---
updated-dependencies:
- dependency-name: leaflet
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Fri, 18 Nov 2022 23:01:12 +0000 (23:01 +0000)]
Bump eslint from 8.27.0 to 8.28.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.27.0 to 8.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.27.0...v8.28.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 17 Nov 2022 17:51:46 +0000 (17:51 +0000)]
Merge remote-tracking branch 'upstream/pull/3805'
Tom Hughes [Thu, 17 Nov 2022 17:49:58 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3804'
Tom Hughes [Thu, 17 Nov 2022 17:49:17 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3803'
Andy Allan [Thu, 17 Nov 2022 12:51:55 +0000 (12:51 +0000)]
Use the mail_to method to construct a mailto link for browse tag values
This is easier than building a mailto link ourselves. Also implement
the missing title tag and write a test for it.
Andy Allan [Thu, 17 Nov 2022 12:15:02 +0000 (12:15 +0000)]
Enable more brakeman checks
These have been refactored already, so no longer need to be skipped.
translatewiki.net [Thu, 17 Nov 2022 12:12:56 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 17 Nov 2022 12:10:49 +0000 (12:10 +0000)]
Create a second title_user translation, to avoid using html_safe
Andy Allan [Thu, 17 Nov 2022 12:01:45 +0000 (12:01 +0000)]
Reconfigure the suspended flash message to avoid html_safe
This also avoids having raw html in the translation strings
Tom Hughes [Wed, 16 Nov 2022 18:33:51 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/3798'
Tom Hughes [Wed, 16 Nov 2022 18:16:09 +0000 (18:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3797'
Tom Hughes [Wed, 16 Nov 2022 18:14:38 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3799'
Tom Hughes [Wed, 16 Nov 2022 18:12:29 +0000 (18:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3800'
Andy Allan [Wed, 16 Nov 2022 16:22:18 +0000 (16:22 +0000)]
Merge pull request #3779 from AntonKhorev/spinner
Replace searching.gif images with Bootstrap spinners
Andy Allan [Wed, 16 Nov 2022 15:29:30 +0000 (15:29 +0000)]
Use rails 7.0 configuration defaults
All the entries in the new framework defaults were enabled a while
ago, apart from the cookies serializer which is already defined in
config/initializers/cookies_serializer.rb
Andy Allan [Wed, 16 Nov 2022 14:26:05 +0000 (14:26 +0000)]
Relax strict version constraint on rails gem
This lets us receive 7.0.x patch releases without having to edit the Gemfile.
Anton Khorev [Wed, 16 Nov 2022 12:45:27 +0000 (15:45 +0300)]
Pass original event instad of leaflet event to changeset bbox click simulation
Andy Allan [Wed, 16 Nov 2022 12:19:12 +0000 (12:19 +0000)]
Minor documentation tweaks
Prefer 'you' to 'one' since 'you' is used throughout the documentation and is easier for non-native speakers.
Andy Allan [Wed, 16 Nov 2022 12:16:45 +0000 (12:16 +0000)]
Standardise on openstreetmap-website instead of rails port
Fixes #3796
Tom Hughes [Tue, 15 Nov 2022 21:02:30 +0000 (21:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3795'
Seth Deegan [Tue, 15 Nov 2022 20:07:52 +0000 (15:07 -0500)]
Fix feature request GitHub issue template
The syntax for the feature request GitHub issue template yaml file was wrong because two elements had the same ids and thus the feature request issue form did not work. This changes one that was the same.
Tom Hughes [Tue, 15 Nov 2022 18:12:25 +0000 (18:12 +0000)]
Update bundle
Tom Hughes [Mon, 14 Nov 2022 12:32:18 +0000 (12:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3792'
translatewiki.net [Mon, 14 Nov 2022 12:13:25 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
Martin Raifer [Mon, 14 Nov 2022 11:32:56 +0000 (12:32 +0100)]
clear default connections when using preauth
Tom Hughes [Sun, 13 Nov 2022 18:36:35 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/pull/3791'
Martin Raifer [Sat, 12 Nov 2022 21:21:59 +0000 (22:21 +0100)]
Update to iD v2.23.2
Tom Hughes [Fri, 11 Nov 2022 19:17:16 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3789'
Martin Raifer [Thu, 10 Nov 2022 12:40:53 +0000 (13:40 +0100)]
Update to iD v2.23.1
translatewiki.net [Thu, 10 Nov 2022 12:14:46 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 8 Nov 2022 18:32:18 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3780'
Tom Hughes [Tue, 8 Nov 2022 18:26:51 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/3783'
Tom Hughes [Tue, 8 Nov 2022 18:22:33 +0000 (18:22 +0000)]
Update bundle
Tom Hughes [Tue, 8 Nov 2022 18:14:54 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3788'
dependabot[bot] [Mon, 7 Nov 2022 23:01:53 +0000 (23:01 +0000)]
Bump eslint from 8.26.0 to 8.27.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.26.0 to 8.27.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.26.0...v8.27.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Mon, 7 Nov 2022 12:23:17 +0000 (13:23 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Thu, 3 Nov 2022 23:00:53 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.76.1 to 0.78.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.76.1 to 0.78.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.76.1...v0.78.0)
---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 3 Nov 2022 12:14:52 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 2 Nov 2022 18:33:32 +0000 (18:33 +0000)]
Use Pathname.glob to fetch the files
Andy Allan [Wed, 2 Nov 2022 18:21:00 +0000 (18:21 +0000)]
Validate URLs against supply-chain attacks
Unfortunately validates_url gem doesn't support mailto or xmpp urls,
so we need to write our own validation.
Tom Hughes [Wed, 2 Nov 2022 12:56:20 +0000 (12:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3781'
Andy Allan [Wed, 2 Nov 2022 11:22:29 +0000 (11:22 +0000)]
Remove outdated comments
The action no longer deals with sending, and there's no display_name
param in this bit of code so it's a bit confusing.
Andy Allan [Wed, 2 Nov 2022 11:06:00 +0000 (11:06 +0000)]
Enable the ActionOrder cop for remaining controllers
Where actions were reordered, the rails standard actions were
also moved to the top of each controller.
Tom Hughes [Tue, 1 Nov 2022 18:33:22 +0000 (18:33 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 1 Nov 2022 18:25:36 +0000 (18:25 +0000)]
Update bundle
Anton Khorev [Mon, 31 Oct 2022 23:09:51 +0000 (02:09 +0300)]
Remove query result geometry when unloading the page
Tom Hughes [Mon, 31 Oct 2022 22:19:16 +0000 (22:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3778'
Anton Khorev [Sat, 29 Oct 2022 15:00:07 +0000 (18:00 +0300)]
Replace spinners in javascript
Anton Khorev [Sat, 29 Oct 2022 14:33:09 +0000 (17:33 +0300)]
Replace spinners in html.erb templates
Anton Khorev [Mon, 31 Oct 2022 20:54:58 +0000 (23:54 +0300)]
Add aria-label to close buttons
translatewiki.net [Mon, 31 Oct 2022 12:25:12 +0000 (13:25 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 30 Oct 2022 18:35:36 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3776'
Anton Khorev [Sat, 29 Oct 2022 16:32:17 +0000 (19:32 +0300)]
Remove query spinner show delay because the spinner is not hidden
translatewiki.net [Thu, 27 Oct 2022 11:18:40 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 26 Oct 2022 18:22:43 +0000 (19:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3770'
Tom Hughes [Wed, 26 Oct 2022 17:23:17 +0000 (18:23 +0100)]
Merge remote-tracking branch 'upstream/pull/3769'
Tom Hughes [Wed, 26 Oct 2022 17:16:58 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3771'
Andy Allan [Wed, 26 Oct 2022 15:00:13 +0000 (16:00 +0100)]
Add guidance on making pull requests easier to review
Anton Khorev [Fri, 9 Sep 2022 19:58:26 +0000 (22:58 +0300)]
Use close button instead of geolink in sidebar content
Anton Khorev [Wed, 26 Oct 2022 12:02:49 +0000 (15:02 +0300)]
Merge changeset <ol>s on Load more
Tom Hughes [Tue, 25 Oct 2022 18:28:10 +0000 (19:28 +0100)]
Merge remote-tracking branch 'upstream/pull/3768'
Tom Hughes [Tue, 25 Oct 2022 18:27:01 +0000 (19:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3765'
Tom Hughes [Tue, 25 Oct 2022 18:19:57 +0000 (19:19 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 25 Oct 2022 17:09:39 +0000 (18:09 +0100)]
Update bundle
Anton Khorev [Tue, 25 Oct 2022 10:52:28 +0000 (13:52 +0300)]
Pass min/max lat/lon to notes index rss builder
Anton Khorev [Tue, 25 Oct 2022 10:35:18 +0000 (13:35 +0300)]
Pass min/max lat/lon to notes rss feed builder
translatewiki.net [Mon, 24 Oct 2022 11:13:08 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
Brian DeRocher [Sun, 23 Oct 2022 20:00:38 +0000 (16:00 -0400)]
get_text("reversegeocode/result") returns an XML node. We want to get the text value of that node.
This will unescape ' into an apostrophe.
All callers of this function will later re-encode it depending out output whether it be HTML in an email, or XML in an RSS feed.
* app/mailers/user_mail.rb
* app/helpers/geocode_helper.rb
* app/views/api/notes/feed.rss.builder
* app/views/api/notes/_note.rss.builder
Fixes openstreetmap/openstreetmap-website#3761
Tom Hughes [Sun, 23 Oct 2022 17:26:29 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3763'
Andy Allan [Sun, 23 Oct 2022 13:49:07 +0000 (14:49 +0100)]
Merge pull request #3764 from openbrian/patch-3
another trailing space
Brian DeRocher [Sat, 22 Oct 2022 21:31:32 +0000 (17:31 -0400)]
another trailing space
My editor does this too. There's one more trailing space in this area of the file.
dependabot[bot] [Fri, 21 Oct 2022 23:00:39 +0000 (23:00 +0000)]
Bump eslint from 8.25.0 to 8.26.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.25.0 to 8.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.25.0...v8.26.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 20 Oct 2022 11:14:54 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 19 Oct 2022 17:18:24 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3758'
Andy Allan [Wed, 19 Oct 2022 15:24:08 +0000 (16:24 +0100)]
Merge pull request #3694 from AntonKhorev/share-button-group
Use Bootstrap button group for share tabs
Andy Allan [Wed, 19 Oct 2022 15:14:33 +0000 (16:14 +0100)]
Merge branch 'pull/3692'
Andy Allan [Wed, 19 Oct 2022 15:11:57 +0000 (16:11 +0100)]
Minor tweaks to the markdown, in particular to wrap code characters in backticks
Andy Allan [Wed, 19 Oct 2022 15:00:08 +0000 (16:00 +0100)]
Merge pull request #3693 from lectrician1/patch-2
Clarify Windows installation bad + alternatives
Andy Allan [Wed, 19 Oct 2022 14:58:17 +0000 (15:58 +0100)]
Merge pull request #3700 from AntonKhorev/about
Replace <h5> used to set the font size with Bootstrap class h5
Andy Allan [Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)]
Merge pull request #3704 from AntonKhorev/leaflet-control-groups
Group map controls explicitly
Tom Hughes [Tue, 18 Oct 2022 17:43:21 +0000 (18:43 +0100)]
Update bundle
Tom Hughes [Tue, 18 Oct 2022 17:42:02 +0000 (18:42 +0100)]
Test that tags are included correctly in the changeset feed
Tom Hughes [Mon, 17 Oct 2022 17:58:47 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/3755'