Commit graph

14864 commits

Author SHA1 Message Date
Tom Hughes
f9e29ff7cf Merge remote-tracking branch 'upstream/pull/5227' 2024-09-19 18:04:00 +01:00
dependabot[bot]
b34de25b11
Bump google-protobuf from 3.25.4 to 3.25.5
Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.4...v3.25.5)

---
updated-dependencies:
- dependency-name: google-protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-19 16:28:30 +00:00
Anton Khorev
6595d43e3c Merge branch 'pull/5117' 2024-09-19 16:49:29 +03:00
translatewiki.net
232ac735cd
Localisation updates from https://translatewiki.net. 2024-09-19 14:14:54 +02:00
Anton Khorev
f90c7c4970 Merge branch 'pull/5209' 2024-09-18 15:28:13 +03:00
Tom Hughes
7141d5d846 Merge remote-tracking branch 'upstream/pull/5221' 2024-09-18 09:32:29 +01:00
Tom Hughes
557401e78f Merge remote-tracking branch 'upstream/pull/5220' 2024-09-18 09:31:53 +01:00
Nenad Vujicic
091bf88a5f Added greeting to friendship notification
Added greeting 'Hi {user display name},' to friendship notification email. As a side effect, user_mailer.friendship_notification.hi is not anymore reported as unused.
2024-09-17 23:20:41 +02:00
Tom Hughes
2fd2317bc6 Update bundle 2024-09-17 19:02:11 +01:00
Amir E. Aharoni
64f1742a6e
Remove unnecessary comma from several translatable messages 2024-09-17 10:46:18 -04:00
Anton Khorev
8c071a4d1e Merge branch 'pull/5212' 2024-09-17 15:26:19 +03:00
Tom Hughes
28650d4dfb Drop creation_ip column 2024-09-16 17:41:22 +01:00
Anton Khorev
e8029e2aff Merge branch 'pull/5218' 2024-09-16 15:17:27 +03:00
Tom Hughes
5bac49c51f Ignore the creation_ip column which is no longer used 2024-09-15 21:39:25 +01:00
Tom Hughes
fe96c0a524 Replace creation_ip with creation_address 2024-09-15 19:38:21 +01:00
Tom Hughes
33c0e95ebe Merge remote-tracking branch 'upstream/pull/5203' 2024-09-15 19:30:22 +01:00
Tom Hughes
496a872f02 Merge remote-tracking branch 'upstream/pull/5217' 2024-09-15 19:20:30 +01:00
Tom Hughes
3025500b9c Merge remote-tracking branch 'upstream/pull/5214' 2024-09-15 19:08:31 +01:00
Tom Hughes
03505596b6 Merge remote-tracking branch 'upstream/pull/5213' 2024-09-15 18:54:48 +01:00
mmd-osm
bcc07e87bf Remove unused Namefinder translation strings
Namefinder was introduced in commit d2bd786 and later removed in fcebfd1f. Since then, these translation strings are unused.

Analysis using: `git log -p -S "towns" -- ':(exclude)*config/locales/*.yml' ':(exclude)*vendor/assets/*'`
2024-09-15 18:56:21 +02:00
mmd-osm
5aa63c60ec Remove unused .greeting translation in changeset_comment_notification
Text and html templates use .hi instead
2024-09-15 18:35:21 +02:00
mmd-osm
57b402f8fe Remove unused translation key users.new.external auth
Unused since commit 0c7c950149
2024-09-15 11:23:27 +02:00
mmd-osm
efb3e0c81b Ignore users.auth_failure.* as unused translation
Translation keys are used for OmniAuth callbacks, and defined by the
respective OmniAuth provider. It is expected that these strings are
unsued in the OSM website repo.
2024-09-15 11:23:27 +02:00
Nenad Vujicic
8d77891fd6 Show friend options only when user is logged in
Fixes #5199. Displays "Add Friend" and "Unfriend" links (buttons) on user profile page only if user is logged-in.
2024-09-14 22:48:31 +02:00
Anton Khorev
ed74bc036b Fix browse elements timeouts 2024-09-14 18:03:48 +03:00
Anton Khorev
54c0361744 Always show changeset element page links below headings 2024-09-14 17:15:11 +03:00
Tom Hughes
25dbc4d43e Merge remote-tracking branch 'upstream/pull/5211' 2024-09-14 10:55:50 +01:00
Tom Hughes
70f1b327b4 Merge remote-tracking branch 'upstream/pull/5178' 2024-09-13 18:09:37 +01:00
Anton Khorev
4e97231269 Fix element pagination width calculation 2024-09-13 18:50:22 +03:00
Anton Khorev
0423d18a8f Merge branch 'pull/5207' 2024-09-13 13:16:27 +03:00
Tom Hughes
9ab0aee030 Backfill the creation_address column from creation_ip 2024-09-13 11:04:34 +01:00
Anton Khorev
e47187a8fb Merge branch 'pull/5206' 2024-09-13 12:18:17 +03:00
Anton Khorev
b81d645f0c Merge branch 'pull/5196' 2024-09-13 11:48:38 +03:00
Tom Hughes
b969c6f7ab Order changeset elements for consistent pagination 2024-09-12 22:56:29 +01:00
Tom Hughes
d7880031a1 Merge remote-tracking branch 'upstream/pull/5208' 2024-09-12 22:25:54 +01:00
Nenad Vujicic
0425aeebbc Added ignoring unused translations auth.providers
Added ignoring reporting translations auth.providers.* as unused because they are used at app/views/application/_auth_providers.html.erb, ..
2024-09-12 21:47:58 +02:00
Nenad Vujicic
c81d343d8d Removed unused translations in activerecord.errors
Removed unused translations activerecord.errors.messages.{invalid_email_address, email_address_not_routable} started / ended using in 63862d0 / 90a7efc.
2024-09-12 21:35:44 +02:00
Tom Hughes
6d49bc6ebb Make select all checkbox on users list work with turbo 2024-09-12 19:10:26 +01:00
Tom Hughes
4f2789c73c Merge remote-tracking branch 'upstream/pull/5204' 2024-09-12 18:30:14 +01:00
Tom Hughes
c41a83214a Merge remote-tracking branch 'upstream/pull/5202' 2024-09-12 18:30:10 +01:00
Tom Hughes
b70770f8dd Remove last traces of OPNVKarte layer 2024-09-12 18:29:55 +01:00
Tom Hughes
11cb5c7fed Remove HTML tags from polish resource 2024-09-12 18:29:21 +01:00
Tom Hughes
68f69b89af Remove HTML tags from polish resource 2024-09-12 18:22:19 +01:00
Anton Khorev
9c93fe906d Fix friendships limit flash message 2024-09-12 15:42:36 +03:00
translatewiki.net
1a20044dc7
Localisation updates from https://translatewiki.net. 2024-09-12 14:15:40 +02:00
Anton Khorev
fa09a62d39 Add subway, tram, bus stops to mapnik map key 2024-09-12 14:03:31 +03:00
Anton Khorev
e2a6701696 Merge branch 'pull/5182' 2024-09-12 09:43:56 +03:00
Anton Khorev
36d72d289a Merge branch 'pull/5181' 2024-09-12 09:18:49 +03:00
Tom Hughes
e22d19f004 Limit the number of users counted for users#index
This view uses cursor based pagination but then undermines
that by counting the total number of users so limit the effect
of that but counting a maximum of ten pages of users.
2024-09-11 18:28:35 +01:00
Tom Hughes
17bea98e19 Merge remote-tracking branch 'upstream/pull/5189' 2024-09-11 17:13:56 +01:00