]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoMerge pull request #3779 from AntonKhorev/spinner
Andy Allan [Wed, 16 Nov 2022 16:22:18 +0000 (16:22 +0000)]
Merge pull request #3779 from AntonKhorev/spinner

Replace searching.gif images with Bootstrap spinners

2 years agoMerge remote-tracking branch 'upstream/pull/3795'
Tom Hughes [Tue, 15 Nov 2022 21:02:30 +0000 (21:02 +0000)]
Merge remote-tracking branch 'upstream/pull/3795'

2 years agoFix feature request GitHub issue template
Seth Deegan [Tue, 15 Nov 2022 20:07:52 +0000 (15:07 -0500)]
Fix feature request GitHub issue template

The syntax for the feature request GitHub issue template yaml file was wrong because two elements had the same ids and thus the feature request issue form did not work. This changes one that was the same.

2 years agoUpdate bundle
Tom Hughes [Tue, 15 Nov 2022 18:12:25 +0000 (18:12 +0000)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3792'
Tom Hughes [Mon, 14 Nov 2022 12:32:18 +0000 (12:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3792'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Nov 2022 12:13:25 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoclear default connections when using preauth
Martin Raifer [Mon, 14 Nov 2022 11:32:56 +0000 (12:32 +0100)]
clear default connections when using preauth

2 years agoMerge remote-tracking branch 'upstream/pull/3791'
Tom Hughes [Sun, 13 Nov 2022 18:36:35 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/pull/3791'

2 years agoUpdate to iD v2.23.2
Martin Raifer [Sat, 12 Nov 2022 21:21:59 +0000 (22:21 +0100)]
Update to iD v2.23.2

2 years agoMerge remote-tracking branch 'upstream/pull/3789'
Tom Hughes [Fri, 11 Nov 2022 19:17:16 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3789'

2 years agoUpdate to iD v2.23.1
Martin Raifer [Thu, 10 Nov 2022 12:40:53 +0000 (13:40 +0100)]
Update to iD v2.23.1

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Nov 2022 12:14:46 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3780'
Tom Hughes [Tue, 8 Nov 2022 18:32:18 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3780'

2 years agoMerge remote-tracking branch 'upstream/pull/3783'
Tom Hughes [Tue, 8 Nov 2022 18:26:51 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/3783'

2 years agoUpdate bundle
Tom Hughes [Tue, 8 Nov 2022 18:22:33 +0000 (18:22 +0000)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3788'
Tom Hughes [Tue, 8 Nov 2022 18:14:54 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3788'

2 years agoBump eslint from 8.26.0 to 8.27.0
dependabot[bot] [Mon, 7 Nov 2022 23:01:53 +0000 (23:01 +0000)]
Bump eslint from 8.26.0 to 8.27.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.26.0 to 8.27.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.26.0...v8.27.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, 7 Nov 2022 12:23:17 +0000 (13:23 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoBump leaflet.locatecontrol from 0.76.1 to 0.78.0
dependabot[bot] [Thu, 3 Nov 2022 23:00:53 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.76.1 to 0.78.0

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.76.1 to 0.78.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.76.1...v0.78.0)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  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, 3 Nov 2022 12:14:52 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3781'
Tom Hughes [Wed, 2 Nov 2022 12:56:20 +0000 (12:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3781'

2 years agoRemove outdated comments
Andy Allan [Wed, 2 Nov 2022 11:22:29 +0000 (11:22 +0000)]
Remove outdated comments

The action no longer deals with sending, and there's no display_name
param in this bit of code so it's a bit confusing.

2 years agoEnable the ActionOrder cop for remaining controllers
Andy Allan [Wed, 2 Nov 2022 11:06:00 +0000 (11:06 +0000)]
Enable the ActionOrder cop for remaining controllers

Where actions were reordered, the rails standard actions were
also moved to the top of each controller.

2 years agoFix new rubocop warnings
Tom Hughes [Tue, 1 Nov 2022 18:33:22 +0000 (18:33 +0000)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Tue, 1 Nov 2022 18:25:36 +0000 (18:25 +0000)]
Update bundle

2 years agoRemove query result geometry when unloading the page
Anton Khorev [Mon, 31 Oct 2022 23:09:51 +0000 (02:09 +0300)]
Remove query result geometry when unloading the page

2 years agoMerge remote-tracking branch 'upstream/pull/3778'
Tom Hughes [Mon, 31 Oct 2022 22:19:16 +0000 (22:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3778'

2 years agoReplace spinners in javascript
Anton Khorev [Sat, 29 Oct 2022 15:00:07 +0000 (18:00 +0300)]
Replace spinners in javascript

2 years agoReplace spinners in html.erb templates
Anton Khorev [Sat, 29 Oct 2022 14:33:09 +0000 (17:33 +0300)]
Replace spinners in html.erb templates

2 years agoAdd aria-label to close buttons
Anton Khorev [Mon, 31 Oct 2022 20:54:58 +0000 (23:54 +0300)]
Add aria-label to close buttons

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 31 Oct 2022 12:25:12 +0000 (13:25 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/3776'
Tom Hughes [Sun, 30 Oct 2022 18:35:36 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/3776'

2 years agoRemove query spinner show delay because the spinner is not hidden
Anton Khorev [Sat, 29 Oct 2022 16:32:17 +0000 (19:32 +0300)]
Remove query spinner show delay because the spinner is not hidden

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

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

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

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 agoUse close button instead of geolink in sidebar content
Anton Khorev [Fri, 9 Sep 2022 19:58:26 +0000 (22:58 +0300)]
Use close button instead of geolink in sidebar content

2 years agoMerge changeset <ol>s on Load more
Anton Khorev [Wed, 26 Oct 2022 12:02:49 +0000 (15:02 +0300)]
Merge changeset <ol>s on Load more

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 &#039; 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'