]> git.openstreetmap.org Git - rails.git/log
rails.git
15 months agoMerge remote-tracking branch 'upstream/pull/4190'
Tom Hughes [Sun, 20 Aug 2023 17:49:32 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/pull/4190'

15 months agoMerge remote-tracking branch 'upstream/pull/4169'
Tom Hughes [Sun, 20 Aug 2023 10:04:28 +0000 (11:04 +0100)]
Merge remote-tracking branch 'upstream/pull/4169'

15 months agoChange provider name to "microsoft"
Milan Cvetkovic [Thu, 17 Aug 2023 08:22:13 +0000 (08:22 +0000)]
Change provider name to "microsoft"

15 months agoAdd migration script
Milan Cvetkovic [Wed, 16 Aug 2023 12:04:32 +0000 (12:04 +0000)]
Add migration script

15 months agoUpdate tests for microsoft_graph endpoints
Milan Cvetkovic [Mon, 14 Aug 2023 12:18:40 +0000 (12:18 +0000)]
Update tests for microsoft_graph endpoints

15 months agoRespond with plaintext when user not found in changeset query
Anton Khorev [Sat, 19 Aug 2023 17:22:19 +0000 (20:22 +0300)]
Respond with plaintext when user not found in changeset query

The response used to be of type xml with empty body, which is not valid xml.

15 months agoMerge remote-tracking branch 'upstream/pull/4187'
Tom Hughes [Sat, 19 Aug 2023 10:30:33 +0000 (11:30 +0100)]
Merge remote-tracking branch 'upstream/pull/4187'

15 months agoMerge remote-tracking branch 'upstream/pull/4186'
Tom Hughes [Sat, 19 Aug 2023 10:29:17 +0000 (11:29 +0100)]
Merge remote-tracking branch 'upstream/pull/4186'

15 months agoReplace links to donate.osm.org with supporting.osm.org
Tom Hughes [Sat, 19 Aug 2023 10:22:54 +0000 (11:22 +0100)]
Replace links to donate.osm.org with supporting.osm.org

15 months agoExpose note query limit values in api capabilities
Anton Khorev [Sat, 19 Aug 2023 02:40:34 +0000 (05:40 +0300)]
Expose note query limit values in api capabilities

15 months agoAdd missing changeset query limit capabilities test
Anton Khorev [Sat, 19 Aug 2023 02:40:05 +0000 (05:40 +0300)]
Add missing changeset query limit capabilities test

15 months agoUse max note query limit setting in tests
Anton Khorev [Sat, 19 Aug 2023 02:23:42 +0000 (05:23 +0300)]
Use max note query limit setting in tests

15 months agoMove note query limit values to settings
Anton Khorev [Sat, 19 Aug 2023 02:06:00 +0000 (05:06 +0300)]
Move note query limit values to settings

15 months agoBump puma from 5.6.6 to 5.6.7
dependabot[bot] [Sat, 19 Aug 2023 02:01:30 +0000 (02:01 +0000)]
Bump puma from 5.6.6 to 5.6.7

Bumps [puma](https://github.com/puma/puma) from 5.6.6 to 5.6.7.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.6...v5.6.7)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoMerge remote-tracking branch 'upstream/pull/4185'
Tom Hughes [Fri, 18 Aug 2023 18:32:38 +0000 (19:32 +0100)]
Merge remote-tracking branch 'upstream/pull/4185'

15 months agoMake the versions call default to XML
Tom Hughes [Fri, 18 Aug 2023 18:26:53 +0000 (19:26 +0100)]
Make the versions call default to XML

15 months agoMerge remote-tracking branch 'upstream/pull/4182'
Tom Hughes [Fri, 18 Aug 2023 18:25:36 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4182'

15 months agoMerge remote-tracking branch 'upstream/pull/4180'
Tom Hughes [Fri, 18 Aug 2023 18:20:55 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4180'

15 months agoMerge remote-tracking branch 'upstream/pull/4181'
Tom Hughes [Fri, 18 Aug 2023 18:20:36 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4181'

15 months agoAdd 'User' to selectable types in issues search for moderators
Anton Khorev [Fri, 18 Aug 2023 15:48:38 +0000 (18:48 +0300)]
Add 'User' to selectable types in issues search for moderators

Reported users are either directly assigned to moderators or ofter reassigned to them.

15 months agoAdd JSON output to /api/versions
Anton Khorev [Fri, 18 Aug 2023 02:08:41 +0000 (05:08 +0300)]
Add JSON output to /api/versions

15 months agoBump osm-community-index from 5.5.4 to 5.5.5
dependabot[bot] [Thu, 17 Aug 2023 23:39:40 +0000 (23:39 +0000)]
Bump osm-community-index from 5.5.4 to 5.5.5

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.4 to 5.5.5.
- [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.5.4...v5.5.5)

---
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>
15 months agoUpdate to iD v2.27.1
Martin Raifer [Thu, 17 Aug 2023 21:48:49 +0000 (23:48 +0200)]
Update to iD v2.27.1

15 months agoMerge remote-tracking branch 'upstream/pull/4171'
Tom Hughes [Thu, 17 Aug 2023 18:07:37 +0000 (19:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4171'

15 months agoMerge remote-tracking branch 'upstream/pull/4179'
Tom Hughes [Thu, 17 Aug 2023 17:55:03 +0000 (18:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4179'

15 months agoMerge remote-tracking branch 'upstream/pull/4178'
Tom Hughes [Thu, 17 Aug 2023 17:51:17 +0000 (18:51 +0100)]
Merge remote-tracking branch 'upstream/pull/4178'

15 months agoAdd color keys to note tables
Anton Khorev [Thu, 17 Aug 2023 16:20:37 +0000 (19:20 +0300)]
Add color keys to note tables

15 months agoRemove right leaflet toolbar position override
Anton Khorev [Wed, 16 Aug 2023 15:34:53 +0000 (18:34 +0300)]
Remove right leaflet toolbar position override

Has no effect, doesn't take rtl into account.
Was added in https://github.com/openstreetmap/openstreetmap-website/commit/537d72b0f66562475808249a1a2ef3223df5dd52#diff-fe520170ce0c939dc1e59f3395a360a1866b4da19b474c9f0b35112f72e952d8R117

15 months agoReplace references to windowslive with microsoft_graph
Milan Cvetkovic [Mon, 14 Aug 2023 08:42:14 +0000 (08:42 +0000)]
Replace references to windowslive with microsoft_graph

15 months agoUse omniauth-microsoft_graph instead of omniauth-windowslive
Milan Cvetkovic [Mon, 14 Aug 2023 10:32:14 +0000 (10:32 +0000)]
Use omniauth-microsoft_graph instead of omniauth-windowslive

Omniauth-microsoft_graph correctly populates 'email' and 'name' fields used by OpenStreetMap.
It also  uses updated endpoints for Microsoft identity provider.

Use email address returned by microsoft_graph provider as a verified address.

Upgrading exisiting users from windowslive to microsoft_graph:
 - upon next login existing `windowslive` users will have to authorizei
   OpenStreetMap application to "Read Your Profile," required for proper reading
   of display name field.

The name of the identity provider in OSM is kept to 'windowslive':
 - the entries in users table with `provider == 'windowslive'`
   can be reused for microsoft_graph provider, since
   the uid field is preserved. Users will not need to repeat the sign up process.
 - OAuth2 callback is still `/auth/windowslive`, no updates to Microsoft Identity Provider portal
   App registration are necessary.

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Aug 2023 11:22:14 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoMerge remote-tracking branch 'upstream/pull/4174'
Tom Hughes [Wed, 16 Aug 2023 17:12:01 +0000 (18:12 +0100)]
Merge remote-tracking branch 'upstream/pull/4174'

15 months agoUpdate to iD v2.27.0
Martin Raifer [Wed, 16 Aug 2023 16:32:02 +0000 (18:32 +0200)]
Update to iD v2.27.0

15 months agoMerge pull request #4133 from AntonKhorev/flex-leaflet-controls
Andy Allan [Wed, 16 Aug 2023 12:43:42 +0000 (13:43 +0100)]
Merge pull request #4133 from AntonKhorev/flex-leaflet-controls

Use multiple columns for map controls if they don't fit vertically

15 months agoMerge pull request #4150 from AntonKhorev/note-table-bootstrap-highlight
Andy Allan [Wed, 16 Aug 2023 12:35:47 +0000 (13:35 +0100)]
Merge pull request #4150 from AntonKhorev/note-table-bootstrap-highlight

Use Bootstrap highlight class in note tables

15 months agoMerge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix
Andy Allan [Wed, 16 Aug 2023 12:24:11 +0000 (13:24 +0100)]
Merge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix

Don't do direction override from Bootstrap reboot of <code>

15 months agoMerge pull request #4148 from tomhughes/avatar-image
Andy Allan [Wed, 16 Aug 2023 10:35:33 +0000 (11:35 +0100)]
Merge pull request #4148 from tomhughes/avatar-image

Use correct extension and type for avatar images attached to mails

15 months agoMerge pull request #4173 from AntonKhorev/comments
Andy Allan [Wed, 16 Aug 2023 10:27:42 +0000 (11:27 +0100)]
Merge pull request #4173 from AntonKhorev/comments

Small changes of diary comments

15 months agoMerge pull request #4172 from tomhughes/user-predicates
Andy Allan [Wed, 16 Aug 2023 10:16:22 +0000 (11:16 +0100)]
Merge pull request #4172 from tomhughes/user-predicates

Fix predicate method names in the user model

15 months agoReplace top margin on comments with bottom padding on diary posts
Anton Khorev [Wed, 16 Aug 2023 01:22:50 +0000 (04:22 +0300)]
Replace top margin on comments with bottom padding on diary posts

15 months agoRemove empty comments anchor
Anton Khorev [Wed, 16 Aug 2023 01:17:50 +0000 (04:17 +0300)]
Remove empty comments anchor

15 months agoFix predicate method names in the user model
Tom Hughes [Tue, 15 Aug 2023 17:53:14 +0000 (18:53 +0100)]
Fix predicate method names in the user model

15 months agoFix new rubocop warnings
Tom Hughes [Tue, 15 Aug 2023 17:22:45 +0000 (18:22 +0100)]
Fix new rubocop warnings

15 months agoUpdate bundle
Tom Hughes [Tue, 15 Aug 2023 17:19:59 +0000 (18:19 +0100)]
Update bundle

15 months agoAdd 'from' and 'to' changeset query parameters
Anton Khorev [Tue, 15 Aug 2023 16:12:11 +0000 (19:12 +0300)]
Add 'from' and 'to' changeset query parameters

15 months agoRevert misleading comment about time restriction
Anton Khorev [Tue, 15 Aug 2023 15:57:04 +0000 (18:57 +0300)]
Revert misleading comment about time restriction

Was added in https://github.com/openstreetmap/openstreetmap-website/commit/afe8dd51ece21325eea8a108515b9426764de5b2#diff-22d3daaccac3ac960d6dbb47e9c6a9d15b0b4cffbbf9ad32d525600f562827f1R420

15 months agoDisallow changesets query with both time and order=oldest
Anton Khorev [Tue, 15 Aug 2023 15:40:49 +0000 (18:40 +0300)]
Disallow changesets query with both time and order=oldest

15 months agoSort changesets by creation time
Anton Khorev [Tue, 15 Aug 2023 15:33:51 +0000 (18:33 +0300)]
Sort changesets by creation time

15 months agoAdd tests for changeset order + from..to queries
Anton Khorev [Tue, 15 Aug 2023 15:29:43 +0000 (18:29 +0300)]
Add tests for changeset order + from..to queries

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Aug 2023 11:20:48 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoMake the close icon on banners more visible
Tom Hughes [Mon, 14 Aug 2023 07:31:10 +0000 (08:31 +0100)]
Make the close icon on banners more visible

Fixes #4165

15 months agoAdd support for dark banner images that need a white close icon
Tom Hughes [Sun, 13 Aug 2023 20:57:09 +0000 (21:57 +0100)]
Add support for dark banner images that need a white close icon

15 months agoRemove SotM 2022 banner, add fundraising banner
Guillaume Rischard [Sun, 13 Aug 2023 20:32:16 +0000 (21:32 +0100)]
Remove SotM 2022 banner, add fundraising banner

Closes #4162

15 months agoSort changesets by close time to match selection
Tom Hughes [Sun, 13 Aug 2023 18:09:54 +0000 (19:09 +0100)]
Sort changesets by close time to match selection

This ensures that the sort can be optimised using the index
when selecting by time.

15 months agoMake the capabilities call default to XML
Tom Hughes [Sun, 13 Aug 2023 11:48:02 +0000 (12:48 +0100)]
Make the capabilities call default to XML

15 months agoMerge remote-tracking branch 'upstream/pull/4144'
Tom Hughes [Sun, 13 Aug 2023 09:50:33 +0000 (10:50 +0100)]
Merge remote-tracking branch 'upstream/pull/4144'

15 months agoMerge remote-tracking branch 'upstream/pull/4159'
Tom Hughes [Sun, 13 Aug 2023 09:38:58 +0000 (10:38 +0100)]
Merge remote-tracking branch 'upstream/pull/4159'

15 months agoCheck that the /api/0.6/capabilities.json route is recognised
Tom Hughes [Sun, 13 Aug 2023 09:33:43 +0000 (10:33 +0100)]
Check that the /api/0.6/capabilities.json route is recognised

15 months agoMerge remote-tracking branch 'upstream/pull/4158'
Tom Hughes [Sun, 13 Aug 2023 09:00:29 +0000 (10:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4158'

15 months agoMerge remote-tracking branch 'upstream/pull/4161'
Tom Hughes [Sun, 13 Aug 2023 08:42:08 +0000 (09:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4161'

15 months agoAllow a srcset to be specified for banners
Tom Hughes [Sun, 13 Aug 2023 08:37:27 +0000 (09:37 +0100)]
Allow a srcset to be specified for banners

15 months agoUse Settings.generator string in tests
Anton Khorev [Sat, 12 Aug 2023 16:07:36 +0000 (19:07 +0300)]
Use Settings.generator string in tests

15 months agoMerge remote-tracking branch 'upstream/pull/4155'
Tom Hughes [Sat, 12 Aug 2023 14:20:41 +0000 (15:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4155'

15 months agoMerge remote-tracking branch 'upstream/pull/4149'
Tom Hughes [Sat, 12 Aug 2023 13:56:27 +0000 (14:56 +0100)]
Merge remote-tracking branch 'upstream/pull/4149'

15 months agoMerge remote-tracking branch 'upstream/pull/4157'
Tom Hughes [Sat, 12 Aug 2023 13:55:01 +0000 (14:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4157'

15 months agoAdd JSON output to /api/0.6/capabilities
Anton Khorev [Sat, 12 Aug 2023 03:00:46 +0000 (06:00 +0300)]
Add JSON output to /api/0.6/capabilities

15 months agoAdd order parameter to changeset query api entry point
Anton Khorev [Sat, 12 Aug 2023 00:57:48 +0000 (03:57 +0300)]
Add order parameter to changeset query api entry point

15 months agoAdd ordered changeset test method
Anton Khorev [Sat, 12 Aug 2023 00:40:52 +0000 (03:40 +0300)]
Add ordered changeset test method

15 months agoBump eslint from 8.46.0 to 8.47.0
dependabot[bot] [Fri, 11 Aug 2023 23:33:34 +0000 (23:33 +0000)]
Bump eslint from 8.46.0 to 8.47.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.46.0 to 8.47.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.46.0...v8.47.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoDon't do direction override from Bootstrap reboot of <code>
Anton Khorev [Fri, 11 Aug 2023 23:23:56 +0000 (02:23 +0300)]
Don't do direction override from Bootstrap reboot of <code>

Later versions of Bootstrap don't have it.
See https://github.com/twbs/bootstrap/pull/35230

15 months agoUse article html elements for diary posts
Anton Khorev [Tue, 8 Aug 2023 16:14:33 +0000 (19:14 +0300)]
Use article html elements for diary posts

15 months agoUpdate diary edit form styling
Anton Khorev [Tue, 8 Aug 2023 15:43:41 +0000 (18:43 +0300)]
Update diary edit form styling

15 months agoUpdate diary comments styling
Anton Khorev [Tue, 8 Aug 2023 15:29:05 +0000 (18:29 +0300)]
Update diary comments styling

15 months agoUpdate diary entry styling
Anton Khorev [Tue, 8 Aug 2023 14:36:02 +0000 (17:36 +0300)]
Update diary entry styling

user_<id> class was kept because
https://github.com/openstreetmap/openstreetmap-website/pull/2266

15 months agoHighlight non-numeric home location coordinates
Anton Khorev [Thu, 10 Aug 2023 01:25:21 +0000 (04:25 +0300)]
Highlight non-numeric home location coordinates

15 months agoDon't construct invalid LatLng objects in home location
Anton Khorev [Thu, 10 Aug 2023 00:41:22 +0000 (03:41 +0300)]
Don't construct invalid LatLng objects in home location

15 months agoExchange focus between home location delete/undelete buttons
Anton Khorev [Thu, 10 Aug 2023 00:24:25 +0000 (03:24 +0300)]
Exchange focus between home location delete/undelete buttons

15 months agoDisable home marker tab focus and cursor change
Anton Khorev [Thu, 10 Aug 2023 00:19:12 +0000 (03:19 +0300)]
Disable home marker tab focus and cursor change

15 months agoDisable show home location button if close enough to map center
Anton Khorev [Thu, 10 Aug 2023 00:02:02 +0000 (03:02 +0300)]
Disable show home location button if close enough to map center

15 months agoSet default home location zoom when centering the map
Anton Khorev [Wed, 9 Aug 2023 23:52:36 +0000 (02:52 +0300)]
Set default home location zoom when centering the map

15 months agoAdd undelete home location button listener
Anton Khorev [Wed, 9 Aug 2023 18:01:12 +0000 (21:01 +0300)]
Add undelete home location button listener

15 months agoAdd delete home location button listener
Anton Khorev [Wed, 9 Aug 2023 17:57:43 +0000 (20:57 +0300)]
Add delete home location button listener

15 months agoAdd show home location button listener
Anton Khorev [Wed, 9 Aug 2023 17:46:52 +0000 (20:46 +0300)]
Add show home location button listener

15 months agoAdd user home location change listeners and buttons
Anton Khorev [Wed, 9 Aug 2023 17:42:34 +0000 (20:42 +0300)]
Add user home location change listeners and buttons

15 months agoAdd home location condition to user model
Anton Khorev [Wed, 9 Aug 2023 17:15:28 +0000 (20:15 +0300)]
Add home location condition to user model

15 months agoCenter messages table cells vertically
Anton Khorev [Fri, 11 Aug 2023 17:58:46 +0000 (20:58 +0300)]
Center messages table cells vertically

15 months agoUse flex for buttons cell in messages table
Anton Khorev [Fri, 11 Aug 2023 17:51:51 +0000 (20:51 +0300)]
Use flex for buttons cell in messages table

15 months agoRemove unused inbox css classes
Anton Khorev [Fri, 11 Aug 2023 17:37:53 +0000 (20:37 +0300)]
Remove unused inbox css classes

15 months agoChange mark message buttons visibility with hidden attr
Anton Khorev [Fri, 11 Aug 2023 17:35:36 +0000 (20:35 +0300)]
Change mark message buttons visibility with hidden attr

15 months agoRefactor message mark/delete listeners
Anton Khorev [Fri, 11 Aug 2023 16:57:56 +0000 (19:57 +0300)]
Refactor message mark/delete listeners

15 months agoUse Bootstrap nowrap class in messages table
Anton Khorev [Fri, 11 Aug 2023 15:54:14 +0000 (18:54 +0300)]
Use Bootstrap nowrap class in messages table

15 months agoPut message read/unread/delete buttons in one column
Anton Khorev [Fri, 11 Aug 2023 15:46:51 +0000 (18:46 +0300)]
Put message read/unread/delete buttons in one column

15 months agoMerge remote-tracking branch 'upstream/pull/4154'
Tom Hughes [Thu, 10 Aug 2023 21:42:39 +0000 (22:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4154'

15 months agoUpdate to rails 7.0.7
Tom Hughes [Thu, 10 Aug 2023 20:18:24 +0000 (21:18 +0100)]
Update to rails 7.0.7

15 months agoUse Bootstrap highlight class in note tables
Anton Khorev [Thu, 10 Aug 2023 03:31:38 +0000 (06:31 +0300)]
Use Bootstrap highlight class in note tables

15 months agoRemove message header custom css
Anton Khorev [Thu, 10 Aug 2023 17:47:41 +0000 (20:47 +0300)]
Remove message header custom css

15 months agoCheck recipient condition separately for message header/footer
Anton Khorev [Thu, 10 Aug 2023 17:38:49 +0000 (20:38 +0300)]
Check recipient condition separately for message header/footer

15 months agoRemove message date float
Anton Khorev [Thu, 10 Aug 2023 17:23:13 +0000 (20:23 +0300)]
Remove message date float

15 months agoMerge remote-tracking branch 'upstream/pull/4152'
Tom Hughes [Thu, 10 Aug 2023 17:06:20 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4152'

15 months agoMerge remote-tracking branch 'upstream/pull/4153'
Tom Hughes [Thu, 10 Aug 2023 17:01:01 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4153'