]> git.openstreetmap.org Git - rails.git/log
rails.git
7 months agoMerge remote-tracking branch 'upstream/pull/4625'
Tom Hughes [Tue, 26 Mar 2024 18:32:52 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4625'

7 months agoMerge remote-tracking branch 'upstream/pull/4626'
Tom Hughes [Tue, 26 Mar 2024 18:22:16 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4626'

7 months agoMerge remote-tracking branch 'upstream/pull/4622'
Tom Hughes [Tue, 26 Mar 2024 18:17:05 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/4622'

7 months agoMerge remote-tracking branch 'upstream/pull/4621'
Tom Hughes [Tue, 26 Mar 2024 18:14:04 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/4621'

7 months agoUpdate bundle
Tom Hughes [Tue, 26 Mar 2024 17:30:05 +0000 (17:30 +0000)]
Update bundle

8 months agoAdd links for admins from user page to user list filtered by ip/status
Anton Khorev [Tue, 26 Mar 2024 03:12:16 +0000 (06:12 +0300)]
Add links for admins from user page to user list filtered by ip/status

8 months agoAdd found users count to users page
Anton Khorev [Tue, 26 Mar 2024 02:19:46 +0000 (05:19 +0300)]
Add found users count to users page

8 months agoUse before/after pagination on users page
Anton Khorev [Tue, 26 Mar 2024 01:27:55 +0000 (04:27 +0300)]
Use before/after pagination on users page

8 months agoMake "include" and "limit" keyword args of pagination method
Anton Khorev [Tue, 26 Mar 2024 01:20:59 +0000 (04:20 +0300)]
Make "include" and "limit" keyword args of pagination method

8 months agoMove common pagination code to mixin
Anton Khorev [Thu, 14 Sep 2023 00:55:20 +0000 (03:55 +0300)]
Move common pagination code to mixin

8 months agoRemove assert_method from api controllers
Anton Khorev [Mon, 25 Mar 2024 04:15:16 +0000 (07:15 +0300)]
Remove assert_method from api controllers

8 months agoReplace lookup_user_by_id with load_resource
Anton Khorev [Mon, 25 Mar 2024 03:29:46 +0000 (06:29 +0300)]
Replace lookup_user_by_id with load_resource

8 months agoMerge remote-tracking branch 'upstream/pull/4619'
Tom Hughes [Sun, 24 Mar 2024 18:38:48 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4619'

8 months agoMerge remote-tracking branch 'upstream/pull/4620'
Tom Hughes [Sun, 24 Mar 2024 18:13:47 +0000 (18:13 +0000)]
Merge remote-tracking branch 'upstream/pull/4620'

8 months agoShorten note path helper calls in tests
Anton Khorev [Sun, 24 Mar 2024 14:19:05 +0000 (17:19 +0300)]
Shorten note path helper calls in tests

8 months agoReplace collection partial with single item in changeset comments feed
Anton Khorev [Sun, 24 Mar 2024 04:08:59 +0000 (07:08 +0300)]
Replace collection partial with single item in changeset comments feed

8 months agoMerge remote-tracking branch 'upstream/pull/4612'
Tom Hughes [Thu, 21 Mar 2024 17:25:41 +0000 (17:25 +0000)]
Merge remote-tracking branch 'upstream/pull/4612'

8 months agoSimplify and test downloaded changeset element sorting
Anton Khorev [Thu, 21 Mar 2024 17:02:18 +0000 (20:02 +0300)]
Simplify and test downloaded changeset element sorting

8 months agoMerge remote-tracking branch 'upstream/pull/4562'
Tom Hughes [Thu, 21 Mar 2024 16:38:18 +0000 (16:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4562'

8 months agoMerge remote-tracking branch 'upstream/pull/4609'
Tom Hughes [Thu, 21 Mar 2024 16:32:36 +0000 (16:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4609'

8 months agoMerge remote-tracking branch 'upstream/pull/4608'
Tom Hughes [Thu, 21 Mar 2024 16:30:21 +0000 (16:30 +0000)]
Merge remote-tracking branch 'upstream/pull/4608'

8 months agoSimplify remaining link_to ... user_path in views
Anton Khorev [Thu, 21 Mar 2024 15:07:56 +0000 (18:07 +0300)]
Simplify remaining link_to ... user_path in views

8 months agoSimplify links on diary pages
Anton Khorev [Thu, 21 Mar 2024 14:26:20 +0000 (17:26 +0300)]
Simplify links on diary pages

8 months agoMerge pull request #4602 from AntonKhorev/no-lego-trace-details
Andy Allan [Thu, 21 Mar 2024 14:01:13 +0000 (14:01 +0000)]
Merge pull request #4602 from AntonKhorev/no-lego-trace-details

Avoid lego translation in trace time/user/tags string

8 months agoMerge pull request #4607 from AntonKhorev/fix-traces-tabs
Andy Allan [Thu, 21 Mar 2024 14:00:41 +0000 (14:00 +0000)]
Merge pull request #4607 from AntonKhorev/fix-traces-tabs

Fix user's traces tab

8 months agoNest data-turbo="true" attributes in partials
Gregory Igelmund [Wed, 20 Mar 2024 19:17:39 +0000 (20:17 +0100)]
Nest data-turbo="true" attributes in partials

8 months agoRemove now-obsolete partials in app/views/messages/*
Gregory Igelmund [Wed, 6 Mar 2024 09:35:01 +0000 (10:35 +0100)]
Remove now-obsolete partials in app/views/messages/*

8 months agoapplication.js: Call updateHeader when turbo:render completed
Gregory Igelmund [Mon, 4 Mar 2024 14:54:38 +0000 (15:54 +0100)]
application.js: Call updateHeader when turbo:render completed

8 months agoEnable Turbo Drive with morphing for Messages#{destroy,mark}
Gregory Igelmund [Wed, 28 Feb 2024 15:20:24 +0000 (16:20 +0100)]
Enable Turbo Drive with morphing for Messages#{destroy,mark}

8 months agoGemfile: Add turbo-rails
Gregory Igelmund [Wed, 28 Feb 2024 15:05:01 +0000 (16:05 +0100)]
Gemfile: Add turbo-rails

8 months agoFix user's traces tab link
Anton Khorev [Thu, 21 Mar 2024 13:43:15 +0000 (16:43 +0300)]
Fix user's traces tab link

8 months agoChange user's traces tab label to a string without "GPX"
Anton Khorev [Thu, 21 Mar 2024 13:19:05 +0000 (16:19 +0300)]
Change user's traces tab label to a string without "GPX"

8 months agoMerge remote-tracking branch 'upstream/pull/4606'
Tom Hughes [Thu, 21 Mar 2024 12:58:29 +0000 (12:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4606'

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Mar 2024 12:19:52 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoReplace csp_meta_tag with `secure_headers` nonce
Gregory Igelmund [Thu, 21 Mar 2024 11:09:32 +0000 (12:09 +0100)]
Replace csp_meta_tag with `secure_headers` nonce

8 months agoMerge pull request #4604 from AntonKhorev/block-factory-revoked-expired
Andy Allan [Thu, 21 Mar 2024 10:43:00 +0000 (10:43 +0000)]
Merge pull request #4604 from AntonKhorev/block-factory-revoked-expired

Make factory-created revoked blocks inactive

8 months agoMake factory-created revoked blocks inactive
Anton Khorev [Thu, 21 Mar 2024 03:09:14 +0000 (06:09 +0300)]
Make factory-created revoked blocks inactive

8 months agoAvoid lego translation in trace time/user/tags string
Anton Khorev [Wed, 20 Mar 2024 22:34:46 +0000 (01:34 +0300)]
Avoid lego translation in trace time/user/tags string

8 months agoMerge remote-tracking branch 'upstream/pull/4600'
Tom Hughes [Wed, 20 Mar 2024 17:22:00 +0000 (17:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4600'

8 months agoMerge pull request #4599 from AntonKhorev/rename-messages-local
Andy Allan [Wed, 20 Mar 2024 17:20:57 +0000 (17:20 +0000)]
Merge pull request #4599 from AntonKhorev/rename-messages-local

Rename message local in message table partials

8 months agoMerge pull request #4598 from AntonKhorev/fix-trace-description
Andy Allan [Wed, 20 Mar 2024 17:11:37 +0000 (17:11 +0000)]
Merge pull request #4598 from AntonKhorev/fix-trace-description

Fix trace feed image urls and local variable names

8 months agoFix warning on unescaped hyphen in regexp
Andy Allan [Wed, 20 Mar 2024 17:05:28 +0000 (17:05 +0000)]
Fix warning on unescaped hyphen in regexp

8 months agoRename message local in message table partials
Anton Khorev [Wed, 20 Mar 2024 16:43:32 +0000 (19:43 +0300)]
Rename message local in message table partials

8 months agoRename trace local in trace description partial
Anton Khorev [Wed, 20 Mar 2024 15:49:10 +0000 (18:49 +0300)]
Rename trace local in trace description partial

8 months agoMerge pull request #4574 from urbalazs/wiki-prefixes-240313
Andy Allan [Wed, 20 Mar 2024 15:45:10 +0000 (15:45 +0000)]
Merge pull request #4574 from urbalazs/wiki-prefixes-240313

Add more wiki prefixes

8 months agoUse absolute paths to trace icon in traces feed
Anton Khorev [Wed, 20 Mar 2024 15:34:15 +0000 (18:34 +0300)]
Use absolute paths to trace icon in traces feed

8 months agoMerge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages
Andy Allan [Wed, 20 Mar 2024 14:44:42 +0000 (14:44 +0000)]
Merge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages

Simplify link_to user calls on block pages

8 months agoMerge pull request #4593 from AntonKhorev/simplify-link_to-on-issue-pages
Andy Allan [Wed, 20 Mar 2024 14:42:20 +0000 (14:42 +0000)]
Merge pull request #4593 from AntonKhorev/simplify-link_to-on-issue-pages

Simplify link_to user calls on issue pages

8 months agoMerge pull request #4594 from AntonKhorev/simplify-link_to-on-message-pages
Andy Allan [Wed, 20 Mar 2024 14:30:06 +0000 (14:30 +0000)]
Merge pull request #4594 from AntonKhorev/simplify-link_to-on-message-pages

Simplify link_to calls on message pages

8 months agoMerge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages
Andy Allan [Wed, 20 Mar 2024 12:01:26 +0000 (12:01 +0000)]
Merge pull request #4595 from AntonKhorev/simplify-links-on-trace-pages

Simplify links on trace pages

8 months agoSimplify links on trace pages
Anton Khorev [Wed, 20 Mar 2024 03:07:24 +0000 (06:07 +0300)]
Simplify links on trace pages

8 months agoSimplify link_to calls on message pages
Anton Khorev [Wed, 20 Mar 2024 01:48:02 +0000 (04:48 +0300)]
Simplify link_to calls on message pages

8 months agoSimplify link_to user calls on issue pages
Anton Khorev [Wed, 20 Mar 2024 01:38:34 +0000 (04:38 +0300)]
Simplify link_to user calls on issue pages

8 months agoSimplify link_to user calls on block pages
Anton Khorev [Wed, 20 Mar 2024 01:27:58 +0000 (04:27 +0300)]
Simplify link_to user calls on block pages

8 months agoMerge remote-tracking branch 'upstream/pull/4591'
Tom Hughes [Tue, 19 Mar 2024 18:24:33 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/4591'

8 months agoUpdate bundle
Tom Hughes [Tue, 19 Mar 2024 18:09:05 +0000 (18:09 +0000)]
Update bundle

8 months agoShorten user path helper calls in tests
Anton Khorev [Tue, 19 Mar 2024 03:58:43 +0000 (06:58 +0300)]
Shorten user path helper calls in tests

8 months agoMerge remote-tracking branch 'upstream/pull/4586'
Tom Hughes [Mon, 18 Mar 2024 17:32:34 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4586'

8 months agoMerge remote-tracking branch 'upstream/pull/4585'
Tom Hughes [Mon, 18 Mar 2024 17:31:06 +0000 (17:31 +0000)]
Merge remote-tracking branch 'upstream/pull/4585'

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Mar 2024 12:17:47 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoCount only tbody rows when testing tables
Anton Khorev [Sun, 17 Mar 2024 22:31:12 +0000 (01:31 +0300)]
Count only tbody rows when testing tables

8 months agoChange "people mapping nearby" empty inbox/outbox link to dashboard
Anton Khorev [Sun, 17 Mar 2024 20:51:25 +0000 (23:51 +0300)]
Change "people mapping nearby" empty inbox/outbox link to dashboard

8 months agoMerge remote-tracking branch 'upstream/pull/4584'
Tom Hughes [Sat, 16 Mar 2024 16:02:53 +0000 (16:02 +0000)]
Merge remote-tracking branch 'upstream/pull/4584'

8 months agoSimplify changeset/element-related link_to calls
Anton Khorev [Sat, 16 Mar 2024 15:36:33 +0000 (18:36 +0300)]
Simplify changeset/element-related link_to calls

8 months agoMerge remote-tracking branch 'upstream/pull/4583'
Tom Hughes [Sat, 16 Mar 2024 11:34:17 +0000 (11:34 +0000)]
Merge remote-tracking branch 'upstream/pull/4583'

8 months agoMerge remote-tracking branch 'upstream/pull/4582'
Tom Hughes [Sat, 16 Mar 2024 11:32:34 +0000 (11:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4582'

8 months agoMerge remote-tracking branch 'upstream/pull/4581'
Tom Hughes [Sat, 16 Mar 2024 11:28:58 +0000 (11:28 +0000)]
Merge remote-tracking branch 'upstream/pull/4581'

8 months agoMove changeset subscribe/unsubscribe to resourceful routes
Anton Khorev [Sat, 16 Mar 2024 03:11:07 +0000 (06:11 +0300)]
Move changeset subscribe/unsubscribe to resourceful routes

8 months agoDon't pass paths to element_single_current_link helper
Anton Khorev [Sat, 16 Mar 2024 01:51:42 +0000 (04:51 +0300)]
Don't pass paths to element_single_current_link helper

8 months agoTest links to containing relations from element pages
Anton Khorev [Sat, 16 Mar 2024 00:04:54 +0000 (03:04 +0300)]
Test links to containing relations from element pages

8 months agoExtend containing relation fix to nested relations
Tom Hughes [Fri, 15 Mar 2024 18:09:35 +0000 (18:09 +0000)]
Extend containing relation fix to nested relations

8 months agoFix display of containing relations
Tom Hughes [Fri, 15 Mar 2024 18:01:42 +0000 (18:01 +0000)]
Fix display of containing relations

8 months agoMerge remote-tracking branch 'upstream/pull/4579'
Tom Hughes [Fri, 15 Mar 2024 17:02:45 +0000 (17:02 +0000)]
Merge remote-tracking branch 'upstream/pull/4579'

8 months agoMerge remote-tracking branch 'upstream/pull/4578'
Tom Hughes [Fri, 15 Mar 2024 16:58:27 +0000 (16:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4578'

8 months agoMerge remote-tracking branch 'upstream/pull/4580'
Tom Hughes [Fri, 15 Mar 2024 16:55:02 +0000 (16:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4580'

8 months agoUse official "Log in to Microsoft" icon
Milan Cvetkovic [Fri, 15 Mar 2024 11:06:24 +0000 (11:06 +0000)]
Use official "Log in to Microsoft" icon

Downloaded from https://learn.microsoft.com/en-us/entra/identity-platform/howto-add-branding-in-apps
on 2024-03-15.

8 months agoMove current element actions to their own controllers
Anton Khorev [Fri, 15 Mar 2024 00:24:45 +0000 (03:24 +0300)]
Move current element actions to their own controllers

8 months agoMerge remote-tracking branch 'upstream/pull/4576'
Tom Hughes [Thu, 14 Mar 2024 20:01:11 +0000 (20:01 +0000)]
Merge remote-tracking branch 'upstream/pull/4576'

8 months agoMerge remote-tracking branch 'upstream/pull/4575'
Tom Hughes [Thu, 14 Mar 2024 19:55:26 +0000 (19:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4575'

8 months agoMerge remote-tracking branch 'upstream/pull/4577'
Tom Hughes [Thu, 14 Mar 2024 19:51:28 +0000 (19:51 +0000)]
Merge remote-tracking branch 'upstream/pull/4577'

8 months agoFix "blocked" user signup page
Milan Cvetkovic [Thu, 14 Mar 2024 15:51:41 +0000 (15:51 +0000)]
Fix "blocked" user signup page

- Remove `<h1>` and `<h2>` tags for main text.
- Emphasize1st paragraph with `<strong>`

8 months agoReplace "Login" labels with "Log in" when used as a verb
Milan Cvetkovic [Tue, 5 Mar 2024 15:07:28 +0000 (15:07 +0000)]
Replace "Login" labels with "Log in" when used as a verb

8 months agoMove element history actions to old element controllers
Anton Khorev [Thu, 14 Mar 2024 15:10:18 +0000 (18:10 +0300)]
Move element history actions to old element controllers

8 months agoCollect node/way/relation CanCanCan subjects into arrays
Anton Khorev [Wed, 13 Mar 2024 23:44:25 +0000 (02:44 +0300)]
Collect node/way/relation CanCanCan subjects into arrays

8 months agoAdd more wiki prefixes
Balázs Úr [Wed, 13 Mar 2024 18:46:48 +0000 (19:46 +0100)]
Add more wiki prefixes

8 months agoMerge remote-tracking branch 'upstream/pull/4566'
Tom Hughes [Wed, 13 Mar 2024 18:05:48 +0000 (18:05 +0000)]
Merge remote-tracking branch 'upstream/pull/4566'

8 months agoMerge pull request #4573 from AntonKhorev/api-routes-module
Andy Allan [Wed, 13 Mar 2024 16:45:17 +0000 (16:45 +0000)]
Merge pull request #4573 from AntonKhorev/api-routes-module

Use :module to specify api controllers module

8 months agoUse :module to specify api controllers module
Anton Khorev [Mon, 4 Mar 2024 10:47:19 +0000 (13:47 +0300)]
Use :module to specify api controllers module

8 months agoMerge pull request #4557 from AntonKhorev/rename-api-old-version
Andy Allan [Wed, 13 Mar 2024 15:51:41 +0000 (15:51 +0000)]
Merge pull request #4557 from AntonKhorev/rename-api-old-version

Rename api old element actions and path helpers

8 months agoMerge pull request #4572 from lonvia/update-hosting-partners
Andy Allan [Wed, 13 Mar 2024 14:27:53 +0000 (14:27 +0000)]
Merge pull request #4572 from lonvia/update-hosting-partners

Update hosting partners as per OWG policy

8 months agoupdate hosting partners as per OWG policy
Sarah Hoffmann [Wed, 13 Mar 2024 09:50:44 +0000 (10:50 +0100)]
update hosting partners as per OWG policy

8 months agoMerge remote-tracking branch 'upstream/pull/4570'
Tom Hughes [Tue, 12 Mar 2024 18:48:09 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/4570'

8 months agoUpdate bundle
Tom Hughes [Tue, 12 Mar 2024 18:08:38 +0000 (18:08 +0000)]
Update bundle

8 months agoFix whitespace in changeset element lists
Anton Khorev [Mon, 11 Mar 2024 19:39:13 +0000 (22:39 +0300)]
Fix whitespace in changeset element lists

8 months agoConsistently exclude hidden diaries from spam scoring
Tom Hughes [Tue, 12 Mar 2024 00:13:20 +0000 (00:13 +0000)]
Consistently exclude hidden diaries from spam scoring

8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Mar 2024 12:16:40 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoTest validation of title and description presence for redactions
Ishmeet Singh [Thu, 7 Mar 2024 18:39:06 +0000 (00:09 +0530)]
Test validation of title and description presence for redactions

8 months agoAdd NOT NULL constraints to redaction title and description
Ishmeet Singh [Thu, 7 Mar 2024 18:38:26 +0000 (00:08 +0530)]
Add NOT NULL constraints to redaction title and description

8 months agoMerge remote-tracking branch 'upstream/pull/4564'
Tom Hughes [Thu, 7 Mar 2024 18:13:50 +0000 (18:13 +0000)]
Merge remote-tracking branch 'upstream/pull/4564'

8 months agoMerge pull request #4550 from tomhughes/drop-user-tokens
Andy Allan [Thu, 7 Mar 2024 13:51:44 +0000 (13:51 +0000)]
Merge pull request #4550 from tomhughes/drop-user-tokens

Drop user tokens table