]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoMerge remote-tracking branch 'upstream/pull/3689'
Tom Hughes [Wed, 14 Sep 2022 17:24:14 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/3689'

2 years agoMerge pull request #3678 from AntonKhorev/close-button-margins
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

2 years agoUse bootstrap breakpoint mixin
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.

2 years agoUse bootstrap utility classes for showing the new user arm
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.

2 years agoCombine small.scss into common.scss
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.

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

2 years agoMerge remote-tracking branch 'upstream/pull/3687'
Tom Hughes [Tue, 13 Sep 2022 18:14:24 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/3687'

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

2 years agoMerge pull request #3686 from AntonKhorev/embed-https
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

2 years agoAdd bootstrap to js globals
Anton Khorev [Tue, 13 Sep 2022 03:52:36 +0000 (06:52 +0300)]
Add bootstrap to js globals

2 years agoFix zoom level related tooltip for Edit button
Anton Khorev [Tue, 13 Sep 2022 02:26:49 +0000 (05:26 +0300)]
Fix zoom level related tooltip for Edit button

2 years agoFix zoom level related tooltips for layer checkboxes
Anton Khorev [Tue, 13 Sep 2022 01:20:57 +0000 (04:20 +0300)]
Fix zoom level related tooltips for layer checkboxes

2 years agoBump eslint from 8.23.0 to 8.23.1
dependabot[bot] [Mon, 12 Sep 2022 23:00:55 +0000 (23:00 +0000)]
Bump eslint from 8.23.0 to 8.23.1

Bumps [eslint](https://github.com/eslint/eslint) from 8.23.0 to 8.23.1.
- [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.0...v8.23.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge tooltip fixes/tests
Anton Khorev [Mon, 12 Sep 2022 22:52:23 +0000 (01:52 +0300)]
Merge tooltip fixes/tests

2 years agoUse https in 'report a problem' link of embedded map
Anton Khorev [Mon, 12 Sep 2022 22:18:48 +0000 (01:18 +0300)]
Use https in 'report a problem' link of embedded map

2 years agoUpdate doorkeeper to 5.6.0
Tom Hughes [Mon, 12 Sep 2022 18:27:33 +0000 (19:27 +0100)]
Update doorkeeper to 5.6.0

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

2 years agoMerge branch 'master' into feature/add-communities-page
Adam Hoyle [Sat, 10 Sep 2022 15:10:08 +0000 (16:10 +0100)]
Merge branch 'master' into feature/add-communities-page

# Conflicts:
# Gemfile.lock
# package.json
# yarn.lock

2 years agoUpdate osm-community-index dependency version
Adam Hoyle [Sat, 10 Sep 2022 14:54:44 +0000 (15:54 +0100)]
Update osm-community-index dependency version

2 years agoUpdate text above list of local chapters
Adam Hoyle [Sat, 10 Sep 2022 14:52:57 +0000 (15:52 +0100)]
Update text above list of local chapters

2 years agoFix new rubocop warnings
Tom Hughes [Fri, 9 Sep 2022 21:36:39 +0000 (22:36 +0100)]
Fix new rubocop warnings

2 years agoUpdate to rails 7.0.4
Tom Hughes [Fri, 9 Sep 2022 21:34:29 +0000 (22:34 +0100)]
Update to rails 7.0.4

2 years agoFix background colour for badges on GPS traces
Tom Hughes [Fri, 9 Sep 2022 10:01:20 +0000 (11:01 +0100)]
Fix background colour for badges on GPS traces

Fixes #3681

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

2 years agoRewrite bbox only in place history atom links
Anton Khorev [Wed, 7 Sep 2022 19:13:57 +0000 (22:13 +0300)]
Rewrite bbox only in place history atom links

2 years agoUse nominatim_url setting more consistently
Tom Hughes [Wed, 7 Sep 2022 07:45:27 +0000 (08:45 +0100)]
Use nominatim_url setting more consistently

2 years agoUpdate bundle
Tom Hughes [Tue, 6 Sep 2022 17:14:11 +0000 (18:14 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3673'
Tom Hughes [Tue, 6 Sep 2022 17:13:43 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3673'

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

2 years agoMerge remote-tracking branch 'upstream/pull/3677'
Tom Hughes [Fri, 2 Sep 2022 21:27:15 +0000 (22:27 +0100)]
Merge remote-tracking branch 'upstream/pull/3677'

2 years agoRemove top margins from close buttons
Anton Khorev [Fri, 2 Sep 2022 14:00:01 +0000 (17:00 +0300)]
Remove top margins from close buttons

2 years agoSimplify css for text selection with stretched link
Anton Khorev [Fri, 2 Sep 2022 13:22:54 +0000 (16:22 +0300)]
Simplify css for text selection with stretched link

2 years agoMake changeset id also a link so it can be displayed over the stretched link and...
Anton Khorev [Fri, 2 Sep 2022 13:13:52 +0000 (16:13 +0300)]
Make changeset id also a link so it can be displayed over the stretched link and be text-selectable

2 years agoPut span inside stretched link to improve text selection
Anton Khorev [Fri, 2 Sep 2022 13:03:52 +0000 (16:03 +0300)]
Put span inside stretched link to improve text selection

2 years agoMerge remote-tracking branch 'upstream/pull/3675'
Tom Hughes [Thu, 1 Sep 2022 20:12:49 +0000 (21:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3675'

2 years agoStretch changeset links in history lists
Anton Khorev [Thu, 1 Sep 2022 19:45:09 +0000 (22:45 +0300)]
Stretch changeset links in history lists

2 years agoDelete zh-hk.yml file that has been mapped to zh-HK.yml
Abijeet Patro [Thu, 1 Sep 2022 10:21:18 +0000 (15:51 +0530)]
Delete zh-hk.yml file that has been mapped to zh-HK.yml

See: https://gerrit.wikimedia.org/r/c/translatewiki/+/828590 as per #3669

2 years agoMerge pull request #3672 from AntonKhorev/geolink-button
Andy Allan [Thu, 1 Sep 2022 08:17:11 +0000 (09:17 +0100)]
Merge pull request #3672 from AntonKhorev/geolink-button

Remove geolink and close button nesting

2 years agoMerge pull request #3642 from Firefishy/forum-to-community
Andy Allan [Thu, 1 Sep 2022 08:10:49 +0000 (09:10 +0100)]
Merge pull request #3642 from Firefishy/forum-to-community

Add Link and text for the new community forum

2 years agoAdd Link and text for the new community forum
Grant Slater [Mon, 1 Aug 2022 15:10:37 +0000 (18:10 +0300)]
Add Link and text for the new community forum

2 years agoRemove geolink and close button nesting
Anton Khorev [Wed, 31 Aug 2022 21:42:50 +0000 (00:42 +0300)]
Remove geolink and close button nesting

2 years agoMerge remote-tracking branch 'upstream/pull/3668'
Tom Hughes [Wed, 31 Aug 2022 16:44:48 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3668'

2 years agoMerge pull request #3666 from AntonKhorev/flex-close-buttons
Andy Allan [Wed, 31 Aug 2022 14:04:45 +0000 (15:04 +0100)]
Merge pull request #3666 from AntonKhorev/flex-close-buttons

Position close buttons with flexbox

2 years agoUse named arguments for button-variant mixins
Andy Allan [Wed, 31 Aug 2022 13:40:01 +0000 (14:40 +0100)]
Use named arguments for button-variant mixins

This is much clearer than relying on positional arguments, and is
also required for future upgrades to bootstrap.

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

2 years agoMerge remote-tracking branch 'upstream/pull/3664'
Tom Hughes [Sun, 28 Aug 2022 17:37:15 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/3664'

2 years agoFix eslint errors
Anton Khorev [Sat, 27 Aug 2022 21:53:53 +0000 (00:53 +0300)]
Fix eslint errors

2 years agoPosition directions close button with flex
Anton Khorev [Sat, 27 Aug 2022 21:32:50 +0000 (00:32 +0300)]
Position directions close button with flex

2 years agoPosition 'too many features' close button with flex
Anton Khorev [Sat, 27 Aug 2022 20:50:23 +0000 (23:50 +0300)]
Position 'too many features' close button with flex

2 years agoRemove unnecessary float from flex-positioned close button
Anton Khorev [Sat, 27 Aug 2022 20:20:20 +0000 (23:20 +0300)]
Remove unnecessary float from flex-positioned close button

2 years agoPosition Leaflet sidebar close buttons with flex
Anton Khorev [Sat, 27 Aug 2022 20:15:04 +0000 (23:15 +0300)]
Position Leaflet sidebar close buttons with flex

2 years agoInverted onAdd() method of sidebar panes
Anton Khorev [Sat, 27 Aug 2022 19:55:19 +0000 (22:55 +0300)]
Inverted onAdd() method of sidebar panes

2 years agoCreate pane button fn
Anton Khorev [Sat, 27 Aug 2022 17:54:37 +0000 (20:54 +0300)]
Create pane button fn

2 years agoCreate Leaflet sidebar pane control with header writer fn
Anton Khorev [Sat, 27 Aug 2022 17:33:44 +0000 (20:33 +0300)]
Create Leaflet sidebar pane control with header writer fn

2 years agoMerge pull request #3665 from AntonKhorev/reverse-directions-tag
Andy Allan [Sat, 27 Aug 2022 16:50:36 +0000 (17:50 +0100)]
Merge pull request #3665 from AntonKhorev/reverse-directions-tag

Fix reverse directions button closing tag

2 years agoFix reverse directions button closing tag
Anton Khorev [Sat, 27 Aug 2022 16:24:54 +0000 (19:24 +0300)]
Fix reverse directions button closing tag

2 years agoBump eslint from 8.22.0 to 8.23.0
dependabot[bot] [Fri, 26 Aug 2022 23:01:04 +0000 (23:01 +0000)]
Bump eslint from 8.22.0 to 8.23.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.22.0 to 8.23.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.22.0...v8.23.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 agoRedirect to open issues when an issue is reassigned
Tom Hughes [Fri, 26 Aug 2022 12:45:25 +0000 (13:45 +0100)]
Redirect to open issues when an issue is reassigned

2 years agoUse rails instead of rake
Tom Hughes [Thu, 25 Aug 2022 19:23:51 +0000 (20:23 +0100)]
Use rails instead of rake

2 years agoRun migration under bundler
Tom Hughes [Thu, 25 Aug 2022 19:22:22 +0000 (20:22 +0100)]
Run migration under bundler

Fixes #3662

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

2 years agoMerge remote-tracking branch 'upstream/pull/3661'
Tom Hughes [Wed, 24 Aug 2022 16:11:11 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3661'

2 years agoMerge remote-tracking branch 'upstream/pull/3655'
Tom Hughes [Wed, 24 Aug 2022 16:10:04 +0000 (17:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3655'

2 years agoMerge pull request #3657 from Mortein/patch-1
Andy Allan [Wed, 24 Aug 2022 14:48:57 +0000 (15:48 +0100)]
Merge pull request #3657 from Mortein/patch-1

Correct name in graphhopper.js

2 years agoStrip trailing whitespace from copyright notice
Andy Allan [Wed, 24 Aug 2022 13:24:08 +0000 (14:24 +0100)]
Strip trailing whitespace from copyright notice

My editor does this any time the file is saved, so let's fix this.

Was introduced recently in #3565

2 years agoReturn to issue index if you can't view reassigned issue
Andy Allan [Wed, 24 Aug 2022 13:05:19 +0000 (14:05 +0100)]
Return to issue index if you can't view reassigned issue

Fixes #3652

2 years agoUpdate bundle
Tom Hughes [Tue, 23 Aug 2022 19:40:50 +0000 (20:40 +0100)]
Update bundle

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

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

2 years agoCorrect name in graphhopper.js
Kiel Hurley [Wed, 17 Aug 2022 01:19:25 +0000 (13:19 +1200)]
Correct name in graphhopper.js

When using directions, the footer says "Directions courtesy of Graphhopper"

2 years agoUpdate bundle
Tom Hughes [Tue, 16 Aug 2022 18:20:51 +0000 (19:20 +0100)]
Update bundle

2 years agoBump eslint from 8.21.0 to 8.22.0
dependabot[bot] [Mon, 15 Aug 2022 23:00:49 +0000 (23:00 +0000)]
Bump eslint from 8.21.0 to 8.22.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.21.0 to 8.22.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.21.0...v8.22.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, 15 Aug 2022 11:12:09 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.

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

2 years agoFilter out the communities before loading the translations
Andy Allan [Wed, 10 Aug 2022 16:34:24 +0000 (17:34 +0100)]
Filter out the communities before loading the translations

This avoids loading excessive numbers of translations

2 years agoGenericese comment
Andy Allan [Wed, 10 Aug 2022 16:19:46 +0000 (17:19 +0100)]
Genericese comment

2 years agoUse each_with_object
Andy Allan [Wed, 10 Aug 2022 13:01:42 +0000 (14:01 +0100)]
Use each_with_object

2 years agoUse member syntax for accessing communities
Andy Allan [Wed, 10 Aug 2022 12:54:14 +0000 (13:54 +0100)]
Use member syntax for accessing communities

2 years agoRestrict files read from directory
Andy Allan [Wed, 10 Aug 2022 12:48:27 +0000 (13:48 +0100)]
Restrict files read from directory

2 years agoUpgrade osm-communities-index package
Andy Allan [Wed, 10 Aug 2022 12:47:12 +0000 (13:47 +0100)]
Upgrade osm-communities-index package

2 years agoUpdate bundle
Tom Hughes [Tue, 9 Aug 2022 17:27:56 +0000 (18:27 +0100)]
Update bundle

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

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

2 years agoMerge remote-tracking branch 'upstream/pull/3649'
Tom Hughes [Wed, 3 Aug 2022 19:37:56 +0000 (20:37 +0100)]
Merge remote-tracking branch 'upstream/pull/3649'

2 years agoMerge pull request #3589 from tomhughes/brotli
Andy Allan [Wed, 3 Aug 2022 18:51:56 +0000 (19:51 +0100)]
Merge pull request #3589 from tomhughes/brotli

Enable brotli compression for assets

2 years agoFix italic font styles
Andy Allan [Wed, 3 Aug 2022 18:49:46 +0000 (19:49 +0100)]
Fix italic font styles

This was missed during the bootstrap 5 upgrade

2 years agoMerge remote-tracking branch 'upstream/pull/3648'
Tom Hughes [Wed, 3 Aug 2022 18:19:29 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/3648'

2 years agoEnable brotli compression for assets
Tom Hughes [Tue, 5 Jul 2022 17:41:42 +0000 (18:41 +0100)]
Enable brotli compression for assets

2 years agoRemove the user menu focus overrides
Andy Allan [Wed, 3 Aug 2022 17:59:32 +0000 (18:59 +0100)]
Remove the user menu focus overrides

This restores the outline effect when the button is focussed using
keyboard navigation.

Refs #3633

2 years agoMerge pull request #3552 from rugk/patch-1
Andy Allan [Wed, 3 Aug 2022 17:49:26 +0000 (18:49 +0100)]
Merge pull request #3552 from rugk/patch-1

Add cause to feature request issue template

2 years agoMinor grammar changes to feature template
Andy Allan [Wed, 3 Aug 2022 17:48:02 +0000 (18:48 +0100)]
Minor grammar changes to feature template

2 years agoMerge remote-tracking branch 'upstream/pull/3644'
Tom Hughes [Wed, 3 Aug 2022 17:45:47 +0000 (18:45 +0100)]
Merge remote-tracking branch 'upstream/pull/3644'

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

2 years agoMerge remote-tracking branch 'upstream/pull/3646'
Tom Hughes [Wed, 3 Aug 2022 17:45:15 +0000 (18:45 +0100)]
Merge remote-tracking branch 'upstream/pull/3646'

2 years agoMerge pull request #3581 from harry-wood/discourage-note-report
Andy Allan [Wed, 3 Aug 2022 17:38:36 +0000 (18:38 +0100)]
Merge pull request #3581 from harry-wood/discourage-note-report

Wording to discourage note reporting

2 years agoUse standard bootstrap spacers, rather than custom css, to space out the elements
Andy Allan [Wed, 3 Aug 2022 17:25:22 +0000 (18:25 +0100)]
Use standard bootstrap spacers, rather than custom css, to space out the elements

Also make the reporting text small, since it's not required reading in most circumstances.

2 years agoMove note reporting link to bottom of the sidebar
Harry Wood [Mon, 27 Jun 2022 12:03:39 +0000 (13:03 +0100)]
Move note reporting link to bottom of the sidebar

Move the 'report this note' and surrounding sentence down the sidebar beneath the commont/resolve form to give it less prominence.

2 years agoAdd wording to discourage reporting a note
Harry Wood [Mon, 27 Jun 2022 11:20:50 +0000 (12:20 +0100)]
Add wording to discourage reporting a note

Add some wording wrapped around the 'Report this note' link to explain to users to resolve the note instead.

Tackling the issue reported by DWG, that too many note reports are coming to them, where the users could deal it themselves: https://github.com/openstreetmap/openstreetmap-website/issues/3071

2 years agoAdd a basic security policy.
Andy Allan [Wed, 3 Aug 2022 16:06:18 +0000 (17:06 +0100)]
Add a basic security policy.

Fixes #3553

2 years agoMerge pull request #3634 from AntonKhorev/map-key-tooltip
Andy Allan [Wed, 3 Aug 2022 14:38:58 +0000 (15:38 +0100)]
Merge pull request #3634 from AntonKhorev/map-key-tooltip

Fix tooltips