]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoMerge remote-tracking branch 'upstream/pull/3771'
Tom Hughes [Wed, 26 Oct 2022 17:16:58 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3771'

2 years agoAdd guidance on making pull requests easier to review
Andy Allan [Wed, 26 Oct 2022 15:00:13 +0000 (16:00 +0100)]
Add guidance on making pull requests easier to review

2 years agoMerge remote-tracking branch 'upstream/pull/3768'
Tom Hughes [Tue, 25 Oct 2022 18:28:10 +0000 (19:28 +0100)]
Merge remote-tracking branch 'upstream/pull/3768'

2 years agoMerge remote-tracking branch 'upstream/pull/3765'
Tom Hughes [Tue, 25 Oct 2022 18:27:01 +0000 (19:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3765'

2 years agoFix new rubocop warnings
Tom Hughes [Tue, 25 Oct 2022 18:19:57 +0000 (19:19 +0100)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Tue, 25 Oct 2022 17:09:39 +0000 (18:09 +0100)]
Update bundle

2 years agoPass min/max lat/lon to notes index rss builder
Anton Khorev [Tue, 25 Oct 2022 10:52:28 +0000 (13:52 +0300)]
Pass min/max lat/lon to notes index rss builder

2 years agoPass min/max lat/lon to notes rss feed builder
Anton Khorev [Tue, 25 Oct 2022 10:35:18 +0000 (13:35 +0300)]
Pass min/max lat/lon to notes rss feed builder

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Oct 2022 11:13:08 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoget_text("reversegeocode/result") returns an XML node. We want to get the text value...
Brian DeRocher [Sun, 23 Oct 2022 20:00:38 +0000 (16:00 -0400)]
get_text("reversegeocode/result") returns an XML node.  We want to get the text value of that node.

This will unescape ' into an apostrophe.

All callers of this function will later re-encode it depending out output whether it be HTML in an email, or XML in an RSS feed.

* app/mailers/user_mail.rb
* app/helpers/geocode_helper.rb
* app/views/api/notes/feed.rss.builder
* app/views/api/notes/_note.rss.builder

Fixes openstreetmap/openstreetmap-website#3761

2 years agoMerge remote-tracking branch 'upstream/pull/3763'
Tom Hughes [Sun, 23 Oct 2022 17:26:29 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3763'

2 years agoMerge pull request #3764 from openbrian/patch-3
Andy Allan [Sun, 23 Oct 2022 13:49:07 +0000 (14:49 +0100)]
Merge pull request #3764 from openbrian/patch-3

another trailing space

2 years agoanother trailing space
Brian DeRocher [Sat, 22 Oct 2022 21:31:32 +0000 (17:31 -0400)]
another trailing space

My editor does this too.  There's one more trailing space in this area of the file.

2 years agoBump eslint from 8.25.0 to 8.26.0
dependabot[bot] [Fri, 21 Oct 2022 23:00:39 +0000 (23:00 +0000)]
Bump eslint from 8.25.0 to 8.26.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.25.0 to 8.26.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.25.0...v8.26.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 agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Oct 2022 11:14:54 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3758'
Tom Hughes [Wed, 19 Oct 2022 17:18:24 +0000 (18:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3758'

2 years agoMerge pull request #3694 from AntonKhorev/share-button-group
Andy Allan [Wed, 19 Oct 2022 15:24:08 +0000 (16:24 +0100)]
Merge pull request #3694 from AntonKhorev/share-button-group

Use Bootstrap button group for share tabs

2 years agoMerge branch 'pull/3692'
Andy Allan [Wed, 19 Oct 2022 15:14:33 +0000 (16:14 +0100)]
Merge branch 'pull/3692'

2 years agoMinor tweaks to the markdown, in particular to wrap code characters in backticks
Andy Allan [Wed, 19 Oct 2022 15:11:57 +0000 (16:11 +0100)]
Minor tweaks to the markdown, in particular to wrap code characters in backticks

2 years agoMerge pull request #3693 from lectrician1/patch-2
Andy Allan [Wed, 19 Oct 2022 15:00:08 +0000 (16:00 +0100)]
Merge pull request #3693 from lectrician1/patch-2

Clarify Windows installation bad + alternatives

2 years agoMerge pull request #3700 from AntonKhorev/about
Andy Allan [Wed, 19 Oct 2022 14:58:17 +0000 (15:58 +0100)]
Merge pull request #3700 from AntonKhorev/about

Replace <h5> used to set the font size with Bootstrap class h5

2 years agoMerge pull request #3704 from AntonKhorev/leaflet-control-groups
Andy Allan [Wed, 19 Oct 2022 14:42:08 +0000 (15:42 +0100)]
Merge pull request #3704 from AntonKhorev/leaflet-control-groups

Group map controls explicitly

2 years agoUpdate bundle
Tom Hughes [Tue, 18 Oct 2022 17:43:21 +0000 (18:43 +0100)]
Update bundle

2 years agoTest that tags are included correctly in the changeset feed
Tom Hughes [Tue, 18 Oct 2022 17:42:02 +0000 (18:42 +0100)]
Test that tags are included correctly in the changeset feed

2 years agoMerge remote-tracking branch 'upstream/pull/3755'
Tom Hughes [Mon, 17 Oct 2022 17:58:47 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/3755'

2 years agoFix malformed tags table in changeset atom feed
Malte Gerken [Mon, 17 Oct 2022 13:37:07 +0000 (15:37 +0200)]
Fix malformed tags table in changeset atom feed

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Oct 2022 11:12:21 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRequire multi_json for windowslive logins
Tom Hughes [Sun, 16 Oct 2022 18:28:37 +0000 (19:28 +0100)]
Require multi_json for windowslive logins

The windowslive omniauth plugin needs multi_json but doesn't require
it and the omniauth core is no longer doing so.

2 years agoAllow credentials to be sent with overpass calls
Tom Hughes [Thu, 13 Oct 2022 18:12:07 +0000 (19:12 +0100)]
Allow credentials to be sent with overpass calls

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Oct 2022 11:13:06 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUnflip the heading text on the new user screen for RTL languages
Tom Hughes [Wed, 12 Oct 2022 07:48:29 +0000 (08:48 +0100)]
Unflip the heading text on the new user screen for RTL languages

Fixes #3752

2 years agoUpdate bundle
Tom Hughes [Tue, 11 Oct 2022 17:30:10 +0000 (18:30 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Oct 2022 11:12:41 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3747'
Tom Hughes [Sun, 9 Oct 2022 17:10:20 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3747'

2 years agoMerge remote-tracking branch 'upstream/pull/3746'
Tom Hughes [Sun, 9 Oct 2022 17:10:17 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3746'

2 years agoMerge remote-tracking branch 'upstream/pull/3741'
Tom Hughes [Sun, 9 Oct 2022 16:59:26 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3741'

2 years agoDon't scroll to or show markers of notes with no data
Anton Khorev [Sun, 9 Oct 2022 06:08:45 +0000 (09:08 +0300)]
Don't scroll to or show markers of notes with no data

2 years agoDisplay icon for current note only if this icon is defined
Anton Khorev [Sun, 9 Oct 2022 05:03:14 +0000 (08:03 +0300)]
Display icon for current note only if this icon is defined

2 years agoBump eslint from 8.24.0 to 8.25.0
dependabot[bot] [Fri, 7 Oct 2022 23:00:56 +0000 (23:00 +0000)]
Bump eslint from 8.24.0 to 8.25.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.24.0 to 8.25.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.24.0...v8.25.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 agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Oct 2022 11:14:26 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3739'
Tom Hughes [Thu, 6 Oct 2022 07:13:32 +0000 (08:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3739'

2 years agoMerge remote-tracking branch 'upstream/pull/3736'
Tom Hughes [Thu, 6 Oct 2022 06:59:57 +0000 (07:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3736'

2 years agoFix concurrency groups for github actions
Tom Hughes [Wed, 5 Oct 2022 21:49:17 +0000 (22:49 +0100)]
Fix concurrency groups for github actions

2 years agoLoad note from edit link with remote control
Anton Khorev [Wed, 5 Oct 2022 21:42:04 +0000 (00:42 +0300)]
Load note from edit link with remote control

2 years agoMerge remote-tracking branch 'upstream/pull/3737'
Tom Hughes [Wed, 5 Oct 2022 21:27:07 +0000 (22:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3737'

2 years agoRemove whitespace eslint complaining about
Anton Khorev [Wed, 5 Oct 2022 20:15:34 +0000 (23:15 +0300)]
Remove whitespace eslint complaining about

2 years agoRemove note from edit link when it's not a current object
Anton Khorev [Wed, 5 Oct 2022 19:58:33 +0000 (22:58 +0300)]
Remove note from edit link when it's not a current object

2 years agoAdd some whitespace for readability
Tom Hughes [Wed, 5 Oct 2022 18:00:16 +0000 (19:00 +0100)]
Add some whitespace for readability

2 years agoMerge remote-tracking branch 'upstream/pull/3732'
Tom Hughes [Wed, 5 Oct 2022 17:59:18 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3732'

2 years agoMerge remote-tracking branch 'upstream/pull/3733'
Tom Hughes [Wed, 5 Oct 2022 17:49:48 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/pull/3733'

2 years agoMerge remote-tracking branch 'upstream/pull/3734'
Tom Hughes [Wed, 5 Oct 2022 17:37:11 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/3734'

2 years agoBump leaflet from 1.9.1 to 1.9.2
dependabot[bot] [Tue, 4 Oct 2022 23:02:36 +0000 (23:02 +0000)]
Bump leaflet from 1.9.1 to 1.9.2

Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.9.1...v1.9.2)

---
updated-dependencies:
- dependency-name: leaflet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoRemove unused note id data attributes
Anton Khorev [Tue, 4 Oct 2022 13:12:48 +0000 (16:12 +0300)]
Remove unused note id data attributes

2 years agoTreat notes as map objects
Anton Khorev [Tue, 4 Oct 2022 12:40:25 +0000 (15:40 +0300)]
Treat notes as map objects

2 years agoKeep id passed to note page for subsequent use in map current object
Anton Khorev [Tue, 4 Oct 2022 12:32:33 +0000 (15:32 +0300)]
Keep id passed to note page for subsequent use in map current object

2 years agoMerge remote-tracking branch 'upstream/pull/3726'
Tom Hughes [Mon, 3 Oct 2022 18:20:36 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3726'

2 years agoUpdate bundle
Tom Hughes [Mon, 3 Oct 2022 17:17:33 +0000 (18:17 +0100)]
Update bundle

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Oct 2022 11:12:51 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Sep 2022 11:13:05 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRemove 'Hide' button from hidden note page
Anton Khorev [Wed, 28 Sep 2022 22:11:12 +0000 (01:11 +0300)]
Remove 'Hide' button from hidden note page

2 years agoMerge remote-tracking branch 'upstream/pull/3716'
Tom Hughes [Tue, 27 Sep 2022 16:26:44 +0000 (17:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3716'

2 years agoMerge remote-tracking branch 'upstream/pull/3714'
Tom Hughes [Tue, 27 Sep 2022 16:22:41 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3714'

2 years agoMerge remote-tracking branch 'upstream/pull/3724'
Tom Hughes [Tue, 27 Sep 2022 16:11:10 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3724'

2 years agoMerge remote-tracking branch 'upstream/pull/3723'
Tom Hughes [Tue, 27 Sep 2022 16:10:34 +0000 (17:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3723'

2 years agoUpdate bundle
Tom Hughes [Tue, 27 Sep 2022 16:05:55 +0000 (17:05 +0100)]
Update bundle

2 years agoUpdate to iD v2.22.0
Martin Raifer [Tue, 27 Sep 2022 09:56:30 +0000 (11:56 +0200)]
Update to iD v2.22.0

2 years agoBump eslint from 8.23.1 to 8.24.0
dependabot[bot] [Mon, 26 Sep 2022 23:00:41 +0000 (23:00 +0000)]
Bump eslint from 8.23.1 to 8.24.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.23.1 to 8.24.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.23.1...v8.24.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 agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Sep 2022 11:13:05 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRemove default xml format from notes routing test
Robbendebiene [Mon, 26 Sep 2022 07:13:40 +0000 (09:13 +0200)]
Remove default xml format from notes routing test

2 years agoBump leaflet from 1.8.0 to 1.9.1
dependabot[bot] [Fri, 23 Sep 2022 23:00:42 +0000 (23:00 +0000)]
Bump leaflet from 1.8.0 to 1.9.1

Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.8.0 to 1.9.1.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.8.0...v1.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoAllow setting HTTP ACCEPT header for notes API
Robbendebiene [Fri, 23 Sep 2022 09:40:19 +0000 (11:40 +0200)]
Allow setting HTTP ACCEPT header for notes API
Previously the notes API return type could only be specified by appending the file extension like .json or .rss

2 years agoMerge remote-tracking branch 'upstream/pull/3710'
Tom Hughes [Thu, 22 Sep 2022 17:04:28 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/3710'

2 years agoMerge remote-tracking branch 'upstream/pull/3711'
Tom Hughes [Thu, 22 Sep 2022 17:02:46 +0000 (18:02 +0100)]
Merge remote-tracking branch 'upstream/pull/3711'

2 years agoMerge remote-tracking branch 'upstream/pull/3712'
Tom Hughes [Thu, 22 Sep 2022 16:55:19 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/3712'

2 years agoFix margin
danieldegroot2 [Thu, 22 Sep 2022 15:46:32 +0000 (17:46 +0200)]
Fix margin

Fix unexpected margin

2 years agoPan map when showing/hiding sidebars depending on ltr/rtl
Anton Khorev [Thu, 22 Sep 2022 13:33:28 +0000 (16:33 +0300)]
Pan map when showing/hiding sidebars depending on ltr/rtl

2 years agoDon't show 'Download XML' link for deleted elements
Anton Khorev [Thu, 22 Sep 2022 11:51:31 +0000 (14:51 +0300)]
Don't show 'Download XML' link for deleted elements

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Sep 2022 11:14:14 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoCancel running queries when a timeout occurs
Tom Hughes [Wed, 21 Sep 2022 21:47:16 +0000 (22:47 +0100)]
Cancel running queries when a timeout occurs

2 years agoMerge remote-tracking branch 'upstream/pull/3705'
Tom Hughes [Wed, 21 Sep 2022 17:48:25 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/3705'

2 years agoMerge remote-tracking branch 'upstream/pull/3708'
Tom Hughes [Wed, 21 Sep 2022 17:46:12 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3708'

2 years agoChange map ui sidebar height together with map height
Anton Khorev [Wed, 21 Sep 2022 13:50:14 +0000 (16:50 +0300)]
Change map ui sidebar height together with map height

2 years agoUpdate bundle
Tom Hughes [Tue, 20 Sep 2022 17:10:50 +0000 (18:10 +0100)]
Update bundle

2 years agoRemove unnecessary wrapper divs
Anton Khorev [Tue, 20 Sep 2022 07:15:19 +0000 (10:15 +0300)]
Remove unnecessary wrapper divs

2 years agoMerge remote-tracking branch 'upstream/pull/3703'
Tom Hughes [Mon, 19 Sep 2022 16:46:46 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3703'

2 years agoMerge remote-tracking branch 'upstream/pull/3702'
Tom Hughes [Mon, 19 Sep 2022 16:46:04 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3702'

2 years agoMerge remote-tracking branch 'upstream/pull/3701'
Tom Hughes [Mon, 19 Sep 2022 16:42:47 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/3701'

2 years agoSpecify border/spacing values in stylesheet
Anton Khorev [Mon, 19 Sep 2022 16:10:46 +0000 (19:10 +0300)]
Specify border/spacing values in stylesheet

2 years agoSet borders and spacing for control groups directly in js
Anton Khorev [Mon, 19 Sep 2022 15:50:04 +0000 (18:50 +0300)]
Set borders and spacing for control groups directly in js

Previous stylesheet code is more complicated.

2 years agoGroup map controls
Anton Khorev [Mon, 19 Sep 2022 15:20:34 +0000 (18:20 +0300)]
Group map controls

2 years agoCreate osm-specific locate control class
Anton Khorev [Mon, 19 Sep 2022 14:51:09 +0000 (17:51 +0300)]
Create osm-specific locate control class

2 years agoRemove unused icon list css from welcome pages
Anton Khorev [Mon, 19 Sep 2022 11:38:56 +0000 (14:38 +0300)]
Remove unused icon list css from welcome pages

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Sep 2022 11:14:50 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoRemove unused tooltips css
Anton Khorev [Mon, 19 Sep 2022 09:21:13 +0000 (12:21 +0300)]
Remove unused tooltips css

2 years agoVertically center about page icons with flex align-items
Anton Khorev [Mon, 19 Sep 2022 08:28:58 +0000 (11:28 +0300)]
Vertically center about page icons with flex align-items

2 years agoReplace <h5> used to set the font size with Bootstrap class h5
Anton Khorev [Mon, 19 Sep 2022 05:20:01 +0000 (08:20 +0300)]
Replace <h5> used to set the font size with Bootstrap class h5

2 years agoMerge remote-tracking branch 'upstream/pull/3695'
Tom Hughes [Sun, 18 Sep 2022 17:38:57 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3695'

2 years agoMerge remote-tracking branch 'upstream/pull/3699'
Tom Hughes [Sun, 18 Sep 2022 17:35:58 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/3699'

2 years agoMerge remote-tracking branch 'upstream/pull/3698'
Tom Hughes [Sun, 18 Sep 2022 17:34:51 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/3698'

2 years agoMerge remote-tracking branch 'upstream/pull/3697'
Tom Hughes [Sun, 18 Sep 2022 17:32:12 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3697'