]> git.openstreetmap.org Git - rails.git/log
rails.git
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

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

8 months agoBump qs from 6.11.2 to 6.12.0
dependabot[bot] [Wed, 6 Mar 2024 23:04:30 +0000 (23:04 +0000)]
Bump qs from 6.11.2 to 6.12.0

Bumps [qs](https://github.com/ljharb/qs) from 6.11.2 to 6.12.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.2...v6.12.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
8 months agoMerge remote-tracking branch 'upstream/pull/4558'
Tom Hughes [Tue, 5 Mar 2024 19:32:48 +0000 (19:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4558'

8 months agoUpdate bundle
Tom Hughes [Tue, 5 Mar 2024 18:56:04 +0000 (18:56 +0000)]
Update bundle

8 months agoPrevent default event when clicking OpenID button
Anton Khorev [Tue, 5 Mar 2024 09:25:11 +0000 (12:25 +0300)]
Prevent default event when clicking OpenID button

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

8 months agoRemove assert_response when followed by assert_redirected_to
Anton Khorev [Sat, 2 Mar 2024 10:48:49 +0000 (13:48 +0300)]
Remove assert_response when followed by assert_redirected_to

8 months agoMerge remote-tracking branch 'upstream/pull/4555'
Tom Hughes [Sat, 2 Mar 2024 16:55:04 +0000 (16:55 +0000)]
Merge remote-tracking branch 'upstream/pull/4555'

8 months agoBe paranoid when sending password reset emails
Andy Allan [Sat, 2 Mar 2024 15:48:54 +0000 (15:48 +0000)]
Be paranoid when sending password reset emails

This implements what is known as "paranoid" password reset flash
messages (using the terminology from Devise). It avoids revealing
whether the supplied email address is already registered.

Added an explicit test for this situation, so that the test for
email non-existance is separate from the duplicate-case tests.

8 months agoMerge remote-tracking branch 'upstream/pull/4324'
Tom Hughes [Fri, 1 Mar 2024 19:23:51 +0000 (19:23 +0000)]
Merge remote-tracking branch 'upstream/pull/4324'

8 months agoMerge remote-tracking branch 'upstream/pull/4552'
Tom Hughes [Fri, 1 Mar 2024 19:12:50 +0000 (19:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4552'

8 months agoRefactor common element version view code
Anton Khorev [Fri, 1 Mar 2024 12:58:48 +0000 (15:58 +0300)]
Refactor common element version view code

8 months agoAdd links to reveal/hide redacted version data
Anton Khorev [Fri, 1 Mar 2024 11:23:04 +0000 (14:23 +0300)]
Add links to reveal/hide redacted version data

8 months agoDon't show unredacted element versions to non-moderators
Anton Khorev [Fri, 1 Mar 2024 09:29:06 +0000 (12:29 +0300)]
Don't show unredacted element versions to non-moderators

8 months agoShow unredacted element history
Anton Khorev [Sat, 4 Nov 2023 18:58:04 +0000 (21:58 +0300)]
Show unredacted element history

8 months agoAdd link to unredacted element history for moderators
Anton Khorev [Sat, 4 Nov 2023 18:14:29 +0000 (21:14 +0300)]
Add link to unredacted element history for moderators

8 months agoMove changeset created/closed time ago strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 09:51:34 +0000 (12:51 +0300)]
Move changeset created/closed time ago strings to changesets locale

8 months agoMove changeset created/closed popup/feed strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 09:16:11 +0000 (12:16 +0300)]
Move changeset created/closed popup/feed strings to changesets locale

8 months agoMove all browse.changeset strings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 08:23:01 +0000 (11:23 +0300)]
Move all browse.changeset strings to changesets locale

8 months agoMove changeset element headings to changesets locale
Anton Khorev [Thu, 29 Feb 2024 08:02:30 +0000 (11:02 +0300)]
Move changeset element headings to changesets locale

8 months agoMove changeset show action to changesets controller
Anton Khorev [Sat, 10 Feb 2024 17:33:33 +0000 (20:33 +0300)]
Move changeset show action to changesets controller

8 months agoMerge remote-tracking branch 'upstream/pull/4551'
Tom Hughes [Thu, 29 Feb 2024 16:52:59 +0000 (16:52 +0000)]
Merge remote-tracking branch 'upstream/pull/4551'

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

8 months agoUpdate to iD v2.28.1
Martin Raifer [Thu, 29 Feb 2024 10:04:27 +0000 (11:04 +0100)]
Update to iD v2.28.1

8 months agoDrop user tokens table
Tom Hughes [Wed, 28 Feb 2024 20:59:34 +0000 (20:59 +0000)]
Drop user tokens table

8 months agoMerge remote-tracking branch 'upstream/pull/4548'
Tom Hughes [Wed, 28 Feb 2024 15:29:38 +0000 (15:29 +0000)]
Merge remote-tracking branch 'upstream/pull/4548'

8 months agoUpdate to iD v2.28.0
Martin Raifer [Wed, 28 Feb 2024 13:03:47 +0000 (14:03 +0100)]
Update to iD v2.28.0

8 months agoGenerate email change token before changing the address
Tom Hughes [Tue, 27 Feb 2024 20:53:51 +0000 (20:53 +0000)]
Generate email change token before changing the address

8 months agoAdd a system test to do an end-end test of changing email
Tom Hughes [Tue, 27 Feb 2024 20:53:24 +0000 (20:53 +0000)]
Add a system test to do an end-end test of changing email

8 months agoMake the user factory generate valid passwords
Tom Hughes [Tue, 27 Feb 2024 20:52:18 +0000 (20:52 +0000)]
Make the user factory generate valid passwords

8 months agoMerge remote-tracking branch 'upstream/pull/4545'
Tom Hughes [Tue, 27 Feb 2024 18:07:04 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4545'

8 months agoUpdate bundle
Tom Hughes [Tue, 27 Feb 2024 18:06:23 +0000 (18:06 +0000)]
Update bundle

8 months agoBump osm-community-index from 5.6.1 to 5.6.2
dependabot[bot] [Mon, 26 Feb 2024 23:20:54 +0000 (23:20 +0000)]
Bump osm-community-index from 5.6.1 to 5.6.2

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.6.1...v5.6.2)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Feb 2024 12:17:37 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoFix rubocop warnings
Tom Hughes [Sun, 25 Feb 2024 14:17:05 +0000 (14:17 +0000)]
Fix rubocop warnings

8 months agoMerge remote-tracking branch 'upstream/pull/4251'
Tom Hughes [Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4251'

8 months agoMerge remote-tracking branch 'upstream/pull/4272'
Tom Hughes [Sun, 25 Feb 2024 13:40:11 +0000 (13:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4272'

8 months agoRequire display names to have a minimum unicode width of 3 columns
Tom Hughes [Sun, 25 Feb 2024 13:16:40 +0000 (13:16 +0000)]
Require display names to have a minimum unicode width of 3 columns

Fixes #4538

8 months agoMerge pull request #4534 from tomhughes/list-headers
Andy Allan [Sun, 25 Feb 2024 10:36:05 +0000 (11:36 +0100)]
Merge pull request #4534 from tomhughes/list-headers

Add standard List-XXX headers to some notification mails

8 months agoMerge pull request #4536 from tomhughes/trace-size-limit
Andy Allan [Sun, 25 Feb 2024 10:35:20 +0000 (11:35 +0100)]
Merge pull request #4536 from tomhughes/trace-size-limit

Add a limit on the number of points in a GPS trace

8 months agoMerge pull request #4535 from tomhughes/rails-tokens
Andy Allan [Sun, 25 Feb 2024 10:32:15 +0000 (11:32 +0100)]
Merge pull request #4535 from tomhughes/rails-tokens

Use rails generated tokens for emails

8 months agoMerge pull request #4539 from tomhughes/confirmed-emails
Andy Allan [Sun, 25 Feb 2024 10:31:21 +0000 (11:31 +0100)]
Merge pull request #4539 from tomhughes/confirmed-emails

Treat github and wikipedia provided emails as confirmed

8 months agoTreat github and wikipedia provided emails as confirmed
Tom Hughes [Sun, 25 Feb 2024 10:04:18 +0000 (10:04 +0000)]
Treat github and wikipedia provided emails as confirmed

Fixes #4270

8 months agoAdd a limit on the number of points in a GPS trace
Tom Hughes [Sat, 24 Feb 2024 14:34:09 +0000 (14:34 +0000)]
Add a limit on the number of points in a GPS trace

8 months agoAdd standard List-XXX headers to some notification messages
Tom Hughes [Sat, 24 Feb 2024 09:57:21 +0000 (09:57 +0000)]
Add standard List-XXX headers to some notification messages

8 months agoAdd unsubscribe link to changeset notification mails
Tom Hughes [Sat, 24 Feb 2024 11:08:53 +0000 (11:08 +0000)]
Add unsubscribe link to changeset notification mails

8 months agoMove mechanics of changeset subscriptions into the model
Tom Hughes [Sat, 24 Feb 2024 10:11:57 +0000 (10:11 +0000)]
Move mechanics of changeset subscriptions into the model

8 months agoRename path for changeset API subscription methods
Tom Hughes [Sat, 24 Feb 2024 11:09:24 +0000 (11:09 +0000)]
Rename path for changeset API subscription methods

8 months agoMerge remote-tracking branch 'upstream/pull/4463'
Tom Hughes [Sun, 25 Feb 2024 09:28:48 +0000 (09:28 +0000)]
Merge remote-tracking branch 'upstream/pull/4463'

8 months agoMerge pull request #4537 from tomhughes/multiple-trace-priority
Andy Allan [Sun, 25 Feb 2024 08:50:10 +0000 (09:50 +0100)]
Merge pull request #4537 from tomhughes/multiple-trace-priority

Use a reduced priority for batch trace uploads

8 months agoReduce priority of multiple simulataneous trace imports
Tom Hughes [Sat, 24 Feb 2024 17:04:37 +0000 (17:04 +0000)]
Reduce priority of multiple simulataneous trace imports

8 months agoMove scheduling of trace import and destruction to the model
Tom Hughes [Sat, 24 Feb 2024 16:57:26 +0000 (16:57 +0000)]
Move scheduling of trace import and destruction to the model

8 months agoUse rails tokens for signup confirmations
Tom Hughes [Thu, 7 Dec 2023 18:49:49 +0000 (18:49 +0000)]
Use rails tokens for signup confirmations

8 months agoUse rails tokens for email changes
Tom Hughes [Sat, 24 Feb 2024 13:42:26 +0000 (13:42 +0000)]
Use rails tokens for email changes

8 months agoUse rails tokens for password resets
Tom Hughes [Thu, 7 Dec 2023 18:30:12 +0000 (18:30 +0000)]
Use rails tokens for password resets

8 months agoAdd scope for unexpired user tokens
Tom Hughes [Wed, 6 Dec 2023 20:28:40 +0000 (20:28 +0000)]
Add scope for unexpired user tokens

8 months agoRemove bogus span element from eu translation
Tom Hughes [Sat, 24 Feb 2024 08:44:32 +0000 (08:44 +0000)]
Remove bogus span element from eu translation

8 months agoMerge remote-tracking branch 'upstream/pull/4533'
Tom Hughes [Sat, 24 Feb 2024 08:38:03 +0000 (08:38 +0000)]
Merge remote-tracking branch 'upstream/pull/4533'

8 months agoBump eslint from 8.56.0 to 8.57.0
dependabot[bot] [Fri, 23 Feb 2024 23:25:21 +0000 (23:25 +0000)]
Bump eslint from 8.56.0 to 8.57.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.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.56.0...v8.57.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
8 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Feb 2024 12:18:07 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

8 months agoUpdate to rails 7.1.3.2
Tom Hughes [Thu, 22 Feb 2024 07:13:07 +0000 (07:13 +0000)]
Update to rails 7.1.3.2

9 months agoUpdate to rails 7.1.3.1
Tom Hughes [Wed, 21 Feb 2024 21:16:09 +0000 (21:16 +0000)]
Update to rails 7.1.3.1

9 months agoMerge remote-tracking branch 'upstream/pull/4523'
Tom Hughes [Tue, 20 Feb 2024 18:35:23 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/4523'

9 months agoMerge remote-tracking branch 'upstream/pull/4530'
Tom Hughes [Tue, 20 Feb 2024 18:29:44 +0000 (18:29 +0000)]
Merge remote-tracking branch 'upstream/pull/4530'

9 months agoMerge remote-tracking branch 'upstream/pull/4529'
Tom Hughes [Tue, 20 Feb 2024 18:19:42 +0000 (18:19 +0000)]
Merge remote-tracking branch 'upstream/pull/4529'

9 months agoUpdate bundle
Tom Hughes [Tue, 20 Feb 2024 18:10:48 +0000 (18:10 +0000)]
Update bundle

9 months agoMove changeset feed locale strings from browse section to changesets
Anton Khorev [Tue, 20 Feb 2024 15:08:52 +0000 (18:08 +0300)]
Move changeset feed locale strings from browse section to changesets

9 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2024 12:17:26 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

9 months agoLink to current and old element versions from changeset pages
Anton Khorev [Mon, 19 Feb 2024 01:34:41 +0000 (04:34 +0300)]
Link to current and old element versions from changeset pages

9 months agoMove element title to changeset/relation list item
Anton Khorev [Mon, 19 Feb 2024 00:32:09 +0000 (03:32 +0300)]
Move element title to changeset/relation list item

9 months agoAdd element list item helper
Anton Khorev [Sun, 18 Feb 2024 18:30:07 +0000 (21:30 +0300)]
Add element list item helper

9 months agoSeparate element strikethrough from classes
Anton Khorev [Sun, 18 Feb 2024 18:04:04 +0000 (21:04 +0300)]
Separate element strikethrough from classes

9 months agoApply changeset element classes to list items
Anton Khorev [Sun, 18 Feb 2024 17:20:27 +0000 (20:20 +0300)]
Apply changeset element classes to list items

9 months agoInclude some XML special characters in the changeset feed comment test
Tom Hughes [Sun, 18 Feb 2024 18:45:22 +0000 (18:45 +0000)]
Include some XML special characters in the changeset feed comment test

9 months agoMerge remote-tracking branch 'upstream/pull/4522'
Tom Hughes [Sun, 18 Feb 2024 18:42:12 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/4522'

9 months agoAdd unsubscribe link to diary comment notification email
Anton Khorev [Sat, 17 Feb 2024 03:16:42 +0000 (06:16 +0300)]
Add unsubscribe link to diary comment notification email

9 months agoAdd diary entry subscribe/unsubscribe GET pages
Anton Khorev [Sat, 17 Feb 2024 02:43:13 +0000 (05:43 +0300)]
Add diary entry subscribe/unsubscribe GET pages

9 months agoTest changeset feed entry titles
Anton Khorev [Fri, 16 Feb 2024 17:05:25 +0000 (20:05 +0300)]
Test changeset feed entry titles

9 months agoTest if changeset feed entries are in specified order
Anton Khorev [Fri, 16 Feb 2024 16:58:43 +0000 (19:58 +0300)]
Test if changeset feed entries are in specified order

9 months agoRemove html type from changeset feed entry titles
Anton Khorev [Wed, 14 Feb 2024 16:22:45 +0000 (19:22 +0300)]
Remove html type from changeset feed entry titles

9 months agoMerge remote-tracking branch 'upstream/pull/4521'
Tom Hughes [Wed, 14 Feb 2024 18:43:26 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/4521'

9 months agoPrevent dividers between diary comments overflowing into the margins
Tom Hughes [Wed, 14 Feb 2024 18:40:48 +0000 (18:40 +0000)]
Prevent dividers between diary comments overflowing into the margins

9 months agoMerge remote-tracking branch 'upstream/pull/4518'
Tom Hughes [Wed, 14 Feb 2024 18:21:23 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/4518'

9 months agoRemove unused browse.changeset.comment locale string
Anton Khorev [Wed, 14 Feb 2024 14:55:41 +0000 (17:55 +0300)]
Remove unused browse.changeset.comment locale string

9 months agoAdjust diary comment widths and borders
Anton Khorev [Tue, 13 Feb 2024 23:04:47 +0000 (02:04 +0300)]
Adjust diary comment widths and borders

9 months agoMerge remote-tracking branch 'upstream/pull/4517'
Tom Hughes [Tue, 13 Feb 2024 18:52:50 +0000 (18:52 +0000)]
Merge remote-tracking branch 'upstream/pull/4517'

9 months agoMerge remote-tracking branch 'upstream/pull/4515'
Tom Hughes [Tue, 13 Feb 2024 18:48:17 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/4515'

9 months agoUpdate bundle
Tom Hughes [Tue, 13 Feb 2024 18:05:54 +0000 (18:05 +0000)]
Update bundle

9 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Feb 2024 12:24:14 +0000 (13:24 +0100)]
Localisation updates from https://translatewiki.net.

9 months agoAdd diary discussion heading and move subscribe button next to it
Anton Khorev [Sun, 11 Feb 2024 23:36:06 +0000 (02:36 +0300)]
Add diary discussion heading and move subscribe button next to it

9 months agoMove previous/next user's changeset links to bottom
Anton Khorev [Sun, 11 Feb 2024 22:43:13 +0000 (01:43 +0300)]
Move previous/next user's changeset links to bottom

9 months agoScroll to api error message
Anton Khorev [Mon, 8 Jan 2024 14:53:50 +0000 (17:53 +0300)]
Scroll to api error message

9 months agoShow api error message if failed to (un)subscribe
Anton Khorev [Mon, 8 Jan 2024 14:44:05 +0000 (17:44 +0300)]
Show api error message if failed to (un)subscribe

9 months agoRemove duplicated code from changeset comments list
Anton Khorev [Mon, 8 Jan 2024 13:49:15 +0000 (16:49 +0300)]
Remove duplicated code from changeset comments list

9 months agoSimplify moderator check when showing changeset comments
Anton Khorev [Mon, 8 Jan 2024 13:21:02 +0000 (16:21 +0300)]
Simplify moderator check when showing changeset comments

9 months agoRemove hidden comments test from controller tests
Anton Khorev [Mon, 8 Jan 2024 13:14:15 +0000 (16:14 +0300)]
Remove hidden comments test from controller tests

9 months agoTurn hide/unhide comment controls into buttons
Anton Khorev [Mon, 8 Jan 2024 13:02:16 +0000 (16:02 +0300)]
Turn hide/unhide comment controls into buttons

9 months agoTest changeset commenting
Anton Khorev [Mon, 8 Jan 2024 11:59:06 +0000 (14:59 +0300)]
Test changeset commenting