]> git.openstreetmap.org Git - rails.git/log
rails.git
7 months agoMerge remote-tracking branch 'upstream/pull/4455'
Tom Hughes [Mon, 6 May 2024 08:15:03 +0000 (09:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4455'

7 months agoImprove flash message handling in users#new
Tom Hughes [Mon, 6 May 2024 07:54:36 +0000 (08:54 +0100)]
Improve flash message handling in users#new

Only show the duplicate email message if we actually have errors
logged against the email field, and then show it as a warning.

In all other cases we show the generic informational hint about
social logins and pre-existing accounts.

7 months agoMerge remote-tracking branch 'upstream/pull/4753'
Tom Hughes [Sun, 5 May 2024 17:54:57 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4753'

7 months agoMerge remote-tracking branch 'upstream/pull/4752'
Tom Hughes [Sun, 5 May 2024 17:51:37 +0000 (18:51 +0100)]
Merge remote-tracking branch 'upstream/pull/4752'

7 months agoMerge remote-tracking branch 'upstream/pull/4751'
Tom Hughes [Sun, 5 May 2024 17:48:08 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4751'

7 months agoRemove tests for message paths without ids
Anton Khorev [Sun, 5 May 2024 14:14:37 +0000 (17:14 +0300)]
Remove tests for message paths without ids

These tests don't fail because they reuse ids from previous requests.

7 months agoRedirect to inbox after marking a message as read/unread disregarding referer
Anton Khorev [Sun, 5 May 2024 12:32:47 +0000 (15:32 +0300)]
Redirect to inbox after marking a message as read/unread disregarding referer

Avoids staying on the message page after the "Mark as unread" button is clicked and immediately reading the message again.

7 months agoRename unread_message to message in messages controller test
Anton Khorev [Sun, 5 May 2024 12:21:09 +0000 (15:21 +0300)]
Rename unread_message to message in messages controller test

There's only one message in the affected test methods. That message becomes read during the test.

7 months agoBump eslint from 9.1.1 to 9.2.0
dependabot[bot] [Fri, 3 May 2024 23:24:28 +0000 (23:24 +0000)]
Bump eslint from 9.1.1 to 9.2.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.1.1 to 9.2.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/v9.1.1...v9.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
7 months agoMerge remote-tracking branch 'upstream/pull/4747'
Tom Hughes [Thu, 2 May 2024 16:52:45 +0000 (17:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4747'

7 months agoMerge remote-tracking branch 'upstream/pull/4746'
Tom Hughes [Thu, 2 May 2024 16:48:03 +0000 (17:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4746'

7 months agoMerge remote-tracking branch 'upstream/pull/4745'
Tom Hughes [Thu, 2 May 2024 16:44:06 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/4745'

7 months agoMerge remote-tracking branch 'upstream/pull/4748'
Tom Hughes [Thu, 2 May 2024 16:40:47 +0000 (17:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4748'

7 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 May 2024 12:17:23 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

7 months agoBump osm-community-index from 5.6.2 to 5.6.3
dependabot[bot] [Wed, 1 May 2024 23:48:22 +0000 (23:48 +0000)]
Bump osm-community-index from 5.6.2 to 5.6.3

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.2 to 5.6.3.
- [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.2...v5.6.3)

---
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>
7 months agoLink to previous/next nonempty user's changeset on changeset pages
Anton Khorev [Wed, 1 May 2024 12:02:59 +0000 (15:02 +0300)]
Link to previous/next nonempty user's changeset on changeset pages

7 months agoUse common sidebar_browse_check in notes controller test
Anton Khorev [Wed, 1 May 2024 10:21:24 +0000 (13:21 +0300)]
Use common sidebar_browse_check in notes controller test

7 months agoRestore constraints on note id parameter
Anton Khorev [Wed, 1 May 2024 10:17:14 +0000 (13:17 +0300)]
Restore constraints on note id parameter

7 months agoUpdate outdated tags of amenity/office/shop browse icons
Anton Khorev [Wed, 1 May 2024 07:25:38 +0000 (10:25 +0300)]
Update outdated tags of amenity/office/shop browse icons

7 months agoMerge remote-tracking branch 'upstream/pull/4735'
Tom Hughes [Tue, 30 Apr 2024 17:58:42 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/4735'

7 months agoMerge remote-tracking branch 'upstream/pull/4712'
Tom Hughes [Tue, 30 Apr 2024 17:46:14 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/4712'

7 months agoMerge remote-tracking branch 'upstream/pull/4744'
Tom Hughes [Tue, 30 Apr 2024 17:41:01 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/4744'

7 months agoMerge remote-tracking branch 'upstream/pull/4740'
Tom Hughes [Tue, 30 Apr 2024 17:37:25 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4740'

7 months agoMerge remote-tracking branch 'upstream/pull/4739'
Tom Hughes [Tue, 30 Apr 2024 17:34:43 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4739'

7 months agoUpdate bundle
Tom Hughes [Tue, 30 Apr 2024 17:07:55 +0000 (18:07 +0100)]
Update bundle

7 months agoSet trace thumbnail link display property to inline-block, fixing focus outline
Anton Khorev [Tue, 30 Apr 2024 14:14:07 +0000 (17:14 +0300)]
Set trace thumbnail link display property to inline-block, fixing focus outline

This makes <a> as tall as <img> inside it.

7 months agoDon't change display property of messages table header cell
Anton Khorev [Tue, 30 Apr 2024 03:58:43 +0000 (06:58 +0300)]
Don't change display property of messages table header cell

7 months agoRemove .message-summary css classes and selectors
Anton Khorev [Tue, 30 Apr 2024 03:49:30 +0000 (06:49 +0300)]
Remove .message-summary css classes and selectors

They are not necessary because they select every table body row, and the table already has its own class.

7 months agoInvert dark browse icons in dark mode
Anton Khorev [Mon, 29 Apr 2024 04:16:01 +0000 (07:16 +0300)]
Invert dark browse icons in dark mode

7 months agoWrite browse icons using Sass loop
Anton Khorev [Mon, 29 Apr 2024 04:14:30 +0000 (07:14 +0300)]
Write browse icons using Sass loop

7 months agoMerge remote-tracking branch 'upstream/pull/4736'
Tom Hughes [Mon, 29 Apr 2024 21:40:53 +0000 (22:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4736'

7 months agoMerge remote-tracking branch 'upstream/pull/4737'
Tom Hughes [Mon, 29 Apr 2024 21:38:55 +0000 (22:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4737'

7 months agoMerge remote-tracking branch 'upstream/pull/4738'
Tom Hughes [Mon, 29 Apr 2024 21:37:30 +0000 (22:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4738'

7 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Apr 2024 12:16:28 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

7 months agoRe-introduce additional round trip for verifying auth_provider
Milan Cvetkovic [Fri, 26 Apr 2024 06:08:04 +0000 (06:08 +0000)]
Re-introduce additional round trip for verifying auth_provider

7 months agoRename verified_email to email_hmac parameter in /users/new
Milan Cvetkovic [Mon, 22 Apr 2024 08:42:01 +0000 (08:42 +0000)]
Rename verified_email to email_hmac parameter in /users/new

7 months agoRemove "Sign up" and "Log in" from application bar when sessions or user controller...
Milan Cvetkovic [Tue, 5 Mar 2024 15:00:44 +0000 (15:00 +0000)]
Remove "Sign up" and "Log in" from application bar when sessions or user controller are active

7 months agoAdd preferred provider social signup
Milan Cvetkovic [Wed, 6 Dec 2023 10:31:52 +0000 (10:31 +0000)]
Add preferred provider social signup

- Add preferred provider for authorization to login and signup pages.
  To use, the 3rd party application would have to add `preferred_provider=...`
  parameter to OAuth2 authorization request.
- Resize 3rd party provider icons
- Add "login to authorize" heading to login and signup screens

7 months agoRemove color override for user dropdown message count
Anton Khorev [Mon, 29 Apr 2024 07:07:10 +0000 (10:07 +0300)]
Remove color override for user dropdown message count

7 months agoAdapt Leaflet context menus to dark mode
Anton Khorev [Mon, 29 Apr 2024 06:47:14 +0000 (09:47 +0300)]
Adapt Leaflet context menus to dark mode

7 months agoRemove white background from tree, gate, level crossing icons
Anton Khorev [Mon, 29 Apr 2024 06:11:18 +0000 (09:11 +0300)]
Remove white background from tree, gate, level crossing icons

7 months agoMark copyright example image as fluid
Tom Hughes [Sun, 28 Apr 2024 17:47:13 +0000 (18:47 +0100)]
Mark copyright example image as fluid

This preserves the old behaviour after #4732 is applied.

7 months agoMerge remote-tracking branch 'upstream/pull/4732'
Tom Hughes [Sun, 28 Apr 2024 17:45:44 +0000 (18:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4732'

7 months agoMerge remote-tracking branch 'upstream/pull/4731'
Tom Hughes [Sun, 28 Apr 2024 17:41:17 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/4731'

7 months agoMerge remote-tracking branch 'upstream/pull/4730'
Tom Hughes [Sun, 28 Apr 2024 17:39:50 +0000 (18:39 +0100)]
Merge remote-tracking branch 'upstream/pull/4730'

7 months agoRemove custom css applied to images inside paragraphs
Anton Khorev [Sat, 27 Apr 2024 23:44:34 +0000 (02:44 +0300)]
Remove custom css applied to images inside paragraphs

7 months agoRemove custom css for note icons on welcome and fixthemap pages
Anton Khorev [Sat, 27 Apr 2024 23:22:33 +0000 (02:22 +0300)]
Remove custom css for note icons on welcome and fixthemap pages

7 months agoUse .align-text-bottom for feed icon images
Anton Khorev [Sat, 27 Apr 2024 23:07:53 +0000 (02:07 +0300)]
Use .align-text-bottom for feed icon images

7 months agoRemove border=0 from feed icons
Anton Khorev [Sat, 27 Apr 2024 23:02:15 +0000 (02:02 +0300)]
Remove border=0 from feed icons

7 months agoUse .icon-link for new diary entry icon
Anton Khorev [Sat, 27 Apr 2024 22:57:38 +0000 (01:57 +0300)]
Use .icon-link for new diary entry icon

7 months agoMerge remote-tracking branch 'upstream/pull/4728'
Tom Hughes [Sat, 27 Apr 2024 14:19:45 +0000 (15:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4728'

7 months agoMerge remote-tracking branch 'upstream/pull/4725'
Tom Hughes [Sat, 27 Apr 2024 14:16:19 +0000 (15:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4725'

7 months agoMerge remote-tracking branch 'upstream/pull/4724'
Tom Hughes [Sat, 27 Apr 2024 14:15:24 +0000 (15:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4724'

7 months agoMerge remote-tracking branch 'upstream/pull/4727'
Tom Hughes [Sat, 27 Apr 2024 14:14:06 +0000 (15:14 +0100)]
Merge remote-tracking branch 'upstream/pull/4727'

7 months agoMerge remote-tracking branch 'upstream/pull/4726'
Tom Hughes [Sat, 27 Apr 2024 14:12:05 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/4726'

7 months agoAdd tabbed navigation for signup/login screens
Milan Cvetkovic [Tue, 19 Mar 2024 12:38:15 +0000 (12:38 +0000)]
Add tabbed navigation for signup/login screens

7 months agoAdd social signin buttons to signup screen, avoid repeating round trip to auth provider.
Milan Cvetkovic [Mon, 18 Mar 2024 15:32:00 +0000 (15:32 +0000)]
Add social signin buttons to signup screen, avoid repeating round trip to auth provider.

7 months agoExtract 3rd party login buttons from login screen
Milan Cvetkovic [Mon, 18 Mar 2024 12:37:28 +0000 (12:37 +0000)]
Extract 3rd party login buttons from login screen

7 months agoMove 'Forgot password' link to the right of password label
Milan Cvetkovic [Mon, 18 Mar 2024 11:51:23 +0000 (11:51 +0000)]
Move 'Forgot password' link to the right of password label

7 months agoRemove email confirmation field in signup form
Milan Cvetkovic [Tue, 12 Dec 2023 09:47:54 +0000 (09:47 +0000)]
Remove email confirmation field in signup form

7 months agoMerge login and terms screens, assume TOU and contributor terms are accepted on ...
Milan Cvetkovic [Wed, 6 Dec 2023 10:31:52 +0000 (10:31 +0000)]
Merge login and terms screens, assume TOU and contributor terms are accepted on /user/new form

This eliminates the need for "terms" screen after /user/new form..
Terms screen is still required for legacy users who never accepted the terms.

7 months agoAdd globe on top of login screen, narrow login/signup screens
Milan Cvetkovic [Mon, 18 Mar 2024 10:14:23 +0000 (10:14 +0000)]
Add globe on top of login screen, narrow login/signup screens

7 months agoStretch query result links, listen to their over/out events, don't simulate clicks
Anton Khorev [Sat, 27 Apr 2024 03:58:59 +0000 (06:58 +0300)]
Stretch query result links, listen to their over/out events, don't simulate clicks

7 months agoRemove action item class from non-action query results
Anton Khorev [Sat, 27 Apr 2024 03:57:20 +0000 (06:57 +0300)]
Remove action item class from non-action query results

7 months agoRemove custom small font size
Anton Khorev [Sat, 27 Apr 2024 02:38:06 +0000 (05:38 +0300)]
Remove custom small font size

7 months agoRemove unused colors from sass parameters
Anton Khorev [Sat, 27 Apr 2024 02:23:30 +0000 (05:23 +0300)]
Remove unused colors from sass parameters

7 months agoRemove simulating clicks on <a> when <li> is clicked
Anton Khorev [Sat, 27 Apr 2024 02:08:31 +0000 (05:08 +0300)]
Remove simulating clicks on <a> when <li> is clicked

The simulation is not required because the link is stretched.

7 months agoUse Bootstrap actionable items in search results lists
Anton Khorev [Sat, 27 Apr 2024 01:17:04 +0000 (04:17 +0300)]
Use Bootstrap actionable items in search results lists

7 months agoMerge remote-tracking branch 'upstream/pull/4720'
Tom Hughes [Fri, 26 Apr 2024 17:02:55 +0000 (18:02 +0100)]
Merge remote-tracking branch 'upstream/pull/4720'

7 months agoMerge remote-tracking branch 'upstream/pull/4722'
Tom Hughes [Fri, 26 Apr 2024 16:50:44 +0000 (17:50 +0100)]
Merge remote-tracking branch 'upstream/pull/4722'

7 months agoMerge remote-tracking branch 'upstream/pull/4721'
Tom Hughes [Fri, 26 Apr 2024 16:44:19 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/4721'

7 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Apr 2024 12:17:47 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.

7 months agoUse bindPopup options to set min width of user popup
Anton Khorev [Thu, 25 Apr 2024 01:48:26 +0000 (04:48 +0300)]
Use bindPopup options to set min width of user popup

7 months agoAdapt Leaflet popups to dark mode
Anton Khorev [Thu, 25 Apr 2024 00:47:07 +0000 (03:47 +0300)]
Adapt Leaflet popups to dark mode

7 months agoUse Bootstrap actionable items in changeset lists
Anton Khorev [Wed, 24 Apr 2024 23:35:57 +0000 (02:35 +0300)]
Use Bootstrap actionable items in changeset lists

7 months agoMerge remote-tracking branch 'upstream/pull/4717'
Tom Hughes [Wed, 24 Apr 2024 17:18:54 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/4717'

7 months agoMerge remote-tracking branch 'upstream/pull/4716'
Tom Hughes [Wed, 24 Apr 2024 17:18:07 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/4716'

7 months agoMerge remote-tracking branch 'upstream/pull/4711'
Tom Hughes [Wed, 24 Apr 2024 16:55:33 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4711'

7 months agoUpdate to iD v2.29.0
Martin Raifer [Wed, 24 Apr 2024 12:26:09 +0000 (14:26 +0200)]
Update to iD v2.29.0

7 months agoUse emphasis color in "Where this is?" hover state
Anton Khorev [Wed, 24 Apr 2024 01:42:17 +0000 (04:42 +0300)]
Use emphasis color in "Where this is?" hover state

7 months agoMatch list group hover background with table hover background
Anton Khorev [Wed, 24 Apr 2024 01:04:38 +0000 (04:04 +0300)]
Match list group hover background with table hover background

7 months agoUse Bootstrap actionable items in query results
Anton Khorev [Wed, 17 Apr 2024 01:09:04 +0000 (04:09 +0300)]
Use Bootstrap actionable items in query results

7 months agoFix rubocop warning
Tom Hughes [Tue, 23 Apr 2024 17:59:09 +0000 (18:59 +0100)]
Fix rubocop warning

7 months agoMerge remote-tracking branch 'upstream/pull/4703'
Tom Hughes [Tue, 23 Apr 2024 16:20:08 +0000 (17:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4703'

7 months agoMerge remote-tracking branch 'upstream/pull/4706'
Tom Hughes [Tue, 23 Apr 2024 16:17:24 +0000 (17:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4706'

7 months agoStick to mini_racer 0.9.0 for now
Tom Hughes [Tue, 23 Apr 2024 16:17:02 +0000 (17:17 +0100)]
Stick to mini_racer 0.9.0 for now

https://github.com/rubyjs/mini_racer/issues/300

7 months agoMerge remote-tracking branch 'upstream/pull/4715'
Tom Hughes [Tue, 23 Apr 2024 15:43:17 +0000 (16:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4715'

7 months agoUpdate bundle
Tom Hughes [Tue, 23 Apr 2024 15:41:18 +0000 (16:41 +0100)]
Update bundle

7 months agoBump eslint from 9.1.0 to 9.1.1
dependabot[bot] [Mon, 22 Apr 2024 23:57:25 +0000 (23:57 +0000)]
Bump eslint from 9.1.0 to 9.1.1

Bumps [eslint](https://github.com/eslint/eslint) from 9.1.0 to 9.1.1.
- [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/v9.1.0...v9.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
7 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Apr 2024 12:16:53 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

7 months agoFix rubocop warning
Tom Hughes [Sun, 21 Apr 2024 18:07:16 +0000 (19:07 +0100)]
Fix rubocop warning

7 months agoMerge remote-tracking branch 'upstream/pull/4713'
Tom Hughes [Sun, 21 Apr 2024 18:05:42 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4713'

7 months agoOrder configuration consistently in test and production environments
Tom Hughes [Sun, 21 Apr 2024 18:03:07 +0000 (19:03 +0100)]
Order configuration consistently in test and production environments

7 months agoMerge remote-tracking branch 'upstream/pull/4714'
Tom Hughes [Sun, 21 Apr 2024 17:59:32 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4714'

7 months agoMerge remote-tracking branch 'upstream/pull/4708'
Tom Hughes [Sun, 21 Apr 2024 17:54:16 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/4708'

7 months agoBump eslint from 9.0.0 to 9.1.0
dependabot[bot] [Fri, 19 Apr 2024 23:45:33 +0000 (23:45 +0000)]
Bump eslint from 9.0.0 to 9.1.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.0.0 to 9.1.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/v9.0.0...v9.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
7 months agocalculate hash once per test run, per thread
Josh Thompson [Fri, 19 Apr 2024 00:07:03 +0000 (18:07 -0600)]
calculate hash once per test run, per thread

7 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Apr 2024 12:19:14 +0000 (14:19 +0200)]
Localisation updates from https://translatewiki.net.

7 months agounburden call for User fabrication
Josh Thompson [Wed, 17 Apr 2024 19:52:39 +0000 (13:52 -0600)]
unburden  call for User fabrication

Speeds up tests rather nicely, derived via trial and error
reasonably confident that this is nice. overheard it mentioned by Vladimir
Dementyev in a Codewithjason podcast, so when my intuition already led me
to the user factory, I figured 'on principle/correctness, I should at least
look at what happens if we sidestep the native hashing library, because it's
something i was already curious about.

7 months agoForce word wrap in tag table
Anton Khorev [Wed, 17 Apr 2024 14:30:53 +0000 (17:30 +0300)]
Force word wrap in tag table

Bootstrap disables word wrap in rtl, this overrides it.