]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 28 Jul 2021 09:14:49 +0000 (10:14 +0100)]
Add --ignore-engines for yarn in the Dockerfile
Refs #3275
See also
102f3a6668665774f069a8116a251a28c3c5c0cc
Tom Hughes [Tue, 27 Jul 2021 18:36:47 +0000 (19:36 +0100)]
Add missing autocomplete attributes
Tom Hughes [Tue, 27 Jul 2021 18:17:13 +0000 (19:17 +0100)]
Pass --ignore-engines to yarn
Tom Hughes [Tue, 27 Jul 2021 17:42:57 +0000 (18:42 +0100)]
Update bundle
Tom Hughes [Tue, 27 Jul 2021 17:42:13 +0000 (18:42 +0100)]
Use terser for javascript compression to get ES6 support
Tom Hughes [Tue, 27 Jul 2021 16:38:17 +0000 (17:38 +0100)]
Fix locale matching for iD
Tom Hughes [Tue, 27 Jul 2021 07:18:53 +0000 (08:18 +0100)]
Update path to js-cookie
Tom Hughes [Tue, 27 Jul 2021 07:16:59 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3271'
dependabot[bot] [Mon, 26 Jul 2021 23:00:46 +0000 (23:00 +0000)]
Bump js-cookie from 2.2.1 to 3.0.0
Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/master/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v2.2.1...v3.0.0)
---
updated-dependencies:
- dependency-name: js-cookie
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 26 Jul 2021 18:11:08 +0000 (19:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3270'
Milos Brzakovic [Mon, 26 Jul 2021 17:11:33 +0000 (19:11 +0200)]
iD api url update
Ubuntu [Mon, 26 Jul 2021 16:40:46 +0000 (16:40 +0000)]
Update to iD v2.20.0
translatewiki.net [Mon, 26 Jul 2021 11:11:09 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Jul 2021 11:10:55 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Jul 2021 18:24:31 +0000 (19:24 +0100)]
Merge remote-tracking branch 'upstream/pull/3257'
Andy Allan [Wed, 21 Jul 2021 18:10:55 +0000 (19:10 +0100)]
Use an unstyled list for showing the languages
Andy Allan [Wed, 21 Jul 2021 17:44:24 +0000 (18:44 +0100)]
Ensure that flash message is shown in the updated language
Tom Hughes [Wed, 21 Jul 2021 17:37:17 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/3233'
Tom Hughes [Wed, 21 Jul 2021 17:32:41 +0000 (18:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3265'
Andy Allan [Wed, 21 Jul 2021 16:28:17 +0000 (17:28 +0100)]
Remove incorrectly spelled helper_method
The spelling of language is wrong here, and the correct version
is already there further down at the preferred_language method definition
Josh Soref [Fri, 25 Jun 2021 04:22:13 +0000 (00:22 -0400)]
spelling: unknown
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:12 +0000 (00:22 -0400)]
spelling: uniqueness
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:07 +0000 (00:22 -0400)]
spelling: success
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:06 +0000 (00:22 -0400)]
spelling: shouldn't
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:02 +0000 (00:22 -0400)]
spelling: nonexistent
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:01 +0000 (00:22 -0400)]
spelling: modify
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:58 +0000 (00:21 -0400)]
spelling: layman's
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:57 +0000 (00:21 -0400)]
spelling: languages
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:56 +0000 (00:21 -0400)]
spelling: kindergarten
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:55 +0000 (00:21 -0400)]
spelling: forbidden
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:22:37 +0000 (00:22 -0400)]
spelling: extinguisher
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:42 +0000 (00:21 -0400)]
spelling: beekeeper
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:35 +0000 (00:21 -0400)]
spelling: abcdefghijklmnopqrstuvwxyz
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Josh Soref [Fri, 25 Jun 2021 04:21:34 +0000 (00:21 -0400)]
spelling: (self reference is superfluous)
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Tom Hughes [Wed, 21 Jul 2021 14:41:31 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3264'
Andy Allan [Wed, 21 Jul 2021 14:07:24 +0000 (15:07 +0100)]
Ensure the heading text appears above the illustration
The easiest way to do this is to make the text a child of the div
with the background image. The change to min-size is so that if
the text wraps often enough on narrow screens, the header expands
vertically rather than the text spilling over.
Fixes #3259
Tom Hughes [Wed, 21 Jul 2021 11:16:08 +0000 (12:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3263'
Tom Hughes [Wed, 21 Jul 2021 10:52:10 +0000 (11:52 +0100)]
Treat association between users and OAuth 2 applications as polymorphic
Andy Allan [Wed, 21 Jul 2021 10:45:37 +0000 (11:45 +0100)]
Refactor to use a heading class for height when using header-illustrations
This fixes a glitch highlighted in #3259, where the css class stopped applying
when the view was moved to a different controller.
We're moving to having each view responsible for their layout, and commonly having
override classes explicitly in the relevant views. So we can follow that pattern here.
Andy Allan [Wed, 21 Jul 2021 10:24:06 +0000 (11:24 +0100)]
Fix various code comments
These were found as part of #3233
Tom Hughes [Wed, 21 Jul 2021 10:24:17 +0000 (11:24 +0100)]
Merge remote-tracking branch 'upstream/pull/3237'
Tom Hughes [Tue, 20 Jul 2021 17:10:03 +0000 (18:10 +0100)]
Update bundle
Tom Hughes [Tue, 20 Jul 2021 17:09:07 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3262'
dependabot[bot] [Mon, 19 Jul 2021 23:00:50 +0000 (23:00 +0000)]
Bump eslint from 7.30.0 to 7.31.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.30.0 to 7.31.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.30.0...v7.31.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, 19 Jul 2021 11:09:27 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 18 Jul 2021 17:25:44 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3251'
translatewiki.net [Thu, 15 Jul 2021 11:10:37 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 14 Jul 2021 18:20:47 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3258'
Andy Allan [Wed, 14 Jul 2021 17:54:23 +0000 (18:54 +0100)]
Ensure message destroy button has danger colour when showing the message, and add button to show page when viewing sent messages
Andy Allan [Wed, 14 Jul 2021 17:40:02 +0000 (18:40 +0100)]
Ensure the message title shows in the heading for both sent and received messages
I'm not sure why they were ever different.
Andy Allan [Wed, 14 Jul 2021 17:36:52 +0000 (18:36 +0100)]
Add a title in the heading to match the main menu text
Andy Allan [Wed, 14 Jul 2021 17:34:39 +0000 (18:34 +0100)]
Convert mailbox navigation to use tabs
Andy Allan [Wed, 14 Jul 2021 16:39:09 +0000 (17:39 +0100)]
Move profile-related settings to their own form
Refs #3167
Andy Allan [Wed, 14 Jul 2021 11:43:54 +0000 (12:43 +0100)]
Remove code complexity around resetting language preferences
This was originally introduced since we saved the user and showed
the result on the same action. Now that the preferences controller
saves and redirects, the user model and associated language preferences
are reloaded between requests, and this code is no longer required.
Andy Allan [Wed, 30 Jun 2021 17:02:42 +0000 (18:02 +0100)]
Split user preferences into a separate page
Refs #3167
Tom Hughes [Wed, 14 Jul 2021 10:28:03 +0000 (11:28 +0100)]
Update bundle
translatewiki.net [Mon, 12 Jul 2021 11:08:34 +0000 (13:08 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Jul 2021 11:09:12 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 6 Jul 2021 23:33:11 +0000 (00:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3253'
dependabot[bot] [Tue, 6 Jul 2021 23:04:44 +0000 (23:04 +0000)]
Bump coverallsapp/github-action from 1.1.2 to 1.1.3
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.1.2...1.1.3)
---
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 [Tue, 6 Jul 2021 18:30:05 +0000 (19:30 +0100)]
Allow cross origin access to OAuth 2 token endpoints
Tom Hughes [Tue, 6 Jul 2021 18:29:42 +0000 (19:29 +0100)]
Allow cross origin access to trace data
Fixes #3252
Tom Hughes [Tue, 6 Jul 2021 17:09:00 +0000 (18:09 +0100)]
Update bundle
Tom Hughes [Tue, 6 Jul 2021 09:12:51 +0000 (10:12 +0100)]
Allow acls to match on parent domains
Morten Bruhn [Tue, 6 Jul 2021 09:13:16 +0000 (11:13 +0200)]
Added historic=rune_stone to en.yml
translatewiki.net [Mon, 5 Jul 2021 11:10:43 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 2 Jul 2021 23:11:47 +0000 (00:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3247'
dependabot[bot] [Fri, 2 Jul 2021 23:00:55 +0000 (23:00 +0000)]
Bump eslint from 7.29.0 to 7.30.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.29.0 to 7.30.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.29.0...v7.30.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 2 Jul 2021 12:56:50 +0000 (13:56 +0100)]
Merge remote-tracking branch 'upstream/pull/3246'
Paul Norman [Fri, 2 Jul 2021 12:49:06 +0000 (05:49 -0700)]
Update banner FAQ.
This adds a contrast requirement for the upper-right corner so the
'X' can be seen. It also adds a requirement that PRs be created
before the banner needs to be shown, in order to allow for proper
review.
Tom Hughes [Thu, 1 Jul 2021 15:26:17 +0000 (16:26 +0100)]
Check that the permission is non-zero
Fixes #3241
translatewiki.net [Thu, 1 Jul 2021 11:50:13 +0000 (13:50 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 30 Jun 2021 21:25:02 +0000 (22:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3240'
Tom Hughes [Wed, 30 Jun 2021 18:14:47 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/3239'
Andy Allan [Wed, 30 Jun 2021 14:21:49 +0000 (15:21 +0100)]
Refactor About header to use bootstrap and flex
This reduces the amount of custom CSS required for the layout, and
makes it responsive on small screen sizes.
Andy Allan [Wed, 30 Jun 2021 10:48:12 +0000 (11:48 +0100)]
Alight the max-width of the content to one of the bootstrap breakpoints
This makes various things easier to reason about, as well as making
some grid things easier too.
Andy Allan [Wed, 30 Jun 2021 10:29:34 +0000 (11:29 +0100)]
Use bootstrap font family
This contains and expanded list of fonts, covering more platforms
and edge cases than ours, so there's no need to override.
Andy Allan [Wed, 30 Jun 2021 10:17:30 +0000 (11:17 +0100)]
Remove some default styling from body
These mirror, either exactly or pretty close to exactly, what is set
by the bootstrap reboot style, so there's no need for us to duplicate.
Tom Hughes [Tue, 29 Jun 2021 18:22:31 +0000 (19:22 +0100)]
Remove some references to webmaster
Tom Hughes [Tue, 29 Jun 2021 18:14:50 +0000 (19:14 +0100)]
Fix some broken translation lookups
Tom Hughes [Tue, 29 Jun 2021 17:42:34 +0000 (18:42 +0100)]
Fix new erblint warnings
Tom Hughes [Tue, 29 Jun 2021 17:29:00 +0000 (18:29 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 29 Jun 2021 17:21:22 +0000 (18:21 +0100)]
Update bundle
translatewiki.net [Mon, 28 Jun 2021 13:36:14 +0000 (15:36 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 27 Jun 2021 17:42:47 +0000 (18:42 +0100)]
Switch web site to use OAuth 2
Tom Hughes [Sun, 27 Jun 2021 17:44:05 +0000 (18:44 +0100)]
Merge remote-tracking branch 'upstream/pull/3235'
Tom Hughes [Sat, 26 Jun 2021 23:38:16 +0000 (00:38 +0100)]
Make /api/0.6/permissions work for OAuth 2 clients
dependabot[bot] [Fri, 25 Jun 2021 23:00:44 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.73.0 to 0.74.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.73.0 to 0.74.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.73.0...v0.74.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>
Tom Hughes [Fri, 25 Jun 2021 19:26:51 +0000 (20:26 +0100)]
Restore browse-section class to changeset view
Fixes #3234
Tom Hughes [Thu, 24 Jun 2021 21:22:54 +0000 (22:22 +0100)]
Update to rails 6.1.4
Tom Hughes [Thu, 24 Jun 2021 19:48:14 +0000 (20:48 +0100)]
Revert "Localisation updates from https://translatewiki.net."
This reverts commit
93660ec9e86b683bb7bce6e0f51c8affcf3066f7 .
Tom Hughes [Thu, 24 Jun 2021 19:35:29 +0000 (20:35 +0100)]
Enable access token reuse for OAuth 2
Tom Hughes [Thu, 24 Jun 2021 19:28:00 +0000 (20:28 +0100)]
Update doorkeeper configuration file from master template
translatewiki.net [Thu, 24 Jun 2021 10:06:09 +0000 (12:06 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 24 Jun 2021 07:44:03 +0000 (08:44 +0100)]
Update bundle
Tom Hughes [Thu, 24 Jun 2021 07:43:18 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/3177'
Tom Hughes [Wed, 23 Jun 2021 20:36:57 +0000 (21:36 +0100)]
Merge remote-tracking branch 'upstream/pull/3232'
Andy Allan [Wed, 23 Jun 2021 19:09:19 +0000 (20:09 +0100)]
Refactor terms declined flash message to use a partial
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
Andy Allan [Wed, 23 Jun 2021 16:38:54 +0000 (17:38 +0100)]
Refactor flash messages to use a flex row for positioning
This works better for narrow widths and needs less custom CSS.
Andy Allan [Wed, 23 Jun 2021 16:20:48 +0000 (17:20 +0100)]
Ensure that all floated elements in the header stay within it
In certain circumstance, due to either extreme narrow screen widths,
or due to padding on floating elements exceeding the header height,
some things could appear outwith the header. This clearfix avoids
this from happening.