]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoMerge remote-tracking branch 'upstream/pull/5102'
Tom Hughes [Wed, 21 Aug 2024 17:22:02 +0000 (18:22 +0100)]
Merge remote-tracking branch 'upstream/pull/5102'

2 years agoMerge pull request #5100 from tomhughes/overcommit
Andy Allan [Wed, 21 Aug 2024 16:09:17 +0000 (17:09 +0100)]
Merge pull request #5100 from tomhughes/overcommit

Add overcommit to manage git hooks

2 years agoupgrade to iD-2.30.2 (rotated Mapbox API tokens)
Martin Raifer [Wed, 21 Aug 2024 15:35:19 +0000 (17:35 +0200)]
upgrade to iD-2.30.2 (rotated Mapbox API tokens)

2 years agoUpdate to iD v2.30.1
Martin Raifer [Wed, 21 Aug 2024 09:26:40 +0000 (11:26 +0200)]
Update to iD v2.30.1

2 years agoAdd overcommit to manage git hooks
Tom Hughes [Tue, 20 Aug 2024 17:29:24 +0000 (18:29 +0100)]
Add overcommit to manage git hooks

2 years agoMerge remote-tracking branch 'upstream/pull/5099'
Tom Hughes [Tue, 20 Aug 2024 18:12:13 +0000 (19:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5099'

2 years agoUpdate bundle
Tom Hughes [Tue, 20 Aug 2024 17:09:58 +0000 (18:09 +0100)]
Update bundle

2 years agoRead lat/lon attributes when generating context menu directions urls
Anton Khorev [Mon, 12 Aug 2024 02:41:30 +0000 (05:41 +0300)]
Read lat/lon attributes when generating context menu directions urls

2 years agoSave lat/lon to input data attributes
Anton Khorev [Mon, 12 Aug 2024 02:39:58 +0000 (05:39 +0300)]
Save lat/lon to input data attributes

2 years agoLimit coordinate precision in drag listener
Anton Khorev [Mon, 12 Aug 2024 02:19:22 +0000 (05:19 +0300)]
Limit coordinate precision in drag listener

2 years agoMerge remote-tracking branch 'upstream/pull/5095'
Tom Hughes [Tue, 20 Aug 2024 11:18:47 +0000 (12:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5095'

2 years agoMerge remote-tracking branch 'upstream/pull/5095'
Tom Hughes [Mon, 19 Aug 2024 18:05:44 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5095'

2 years agoMerge remote-tracking branch 'upstream/pull/5090'
Tom Hughes [Mon, 19 Aug 2024 18:01:17 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5090'

2 years agoReplace geocode request boolean property with request object
Anton Khorev [Mon, 12 Aug 2024 01:12:05 +0000 (04:12 +0300)]
Replace geocode request boolean property with request object

2 years agoRemove endpoint markers in disable method
Anton Khorev [Mon, 19 Aug 2024 15:54:50 +0000 (18:54 +0300)]
Remove endpoint markers in disable method

2 years agoInstall endpoint listeners using enable/disable methods
Anton Khorev [Mon, 19 Aug 2024 15:50:27 +0000 (18:50 +0300)]
Install endpoint listeners using enable/disable methods

2 years agoMerge remote-tracking branch 'upstream/pull/5096'
Tom Hughes [Mon, 19 Aug 2024 17:18:26 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5096'

2 years agoMerge remote-tracking branch 'upstream/pull/5094'
Tom Hughes [Mon, 19 Aug 2024 17:16:51 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5094'

2 years agoShow/hide "Where is this?" when setting search value from directions
Anton Khorev [Mon, 19 Aug 2024 17:05:48 +0000 (20:05 +0300)]
Show/hide "Where is this?" when setting search value from directions

2 years agoReplace geocode request boolean property with request object
Anton Khorev [Mon, 12 Aug 2024 01:12:05 +0000 (04:12 +0300)]
Replace geocode request boolean property with request object

2 years agoRemove endpoint markers in disable method
Anton Khorev [Mon, 19 Aug 2024 15:54:50 +0000 (18:54 +0300)]
Remove endpoint markers in disable method

2 years agoInstall endpoint listeners using enable/disable methods
Anton Khorev [Mon, 19 Aug 2024 15:50:27 +0000 (18:50 +0300)]
Install endpoint listeners using enable/disable methods

2 years agoRecord revokers when deactivating blocks by editing
Anton Khorev [Mon, 19 Aug 2024 12:21:59 +0000 (15:21 +0300)]
Record revokers when deactivating blocks by editing

2 years agoAdd navigation tabs to new block pages
Anton Khorev [Sat, 17 Aug 2024 10:41:30 +0000 (13:41 +0300)]
Add navigation tabs to new block pages

2 years agoMerge remote-tracking branch 'upstream/pull/5083'
Tom Hughes [Sun, 18 Aug 2024 11:16:22 +0000 (12:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5083'

2 years agoMerge remote-tracking branch 'upstream/pull/5092'
Tom Hughes [Sun, 18 Aug 2024 11:01:17 +0000 (12:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5092'

2 years agoMerge remote-tracking branch 'upstream/pull/5091'
Tom Hughes [Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/pull/5091'

2 years agoMerge remote-tracking branch 'upstream/pull/5089'
Tom Hughes [Sun, 18 Aug 2024 10:54:48 +0000 (11:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5089'

2 years agoMerge remote-tracking branch 'upstream/pull/5084'
Tom Hughes [Sun, 18 Aug 2024 10:51:06 +0000 (11:51 +0100)]
Merge remote-tracking branch 'upstream/pull/5084'

2 years agoDefine diary entry hide/unhide routes using post on members
Anton Khorev [Sat, 17 Aug 2024 11:28:55 +0000 (14:28 +0300)]
Define diary entry hide/unhide routes using post on members

2 years agoRemove /user_blocks/new route
Anton Khorev [Sat, 17 Aug 2024 11:03:27 +0000 (14:03 +0300)]
Remove /user_blocks/new route

2 years agoDon't update ends_at when editing inactive blocks
Anton Khorev [Sat, 17 Aug 2024 10:02:20 +0000 (13:02 +0300)]
Don't update ends_at when editing inactive blocks

2 years agoChange zoom precision function
Anton Khorev [Fri, 16 Aug 2024 07:45:54 +0000 (10:45 +0300)]
Change zoom precision function

This changes the number of fractional digits to log10(pixels / degrees) with pixels = 2**(8 + zoom) and degrees = 180.

2 years agoMerge remote-tracking branch 'upstream/pull/5088'
Tom Hughes [Fri, 16 Aug 2024 16:24:50 +0000 (17:24 +0100)]
Merge remote-tracking branch 'upstream/pull/5088'

2 years agoMerge remote-tracking branch 'upstream/pull/5086'
Tom Hughes [Fri, 16 Aug 2024 16:22:59 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/5086'

2 years agoMerge remote-tracking branch 'upstream/pull/5087'
Tom Hughes [Fri, 16 Aug 2024 16:20:33 +0000 (17:20 +0100)]
Merge remote-tracking branch 'upstream/pull/5087'

2 years agoMerge remote-tracking branch 'upstream/pull/5085'
Tom Hughes [Fri, 16 Aug 2024 16:19:23 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/5085'

2 years agoCopy "From" endpoint value to search input when closing directions
Anton Khorev [Fri, 16 Aug 2024 15:48:05 +0000 (18:48 +0300)]
Copy "From" endpoint value to search input when closing directions

2 years agoTruncate long usernames in blocks tables
Anton Khorev [Fri, 16 Aug 2024 11:41:02 +0000 (14:41 +0300)]
Truncate long usernames in blocks tables

2 years agoAdd navigation tabs to edit block pages
Anton Khorev [Fri, 16 Aug 2024 10:27:10 +0000 (13:27 +0300)]
Add navigation tabs to edit block pages

2 years agoRemove duration and needs_view inputs from inactive block edit form
Anton Khorev [Fri, 16 Aug 2024 10:00:19 +0000 (13:00 +0300)]
Remove duration and needs_view inputs from inactive block edit form

2 years agoMake getGeocode a private function
Anton Khorev [Sun, 11 Aug 2024 04:04:37 +0000 (07:04 +0300)]
Make getGeocode a private function

2 years agoMove empty value check out of endpoint.getGeocode
Anton Khorev [Sun, 11 Aug 2024 04:03:01 +0000 (07:03 +0300)]
Move empty value check out of endpoint.getGeocode

2 years agoRemove endpoint.hasGeocode state and related getRoute code
Anton Khorev [Sun, 11 Aug 2024 03:58:14 +0000 (06:58 +0300)]
Remove endpoint.hasGeocode state and related getRoute code

hasGeocode didn't actually indicated if an endpoint has a value acquired from a geocoder. It was set to true when at least one call to a geocoder finished successfully, including getting an empty result. getRoute doesn't need to know what calls were made, it only needs coordinates. It also doesn't get to decide when to fetch coordinates, this is done in drag/change callbacks.

2 years agoMerge remote-tracking branch 'upstream/pull/5081'
Tom Hughes [Thu, 15 Aug 2024 16:54:51 +0000 (17:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5081'

2 years agoMerge remote-tracking branch 'upstream/pull/5082'
Tom Hughes [Thu, 15 Aug 2024 16:53:47 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5082'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Aug 2024 12:15:24 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoPrevent reactivating inactive blocks
Anton Khorev [Thu, 15 Aug 2024 09:59:49 +0000 (12:59 +0300)]
Prevent reactivating inactive blocks

2 years agoRename geocodeCallback to changeCallback, call it from latlon setValue
Anton Khorev [Sun, 11 Aug 2024 03:47:38 +0000 (06:47 +0300)]
Rename geocodeCallback to changeCallback, call it from latlon setValue

endpoint.setValue always calls changeCallback on its successful completion, with geocoding or without. This allows to decide when to call getRoute entirely from callbacks and event listeners.

2 years agoMerge remote-tracking branch 'upstream/pull/5072'
Tom Hughes [Wed, 14 Aug 2024 18:12:59 +0000 (19:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5072'

2 years agoMerge remote-tracking branch 'upstream/pull/5075'
Tom Hughes [Wed, 14 Aug 2024 18:06:42 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5075'

2 years agoMerge remote-tracking branch 'upstream/pull/5078'
Tom Hughes [Wed, 14 Aug 2024 18:02:07 +0000 (19:02 +0100)]
Merge remote-tracking branch 'upstream/pull/5078'

2 years agoMerge remote-tracking branch 'upstream/pull/5074'
Tom Hughes [Wed, 14 Aug 2024 18:01:05 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5074'

2 years agoMerge remote-tracking branch 'upstream/pull/5073'
Tom Hughes [Wed, 14 Aug 2024 18:00:20 +0000 (19:00 +0100)]
Merge remote-tracking branch 'upstream/pull/5073'

2 years agoMerge remote-tracking branch 'upstream/pull/5076'
Tom Hughes [Wed, 14 Aug 2024 17:57:05 +0000 (18:57 +0100)]
Merge remote-tracking branch 'upstream/pull/5076'

2 years agoAdd ruby 3.3 to test matrix
Tom Hughes [Wed, 14 Aug 2024 17:51:29 +0000 (18:51 +0100)]
Add ruby 3.3 to test matrix

2 years agoMonkey patch GD2::AnimatedGif to fix the finalizer
Tom Hughes [Wed, 14 Aug 2024 17:19:24 +0000 (18:19 +0100)]
Monkey patch GD2::AnimatedGif to fix the finalizer

https://github.com/dark-panda/gd2-ffij/pull/27

2 years agoAdd article:published_time meta tag to diary entries
Anton Khorev [Wed, 14 Aug 2024 14:59:00 +0000 (17:59 +0300)]
Add article:published_time meta tag to diary entries

2 years agoAdd debug gem
Andy Allan [Wed, 14 Aug 2024 14:36:09 +0000 (15:36 +0100)]
Add debug gem

This is included in new rails 7+ apps, so let's include it too.

This also means it's available on ruby 3.0, and is automatically
updated on newer versions of ruby too.

2 years agoSwitch to edit pane if rich text field validation fails
Anton Khorev [Wed, 14 Aug 2024 13:43:57 +0000 (16:43 +0300)]
Switch to edit pane if rich text field validation fails

Allows the "Please fill out this field" message to be visible.

2 years agoMerge pull request #5056 from AntonKhorev/diary-og-description
Andy Allan [Wed, 14 Aug 2024 13:38:28 +0000 (14:38 +0100)]
Merge pull request #5056 from AntonKhorev/diary-og-description

Set og:description meta tag to diary entry description

2 years agoRename user blocks system test class
Anton Khorev [Wed, 14 Aug 2024 12:57:44 +0000 (15:57 +0300)]
Rename user blocks system test class

2 years agoRemove unused xml_parse method
Anton Khorev [Wed, 14 Aug 2024 02:58:17 +0000 (05:58 +0300)]
Remove unused xml_parse method

2 years agoMake setLatLng a private function
Anton Khorev [Sun, 11 Aug 2024 02:31:48 +0000 (05:31 +0300)]
Make setLatLng a private function

2 years agoDon't set input value from endpoint.setLatLng()
Anton Khorev [Sun, 11 Aug 2024 02:29:33 +0000 (05:29 +0300)]
Don't set input value from endpoint.setLatLng()

This input value computed from coordinates is not always used. endpoint.getGeocode() overwrites it immediately.

2 years agoDon't call endpoint.setLatLng() from outside of endpoint module
Anton Khorev [Sun, 11 Aug 2024 02:13:36 +0000 (05:13 +0300)]
Don't call endpoint.setLatLng() from outside of endpoint module

2 years agoMerge remote-tracking branch 'upstream/pull/5067'
Tom Hughes [Tue, 13 Aug 2024 17:46:25 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/5067'

2 years agoUpdate bundle
Tom Hughes [Tue, 13 Aug 2024 17:11:12 +0000 (18:11 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Aug 2024 12:15:31 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUse content box sizing instead of negative margins
Anton Khorev [Mon, 12 Aug 2024 00:21:21 +0000 (03:21 +0300)]
Use content box sizing instead of negative margins

2 years agoSet layer button size in rems
Anton Khorev [Mon, 12 Aug 2024 00:02:48 +0000 (03:02 +0300)]
Set layer button size in rems

Lets buttons become larger if font-only zoom is used. This should help with layer name labels not fitting.

2 years agoMerge remote-tracking branch 'upstream/pull/5062'
Tom Hughes [Sun, 11 Aug 2024 18:04:18 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5062'

2 years agoMerge remote-tracking branch 'upstream/pull/5061'
Tom Hughes [Sun, 11 Aug 2024 17:56:28 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/5061'

2 years agoMove endpoints code to its own module
Anton Khorev [Sat, 10 Aug 2024 03:19:32 +0000 (06:19 +0300)]
Move endpoints code to its own module

2 years agoRename route request variable
Anton Khorev [Sat, 10 Aug 2024 03:01:35 +0000 (06:01 +0300)]
Rename route request variable

It's not boolean, the comment was outdated.

2 years agoRemove references to global variables from endpoint drag listener
Anton Khorev [Sat, 10 Aug 2024 02:53:59 +0000 (05:53 +0300)]
Remove references to global variables from endpoint drag listener

This causes visible input value updates even when the route is not recalculated. The upside is that it lets endpoints not know about the route and its update state.

2 years agoBump eslint from 9.8.0 to 9.9.0
dependabot[bot] [Fri, 9 Aug 2024 23:32:40 +0000 (23:32 +0000)]
Bump eslint from 9.8.0 to 9.9.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.8.0 to 9.9.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.8.0...v9.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge remote-tracking branch 'upstream/pull/5059'
Tom Hughes [Thu, 8 Aug 2024 16:59:41 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/5059'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Aug 2024 12:15:22 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoSet min preview height when switching away from edit tab
Anton Khorev [Thu, 8 Aug 2024 03:48:13 +0000 (06:48 +0300)]
Set min preview height when switching away from edit tab

Previously it was set when switching to a preview tab. Now that won't work correctly because we have one extra tab.

2 years agoSwitch away from help tab when help sidebar becomes visible
Anton Khorev [Thu, 8 Aug 2024 03:30:35 +0000 (06:30 +0300)]
Switch away from help tab when help sidebar becomes visible

2 years agoMove help card between pane/sidebar depending on sidebar visibility
Anton Khorev [Thu, 8 Aug 2024 03:28:55 +0000 (06:28 +0300)]
Move help card between pane/sidebar depending on sidebar visibility

2 years agoAdd richtext help tab
Anton Khorev [Thu, 8 Aug 2024 01:48:57 +0000 (04:48 +0300)]
Add richtext help tab

2 years agoUse closest() instead of parents() when looking for richtext container
Anton Khorev [Thu, 8 Aug 2024 03:07:42 +0000 (06:07 +0300)]
Use closest() instead of parents() when looking for richtext container

2 years agoRemove unused richtext dom ids
Anton Khorev [Thu, 8 Aug 2024 00:33:46 +0000 (03:33 +0300)]
Remove unused richtext dom ids

2 years agoRemove .richtext_preview css class
Anton Khorev [Thu, 8 Aug 2024 02:56:06 +0000 (05:56 +0300)]
Remove .richtext_preview css class

2 years agoRemove .richtext_content css class
Anton Khorev [Thu, 8 Aug 2024 00:20:57 +0000 (03:20 +0300)]
Remove .richtext_content css class

2 years agoRemove .richtext_dopreview css class
Anton Khorev [Thu, 8 Aug 2024 00:16:50 +0000 (03:16 +0300)]
Remove .richtext_dopreview css class

2 years agoMerge remote-tracking branch 'upstream/pull/5055'
Tom Hughes [Wed, 7 Aug 2024 17:40:40 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/5055'

2 years agoMerge remote-tracking branch 'upstream/pull/5054'
Tom Hughes [Wed, 7 Aug 2024 17:38:09 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5054'

2 years agoMerge remote-tracking branch 'upstream/pull/5053'
Tom Hughes [Wed, 7 Aug 2024 17:37:17 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5053'

2 years agoSet og:description meta tag to diary entry description
Anton Khorev [Wed, 7 Aug 2024 05:33:41 +0000 (08:33 +0300)]
Set og:description meta tag to diary entry description

2 years agoSet OpenGraph properties hash in diary entry show action
Anton Khorev [Wed, 7 Aug 2024 05:18:43 +0000 (08:18 +0300)]
Set OpenGraph properties hash in diary entry show action

2 years agoPass properties hash to OpenGraph helper
Anton Khorev [Wed, 7 Aug 2024 05:13:29 +0000 (08:13 +0300)]
Pass properties hash to OpenGraph helper

2 years agoRemove default argument values of OpenGraph tag helper
Anton Khorev [Wed, 7 Aug 2024 15:55:08 +0000 (18:55 +0300)]
Remove default argument values of OpenGraph tag helper

2 years agoMerge pull request #5019 from tomhughes/oauth2-cleanup
Andy Allan [Wed, 7 Aug 2024 15:22:21 +0000 (16:22 +0100)]
Merge pull request #5019 from tomhughes/oauth2-cleanup

Add expiry for OAuth 2 grants and tokens

2 years agoMerge pull request #5044 from mmd-osm/patch/rn1
Andy Allan [Wed, 7 Aug 2024 15:12:53 +0000 (16:12 +0100)]
Merge pull request #5044 from mmd-osm/patch/rn1

JSON partial rendering in loop

2 years agoSkip paragraphs with no text when looking for richtext description
Anton Khorev [Wed, 7 Aug 2024 04:46:10 +0000 (07:46 +0300)]
Skip paragraphs with no text when looking for richtext description

2 years agoTruncate long richtext descriptions
Anton Khorev [Wed, 7 Aug 2024 03:53:43 +0000 (06:53 +0300)]
Truncate long richtext descriptions

2 years agoDetect <p> as richtext paragraph
Anton Khorev [Wed, 7 Aug 2024 03:09:38 +0000 (06:09 +0300)]
Detect <p> as richtext paragraph