]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 17 Oct 2022 17:58:47 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/3755'
Malte Gerken [Mon, 17 Oct 2022 13:37:07 +0000 (15:37 +0200)]
Fix malformed tags table in changeset atom feed
translatewiki.net [Mon, 17 Oct 2022 11:12:21 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
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.
Tom Hughes [Thu, 13 Oct 2022 18:12:07 +0000 (19:12 +0100)]
Allow credentials to be sent with overpass calls
translatewiki.net [Thu, 13 Oct 2022 11:13:06 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
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
Tom Hughes [Tue, 11 Oct 2022 17:30:10 +0000 (18:30 +0100)]
Update bundle
translatewiki.net [Mon, 10 Oct 2022 11:12:41 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 9 Oct 2022 17:10:20 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3747'
Tom Hughes [Sun, 9 Oct 2022 17:10:17 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3746'
Tom Hughes [Sun, 9 Oct 2022 16:59:26 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3741'
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
Anton Khorev [Sun, 9 Oct 2022 05:03:14 +0000 (08:03 +0300)]
Display icon for current note only if this icon is defined
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>
translatewiki.net [Thu, 6 Oct 2022 11:14:26 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 6 Oct 2022 07:13:32 +0000 (08:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3739'
Tom Hughes [Thu, 6 Oct 2022 06:59:57 +0000 (07:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3736'
Tom Hughes [Wed, 5 Oct 2022 21:49:17 +0000 (22:49 +0100)]
Fix concurrency groups for github actions
Anton Khorev [Wed, 5 Oct 2022 21:42:04 +0000 (00:42 +0300)]
Load note from edit link with remote control
Tom Hughes [Wed, 5 Oct 2022 21:27:07 +0000 (22:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3737'
Anton Khorev [Wed, 5 Oct 2022 20:15:34 +0000 (23:15 +0300)]
Remove whitespace eslint complaining about
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
Tom Hughes [Wed, 5 Oct 2022 18:00:16 +0000 (19:00 +0100)]
Add some whitespace for readability
Tom Hughes [Wed, 5 Oct 2022 17:59:18 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/3732'
Tom Hughes [Wed, 5 Oct 2022 17:49:48 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/pull/3733'
Tom Hughes [Wed, 5 Oct 2022 17:37:11 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/3734'
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>
Anton Khorev [Tue, 4 Oct 2022 13:12:48 +0000 (16:12 +0300)]
Remove unused note id data attributes
Anton Khorev [Tue, 4 Oct 2022 12:40:25 +0000 (15:40 +0300)]
Treat notes as map objects
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
Tom Hughes [Mon, 3 Oct 2022 18:20:36 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3726'
Tom Hughes [Mon, 3 Oct 2022 17:17:33 +0000 (18:17 +0100)]
Update bundle
translatewiki.net [Mon, 3 Oct 2022 11:12:51 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Sep 2022 11:13:05 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Wed, 28 Sep 2022 22:11:12 +0000 (01:11 +0300)]
Remove 'Hide' button from hidden note page
Tom Hughes [Tue, 27 Sep 2022 16:26:44 +0000 (17:26 +0100)]
Merge remote-tracking branch 'upstream/pull/3716'
Tom Hughes [Tue, 27 Sep 2022 16:22:41 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3714'
Tom Hughes [Tue, 27 Sep 2022 16:11:10 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3724'
Tom Hughes [Tue, 27 Sep 2022 16:10:34 +0000 (17:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3723'
Tom Hughes [Tue, 27 Sep 2022 16:05:55 +0000 (17:05 +0100)]
Update bundle
Martin Raifer [Tue, 27 Sep 2022 09:56:30 +0000 (11:56 +0200)]
Update to iD v2.22.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>
translatewiki.net [Mon, 26 Sep 2022 11:13:05 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
Robbendebiene [Mon, 26 Sep 2022 07:13:40 +0000 (09:13 +0200)]
Remove default xml format from notes routing test
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>
Anton Khorev [Fri, 23 Sep 2022 10:34:40 +0000 (13:34 +0300)]
Use jquery interface for enabling/disabling tooltips
Anton Khorev [Fri, 23 Sep 2022 09:43:31 +0000 (12:43 +0300)]
Merge branch 'master' into tooltips-enable-disable
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
Tom Hughes [Thu, 22 Sep 2022 17:04:28 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/3710'
Tom Hughes [Thu, 22 Sep 2022 17:02:46 +0000 (18:02 +0100)]
Merge remote-tracking branch 'upstream/pull/3711'
Tom Hughes [Thu, 22 Sep 2022 16:55:19 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/3712'
danieldegroot2 [Thu, 22 Sep 2022 15:46:32 +0000 (17:46 +0200)]
Fix margin
Fix unexpected margin
Anton Khorev [Thu, 22 Sep 2022 13:33:28 +0000 (16:33 +0300)]
Pan map when showing/hiding sidebars depending on ltr/rtl
Anton Khorev [Thu, 22 Sep 2022 11:51:31 +0000 (14:51 +0300)]
Don't show 'Download XML' link for deleted elements
translatewiki.net [Thu, 22 Sep 2022 11:14:14 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Sep 2022 21:47:16 +0000 (22:47 +0100)]
Cancel running queries when a timeout occurs
Tom Hughes [Wed, 21 Sep 2022 17:48:25 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/3705'
Tom Hughes [Wed, 21 Sep 2022 17:46:12 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3708'
Anton Khorev [Wed, 21 Sep 2022 13:50:14 +0000 (16:50 +0300)]
Change map ui sidebar height together with map height
Tom Hughes [Tue, 20 Sep 2022 17:10:50 +0000 (18:10 +0100)]
Update bundle
Anton Khorev [Tue, 20 Sep 2022 07:15:19 +0000 (10:15 +0300)]
Remove unnecessary wrapper divs
Tom Hughes [Mon, 19 Sep 2022 16:46:46 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3703'
Tom Hughes [Mon, 19 Sep 2022 16:46:04 +0000 (17:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3702'
Tom Hughes [Mon, 19 Sep 2022 16:42:47 +0000 (17:42 +0100)]
Merge remote-tracking branch 'upstream/pull/3701'
Anton Khorev [Mon, 19 Sep 2022 16:10:46 +0000 (19:10 +0300)]
Specify border/spacing values in stylesheet
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.
Anton Khorev [Mon, 19 Sep 2022 15:20:34 +0000 (18:20 +0300)]
Group map controls
Anton Khorev [Mon, 19 Sep 2022 14:51:09 +0000 (17:51 +0300)]
Create osm-specific locate control class
Anton Khorev [Mon, 19 Sep 2022 11:38:56 +0000 (14:38 +0300)]
Remove unused icon list css from welcome pages
translatewiki.net [Mon, 19 Sep 2022 11:14:50 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 19 Sep 2022 09:21:13 +0000 (12:21 +0300)]
Remove unused tooltips css
Anton Khorev [Mon, 19 Sep 2022 08:28:58 +0000 (11:28 +0300)]
Vertically center about page icons with flex align-items
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
Tom Hughes [Sun, 18 Sep 2022 17:38:57 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3695'
Tom Hughes [Sun, 18 Sep 2022 17:35:58 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/3699'
Tom Hughes [Sun, 18 Sep 2022 17:34:51 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/3698'
Tom Hughes [Sun, 18 Sep 2022 17:32:12 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3697'
Tom Hughes [Sun, 18 Sep 2022 17:30:55 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3696'
Anton Khorev [Sat, 17 Sep 2022 10:53:21 +0000 (13:53 +0300)]
Remove old map sidebar close button css
Anton Khorev [Sat, 17 Sep 2022 10:09:41 +0000 (13:09 +0300)]
Remove background image-related css from about page
Background images are no longer used on the page so these properties are not required.
Anton Khorev [Sat, 17 Sep 2022 07:51:10 +0000 (10:51 +0300)]
Remove buttons css class used only on new note page
Anton Khorev [Sat, 17 Sep 2022 07:09:35 +0000 (10:09 +0300)]
Remove unused pager secondary nav css
Anton Khorev [Sat, 17 Sep 2022 06:14:46 +0000 (09:14 +0300)]
Remove unnecessary appendTo() that is undone by append() right away
Anton Khorev [Sat, 17 Sep 2022 05:47:22 +0000 (08:47 +0300)]
Remove share-tabs css class
Anton Khorev [Sat, 17 Sep 2022 05:34:53 +0000 (08:34 +0300)]
Use button group for share tabs
lectrician1 [Fri, 16 Sep 2022 20:52:07 +0000 (16:52 -0400)]
Clarify Windows installation bad + alternatives
State some ruby gems might not be supported and Docker is easiest solution.
lectrician1 [Fri, 16 Sep 2022 20:34:28 +0000 (16:34 -0400)]
Add further instructions for Windows users
translatewiki.net [Thu, 15 Sep 2022 11:14:32 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.
Harry Wood [Wed, 7 Sep 2022 14:03:27 +0000 (15:03 +0100)]
Define a DEFAULT_FRESHLY_CLOSED_LIMIT constant
Define DEFAULT_FRESHLY_CLOSED_LIMIT in the Note model to allow the 7 day limit to be referenced in the API controller and in the new `freshy_closed_until` logic. The default value is `7.days`. API users can still override this, but the website uses that default for the duration of the green "freshly closed" notes markers.
Harry Wood [Thu, 1 Sep 2022 23:51:59 +0000 (00:51 +0100)]
Display how long until a note will disappear
Modify the message displayed at the bottom of the notes sidepanel. For already resolved notes we don't want to say "please resolve it". Fixes https://github.com/openstreetmap/openstreetmap-website/issues/3663
Instead explain that it will disappear from the map (so reporting is probably not necessary) and display how long to go until that happens. Tackling https://github.com/openstreetmap/openstreetmap-website/issues/3071
Tom Hughes [Wed, 14 Sep 2022 17:24:14 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/3689'
Andy Allan [Wed, 14 Sep 2022 16:48:41 +0000 (17:48 +0100)]
Merge pull request #3678 from AntonKhorev/close-button-margins
Remove top margins from close buttons
Andy Allan [Wed, 14 Sep 2022 15:52:54 +0000 (16:52 +0100)]
Use bootstrap breakpoint mixin
This has the same end result, but is more clear than an arbitrary
pixel number.
Andy Allan [Wed, 14 Sep 2022 15:45:02 +0000 (16:45 +0100)]
Use bootstrap utility classes for showing the new user arm
The original value was close to the 'lg' breakpoint, but the 'md'
breakpoint is fine for this too.
Andy Allan [Wed, 14 Sep 2022 14:44:35 +0000 (15:44 +0100)]
Combine small.scss into common.scss
We've moved away from the idea of having extra rules for small screens,
and instead follow the bootstrap convention of designing for small
screens first and overriding those rules if needed for larger screens.
Having a separate file remaining for a limited number of small screen
rules is therefore counter-productive. Moving the remaining rules into
common.scss, adjacent to the related rules for larger screen, makes
the behaviour easier to understand, as well as making it easier to
refactor the rules to a small-screen-first approach.
Tom Hughes [Tue, 13 Sep 2022 18:19:12 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/3680'
Tom Hughes [Tue, 13 Sep 2022 18:14:24 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/3687'
Tom Hughes [Tue, 13 Sep 2022 17:17:42 +0000 (18:17 +0100)]
Update bundle
Andy Allan [Tue, 13 Sep 2022 08:08:47 +0000 (09:08 +0100)]
Merge pull request #3686 from AntonKhorev/embed-https
Use https in 'report a problem' link of embedded map