]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 18 Aug 2021 14:29:17 +0000 (15:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3298'
Tom Hughes [Wed, 18 Aug 2021 14:12:43 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3296'
Andy Allan [Wed, 18 Aug 2021 13:30:35 +0000 (14:30 +0100)]
Convert account setting menu to tabs, and include on other pages
This makes it easier to navigate around these pages. Since each tab
corresponds to a given controller, this makes the selection of active
tabs straightforward.
mbrzakovic [Wed, 18 Aug 2021 11:02:49 +0000 (11:02 +0000)]
Update to iD v2.20.1
Tom Hughes [Tue, 17 Aug 2021 17:17:18 +0000 (18:17 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 17 Aug 2021 17:15:30 +0000 (18:15 +0100)]
Update bundle
translatewiki.net [Mon, 16 Aug 2021 11:10:49 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 15 Aug 2021 10:15:23 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/3294'
Mateusz Konieczny [Sun, 15 Aug 2021 08:51:56 +0000 (10:51 +0200)]
rerun script/misc/update-wiki-pages
Tom Hughes [Thu, 12 Aug 2021 17:10:54 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3293'
Tom Hughes [Thu, 12 Aug 2021 16:57:54 +0000 (17:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3292'
Tom Hughes [Thu, 12 Aug 2021 16:57:51 +0000 (17:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3291'
Andy Allan [Thu, 12 Aug 2021 16:53:10 +0000 (17:53 +0100)]
Use named paths for diary comments path
Andy Allan [Thu, 12 Aug 2021 16:52:55 +0000 (17:52 +0100)]
Use named paths for various user blocks links
Andy Allan [Thu, 12 Aug 2021 16:09:07 +0000 (17:09 +0100)]
Use user_account_path for links to settings page
Much easier to read than having to be explicit about controllers etc
Andy Allan [Thu, 12 Aug 2021 15:26:21 +0000 (16:26 +0100)]
Avoid using raw html in translations for links.
This is a followup to
26698d6 which introduced the html. It's better
to use interpolation for links, since this avoids the translations
from introducing html syntax errors.
I had to change the translation key, since changing the interpolation
variables alone would lead to breakages.
Andy Allan [Thu, 12 Aug 2021 15:30:34 +0000 (16:30 +0100)]
Update the link for changing your editor preferences
I've left the internal name of the link the same, to avoid having to
change the translation key and retranslate everything.
translatewiki.net [Thu, 12 Aug 2021 11:10:09 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 9 Aug 2021 17:47:59 +0000 (18:47 +0100)]
Update bundle
Tom Hughes [Mon, 9 Aug 2021 17:29:54 +0000 (18:29 +0100)]
Use correct link for users with no location
Fixes #3290
translatewiki.net [Mon, 9 Aug 2021 11:11:14 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 5 Aug 2021 23:19:39 +0000 (00:19 +0100)]
Restore accidentally deleted lines in database structure
Tom Hughes [Thu, 5 Aug 2021 23:15:40 +0000 (00:15 +0100)]
Remove xid_to_int4 postgres function
Fixes #3288
translatewiki.net [Thu, 5 Aug 2021 11:09:02 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 3 Aug 2021 12:49:54 +0000 (13:49 +0100)]
Update bundle
Tom Hughes [Tue, 3 Aug 2021 11:30:52 +0000 (12:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3282'
translatewiki.net [Mon, 2 Aug 2021 11:09:58 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 30 Jul 2021 23:00:40 +0000 (23:00 +0000)]
Bump eslint from 7.31.0 to 7.32.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.31.0 to 7.32.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.31.0...v7.32.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 Jul 2021 11:11:28 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 28 Jul 2021 19:18:07 +0000 (20:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3279'
Tom Hughes [Wed, 28 Jul 2021 19:17:41 +0000 (20:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3278'
Andy Allan [Wed, 28 Jul 2021 15:36:13 +0000 (16:36 +0100)]
Fix redirect to terms path when not logged in
This was missed during #3147 since it wasn't covered by a test.
Andy Allan [Wed, 28 Jul 2021 14:54:21 +0000 (15:54 +0100)]
Switch to html5-compatible fragment encoding for wikipedia URLs
Fixes #3269
In the HTML4 days, fragments weren't allowed to have `%` signs, so
mediawiki generated fragments with `%` replaced with a `.`
In HTML5, fragments can have % encoded characters, and so in 2017
wikipedia switched over to this for their automatically generated
fragments, while keeping the "dot" versions available as a fallback.
However, we have been automatically converting all fragments,
including manually specified anchors that do not have "dot"-encoded
versions available. So we can now simplify everything by just using
the HTML5 percent-encoded fragments.
Tom Hughes [Wed, 28 Jul 2021 14:05:49 +0000 (15:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3277'
Andy Allan [Wed, 28 Jul 2021 13:17:55 +0000 (14:17 +0100)]
Use our darkgrey for bootstrap secondary colour
Our blue is less saturated and lighter, and so the bootstrap-default
secondary colour is too dark and too saturated when beside our
primary buttons.
Andy Allan [Wed, 28 Jul 2021 10:06:47 +0000 (11:06 +0100)]
Merge pull request #3268 from tomhughes/capitalisation
Improve capitalisation of page titles
Tom Hughes [Wed, 28 Jul 2021 09:46:21 +0000 (10:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3276'
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 [Wed, 28 Jul 2021 08:57:49 +0000 (09:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3274'
Andy Allan [Wed, 28 Jul 2021 08:38:24 +0000 (09:38 +0100)]
Enable test for showing flash message in the new language
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.
Tom Hughes [Thu, 22 Jul 2021 18:00:08 +0000 (19:00 +0100)]
Improve capitalisation of page titles
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>