]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Tue, 8 Aug 2023 16:53:35 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4142'
Tom Hughes [Tue, 8 Aug 2023 16:46:15 +0000 (17:46 +0100)]
Update bundle
Anton Khorev [Tue, 8 Aug 2023 00:49:14 +0000 (03:49 +0300)]
Expose changeset query limit values in api capabilities
Anton Khorev [Tue, 8 Aug 2023 00:41:04 +0000 (03:41 +0300)]
Use max changeset query limit setting in tests
Anton Khorev [Tue, 8 Aug 2023 00:33:04 +0000 (03:33 +0300)]
Move changeset query limit values to settings
translatewiki.net [Mon, 7 Aug 2023 11:17:26 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Aug 2023 11:17:38 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 3 Aug 2023 10:25:14 +0000 (11:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4136'
Andy Allan [Thu, 3 Aug 2023 09:56:05 +0000 (10:56 +0100)]
Use hashes to define where..in sql queries
This is preferable to using SQL statements.
Tom Hughes [Wed, 2 Aug 2023 16:01:05 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4131'
Andy Allan [Wed, 2 Aug 2023 15:57:26 +0000 (16:57 +0100)]
Merge pull request #4106 from tomhughes/diary-paging
Replace page numbers with ID based selection for diary indexes
Andy Allan [Wed, 2 Aug 2023 15:56:25 +0000 (16:56 +0100)]
Merge pull request #4111 from AntonKhorev/hidden-welcome-banner
Hide/show welcome banner with hidden attribute
Andy Allan [Wed, 2 Aug 2023 15:07:13 +0000 (16:07 +0100)]
Switch to bootstrap recommended viewport definition
Original version was introduced in
6674873478c9fe221d2fd78f76cabc6d4b03c0aa
and has not been changed since.
Google's PageSpeed Insights tool also flagged this up as an accessibility
issue, since it previously prohibited users zooming into the site.
Andy Allan [Wed, 2 Aug 2023 14:54:16 +0000 (15:54 +0100)]
Merge pull request #4112 from AntonKhorev/no-float-inside-sidebar
Remove unnecessary full-width float css from sidebar
Andy Allan [Wed, 2 Aug 2023 14:52:41 +0000 (15:52 +0100)]
Merge pull request #4125 from tomhughes/oauth-scopes
Only show granted permissions in the authorized application list
Andy Allan [Wed, 2 Aug 2023 13:47:05 +0000 (14:47 +0100)]
Merge pull request #4107 from tomhughes/diary-visibility
Allow administrators to see deleted diary entries
Andy Allan [Wed, 2 Aug 2023 13:20:07 +0000 (14:20 +0100)]
Merge pull request #4113 from AntonKhorev/no-w-100
Remove setting 100% width with w-100 where it's the default width
Andy Allan [Wed, 2 Aug 2023 13:14:55 +0000 (14:14 +0100)]
Merge pull request #4120 from AntonKhorev/no-deprecated-iframe-attrs
Remove deprecated attributes from share html
Tom Hughes [Tue, 1 Aug 2023 17:14:23 +0000 (18:14 +0100)]
Update bundle
translatewiki.net [Mon, 31 Jul 2023 11:20:39 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 30 Jul 2023 19:35:13 +0000 (20:35 +0100)]
Only show granted permissions in the authorized application list
Fixes #4124
Tom Hughes [Sun, 30 Jul 2023 18:00:02 +0000 (19:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4114'
Tom Hughes [Sun, 30 Jul 2023 17:53:30 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4115'
Tom Hughes [Sun, 30 Jul 2023 17:48:26 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4110'
Tom Hughes [Sun, 30 Jul 2023 17:47:10 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4118'
Tom Hughes [Sun, 30 Jul 2023 17:36:24 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4119'
Tom Hughes [Sun, 30 Jul 2023 17:31:43 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4116'
Anton Khorev [Sat, 29 Jul 2023 17:34:10 +0000 (20:34 +0300)]
Remove deprecated attributes from share html
Anton Khorev [Sat, 29 Jul 2023 16:38:06 +0000 (19:38 +0300)]
Remove resize css property from textarea
Anton Khorev [Sat, 29 Jul 2023 16:26:20 +0000 (19:26 +0300)]
Remove display properties from share tabs
dependabot[bot] [Fri, 28 Jul 2023 23:15:35 +0000 (23:15 +0000)]
Bump eslint from 8.45.0 to 8.46.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.46.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.45.0...v8.46.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Anton Khorev [Fri, 28 Jul 2023 18:24:52 +0000 (21:24 +0300)]
Move map attribution print styles to print.scss
Anton Khorev [Fri, 28 Jul 2023 18:05:05 +0000 (21:05 +0300)]
Remove unused 0 bottom margin from map ui css
Anton Khorev [Fri, 28 Jul 2023 17:27:58 +0000 (20:27 +0300)]
Remove setting 100% width with w-100 where it's the default width
Anton Khorev [Fri, 28 Jul 2023 17:05:28 +0000 (20:05 +0300)]
Remove unnecessary full-width float css from sidebar
Anton Khorev [Fri, 28 Jul 2023 15:24:46 +0000 (18:24 +0300)]
Hide/show welcome banner with hidden attribute
Anton Khorev [Fri, 28 Jul 2023 14:30:48 +0000 (17:30 +0300)]
Remove links to apps from OAuth2 authorizations page
Tom Hughes [Thu, 27 Jul 2023 19:42:03 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4108'
Tom Hughes [Wed, 26 Jul 2023 17:50:01 +0000 (18:50 +0100)]
Replace page numbers with ID based selection for diary indexes
Tom Hughes [Thu, 27 Jul 2023 19:30:15 +0000 (20:30 +0100)]
Improve testing of paged access to trace lists
Tom Hughes [Thu, 27 Jul 2023 19:29:29 +0000 (20:29 +0100)]
Disambiguate ID queries for tagged trace lists
Tom Hughes [Thu, 27 Jul 2023 17:07:35 +0000 (18:07 +0100)]
Allow moderator to unhide diary entries as well as hide them
Tom Hughes [Wed, 26 Jul 2023 18:01:48 +0000 (19:01 +0100)]
Allow administrators to see deleted diary entries
Andy Allan [Wed, 26 Jul 2023 16:39:36 +0000 (17:39 +0100)]
Simplify menu-icon css
Remove the duplicate display property, since it was force-overridden
by the `!important` keyword in the same definiton. This then makes the
`!important` keywords unnecessary. The menu-icon is floated, and
therefore can't be `inline-block`, so browsers were interpreting that
as `block` all along.
Andy Allan [Wed, 26 Jul 2023 16:39:12 +0000 (17:39 +0100)]
Remove unused parameter
Andy Allan [Wed, 26 Jul 2023 16:11:58 +0000 (17:11 +0100)]
Andy Allan [Wed, 26 Jul 2023 15:45:00 +0000 (16:45 +0100)]
Merge pull request #3933 from AntonKhorev/api-changesets-limit
Add limit parameter to api changesets query
Andy Allan [Wed, 26 Jul 2023 15:21:22 +0000 (16:21 +0100)]
Merge pull request #4089 from tomhughes/trace-paging
Replace page numbers with ID based selection for trace indexes
Tom Hughes [Tue, 25 Jul 2023 17:10:53 +0000 (18:10 +0100)]
Update bundle
translatewiki.net [Mon, 24 Jul 2023 11:18:53 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Jul 2023 18:42:29 +0000 (19:42 +0100)]
Replace page numbers with ID based selection for trace indexes
translatewiki.net [Thu, 20 Jul 2023 11:15:14 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 18 Jul 2023 17:27:06 +0000 (18:27 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 18 Jul 2023 17:25:12 +0000 (18:25 +0100)]
Update bundle
Tom Hughes [Sun, 16 Jul 2023 11:07:00 +0000 (12:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4097'
Tom Hughes [Sun, 16 Jul 2023 11:06:57 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4095'
Tom Hughes [Sun, 16 Jul 2023 11:06:54 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4094'
Amir E. Aharoni [Sat, 15 Jul 2023 07:34:24 +0000 (10:34 +0300)]
Consistent plural forms for browse.way.nodes_count
Without this, translatewiki's validator shows an error for English.
dependabot[bot] [Fri, 14 Jul 2023 23:02:08 +0000 (23:02 +0000)]
Bump eslint from 8.44.0 to 8.45.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.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.44.0...v8.45.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 13 Jul 2023 23:19:20 +0000 (23:19 +0000)]
Bump coverallsapp/github-action from 2.2.0 to 2.2.1
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.0...v2.2.1)
---
updated-dependencies:
- dependency-name: coverallsapp/github-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 13 Jul 2023 19:13:29 +0000 (20:13 +0100)]
Remove default imagery blacklist
Tom Hughes [Thu, 13 Jul 2023 17:36:24 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4093'
Pavel Zbytovský [Thu, 13 Jul 2023 17:04:24 +0000 (19:04 +0200)]
Block mapy.cz as non-approved imagery
Issue: https://github.com/openstreetmap/openstreetmap-website/issues/4085
Tom Hughes [Thu, 13 Jul 2023 12:25:56 +0000 (13:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4092'
Martin Raifer [Thu, 13 Jul 2023 12:04:21 +0000 (14:04 +0200)]
Update to iD v2.26.2
translatewiki.net [Thu, 13 Jul 2023 11:19:25 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 13 Jul 2023 07:03:52 +0000 (08:03 +0100)]
Merge remote-tracking branch 'upstream/pull/4091'
dependabot[bot] [Wed, 12 Jul 2023 23:58:30 +0000 (23:58 +0000)]
Bump osm-community-index from 5.5.3 to 5.5.4
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.3...v5.5.4)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 12 Jul 2023 20:57:17 +0000 (21:57 +0100)]
Merge remote-tracking branch 'upstream/pull/4090'
Martin Raifer [Wed, 12 Jul 2023 20:19:43 +0000 (22:19 +0200)]
Update to iD v2.26.1
Tom Hughes [Wed, 12 Jul 2023 17:34:56 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4088'
Tom Hughes [Wed, 12 Jul 2023 17:26:25 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4086'
Andy Allan [Wed, 12 Jul 2023 16:46:01 +0000 (17:46 +0100)]
Avoid using sprockets for combining stylesheets
There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).
This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+
See https://github.com/sass/sassc-rails/issues/174
Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.
* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422
Martin Raifer [Wed, 12 Jul 2023 11:57:19 +0000 (13:57 +0200)]
Update to iD v2.26.0
Tom Hughes [Tue, 11 Jul 2023 17:16:45 +0000 (18:16 +0100)]
Update bundle
translatewiki.net [Mon, 10 Jul 2023 11:33:02 +0000 (13:33 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 6 Jul 2023 21:16:03 +0000 (22:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4078'
dependabot[bot] [Thu, 6 Jul 2023 20:04:31 +0000 (20:04 +0000)]
Bump sanitize from 6.0.1 to 6.0.2
Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)
---
updated-dependencies:
- dependency-name: sanitize
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 6 Jul 2023 11:20:58 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 5 Jul 2023 14:10:12 +0000 (15:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4077'
Tom Hughes [Wed, 5 Jul 2023 14:01:12 +0000 (15:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4076'
Andy Allan [Wed, 5 Jul 2023 13:42:07 +0000 (14:42 +0100)]
Avoid using the zero key for pluralisation in English
This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.
An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.
Fixes #3997
Andy Allan [Wed, 5 Jul 2023 12:47:12 +0000 (13:47 +0100)]
Expand raw html checks to all translation files
This closes a potential security issue, where unreviewed html could
be added via translation files.
Tom Hughes [Wed, 5 Jul 2023 11:52:58 +0000 (12:52 +0100)]
Merge remote-tracking branch 'upstream/pull/4075'
Andy Allan [Wed, 5 Jul 2023 11:04:55 +0000 (12:04 +0100)]
Remove obsolete pt-BR.yml translation file
Translatewiki now pushes pt-BR to pt.yml, which is used for both
pt and pt-BR.
Fixes #3670.
Tom Hughes [Tue, 4 Jul 2023 17:14:30 +0000 (18:14 +0100)]
Update bundle
translatewiki.net [Mon, 3 Jul 2023 11:18:06 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 1 Jul 2023 14:22:23 +0000 (15:22 +0100)]
Update bundle
Tom Hughes [Sat, 1 Jul 2023 14:15:23 +0000 (15:15 +0100)]
Update to rails 7.0.6
Tom Hughes [Sat, 1 Jul 2023 14:21:27 +0000 (15:21 +0100)]
Merge remote-tracking branch 'upstream/pull/4074'
Tom Hughes [Sat, 1 Jul 2023 14:12:38 +0000 (15:12 +0100)]
Fix confirmation prompt when granting or revoking roles
dependabot[bot] [Fri, 30 Jun 2023 23:49:45 +0000 (23:49 +0000)]
Bump eslint from 8.43.0 to 8.44.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.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.43.0...v8.44.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, 29 Jun 2023 11:18:30 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 27 Jun 2023 17:13:33 +0000 (18:13 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 27 Jun 2023 17:09:50 +0000 (18:09 +0100)]
Update bundle
Tom Hughes [Tue, 27 Jun 2023 17:09:08 +0000 (18:09 +0100)]
Update to rails 7.0.5.1
translatewiki.net [Mon, 26 Jun 2023 11:18:51 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Jun 2023 11:23:29 +0000 (13:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Jun 2023 19:26:26 +0000 (20:26 +0100)]
Update bundle
Tom Hughes [Wed, 21 Jun 2023 19:25:08 +0000 (20:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4071'