]> git.openstreetmap.org Git - rails.git/log
rails.git
3 years agoRemove unused to_xml and to_xml_node methods from models
Andy Allan [Wed, 15 Sep 2021 15:56:28 +0000 (16:56 +0100)]
Remove unused to_xml and to_xml_node methods from models

3 years agoMove the xml format test for old nodes to the controller test
Andy Allan [Wed, 15 Sep 2021 15:55:00 +0000 (16:55 +0100)]
Move the xml format test for old nodes to the controller test

This allows us to remove the model method

3 years agoUse a builder to render changeset downloads
Andy Allan [Wed, 15 Sep 2021 15:33:04 +0000 (16:33 +0100)]
Use a builder to render changeset downloads

3 years agoFix test
Andy Allan [Wed, 15 Sep 2021 13:36:08 +0000 (14:36 +0100)]
Fix test

3 years agoUse flexbox to position user thumbnails on the dashboard
Andy Allan [Wed, 15 Sep 2021 13:30:32 +0000 (14:30 +0100)]
Use flexbox to position user thumbnails on the dashboard

This fixes a poor interaction involving lots of margins and the secondary-actions list

3 years agoRefactor paragraph margin to avoid custom css
Andy Allan [Wed, 15 Sep 2021 13:29:15 +0000 (14:29 +0100)]
Refactor paragraph margin to avoid custom css

3 years agoRestore the grey border around the user image on the profile page
Andy Allan [Wed, 15 Sep 2021 13:11:05 +0000 (14:11 +0100)]
Restore the grey border around the user image on the profile page

This approach keeps the look without adding in the margins (and floats)
which are inappropriate for the flex-based layout.

3 years agoUse an 'inline' dl to unify the appearance of the mapper and admin info details lines
Andy Allan [Wed, 15 Sep 2021 12:19:56 +0000 (13:19 +0100)]
Use an 'inline' dl to unify the appearance of the mapper and admin info details lines

3 years agoMove the admin actions into line with the other links
Andy Allan [Wed, 15 Sep 2021 10:57:58 +0000 (11:57 +0100)]
Move the admin actions into line with the other links

This avoids wrapping them under the user profile picture

3 years agoMerge pull request #179 from tomhughes/secondary-actions
Andy Allan [Wed, 15 Sep 2021 10:40:40 +0000 (11:40 +0100)]
Merge pull request #179 from tomhughes/secondary-actions

Improve behaviour of secondary action lists when wrapping

3 years agoTemporary pin on rubocop-rails until next bugfix release
Andy Allan [Wed, 15 Sep 2021 09:10:21 +0000 (10:10 +0100)]
Temporary pin on rubocop-rails until next bugfix release

There is a bug in the Rails/ContentTag cop that causes rubocop to crash. The bug has already been fixed and so should be available in the next release.

See https://github.com/rubocop/rubocop-rails/issues/543

3 years agoUpdate rubocop todo and fix new warnings
Tom Hughes [Tue, 14 Sep 2021 19:31:26 +0000 (20:31 +0100)]
Update rubocop todo and fix new warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 14 Sep 2021 18:22:41 +0000 (19:22 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Sep 2021 11:09:50 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUse autodetection for text files
Tom Hughes [Sun, 12 Sep 2021 17:51:51 +0000 (18:51 +0100)]
Use autodetection for text files

3 years agoMerge remote-tracking branch 'upstream/pull/3313'
Tom Hughes [Sun, 12 Sep 2021 17:50:06 +0000 (18:50 +0100)]
Merge remote-tracking branch 'upstream/pull/3313'

3 years agoMerge remote-tracking branch 'upstream/pull/3285'
Tom Hughes [Sun, 12 Sep 2021 17:47:50 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/3285'

3 years agoMerge remote-tracking branch 'upstream/pull/3318'
Tom Hughes [Sun, 12 Sep 2021 17:46:09 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3318'

3 years agoMerge remote-tracking branch 'upstream/pull/3317'
Tom Hughes [Sun, 12 Sep 2021 17:41:05 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/3317'

3 years agoAdded `crossing` as key
Morten Bruhn [Thu, 9 Sep 2021 20:01:13 +0000 (22:01 +0200)]
Added `crossing` as key

3 years agoAdded a couple of keys under `natural` to en.yml
Morten Bruhn [Thu, 9 Sep 2021 18:53:11 +0000 (20:53 +0200)]
Added a couple of keys under `natural` to en.yml

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Sep 2021 11:10:03 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoAdd Fastly as top three donor
Paul Norman [Thu, 9 Sep 2021 03:05:47 +0000 (20:05 -0700)]
Add Fastly as top three donor

3 years agoUpdate en.yml
Dermot McNally [Wed, 8 Sep 2021 22:50:36 +0000 (23:50 +0100)]
Update en.yml

Updated (simplified) map tile attribution requirement to be the same as for any use of OSM data (based on request to LWG)

3 years agoUpdate bundle
Tom Hughes [Tue, 7 Sep 2021 17:41:05 +0000 (18:41 +0100)]
Update bundle

3 years agoAdd gitattribute to force lf line endings
Grant Slater [Tue, 7 Sep 2021 09:46:29 +0000 (10:46 +0100)]
Add gitattribute to force lf line endings

3 years agoAdd .editorconfig
Grant Slater [Tue, 7 Sep 2021 09:46:02 +0000 (10:46 +0100)]
Add .editorconfig

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Sep 2021 11:09:45 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Sep 2021 11:10:23 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3308'
Tom Hughes [Thu, 2 Sep 2021 06:05:40 +0000 (07:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3308'

3 years agoBump js-cookie from 3.0.0 to 3.0.1
dependabot[bot] [Wed, 1 Sep 2021 23:00:55 +0000 (23:00 +0000)]
Bump js-cookie from 3.0.0 to 3.0.1

Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.0 to 3.0.1.
- [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/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: js-cookie
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoUpdate bundle
Tom Hughes [Wed, 1 Sep 2021 17:28:06 +0000 (18:28 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Aug 2021 11:15:19 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoCheck that user email address are only returned with read_email
Tom Hughes [Sun, 22 Aug 2021 18:42:56 +0000 (19:42 +0100)]
Check that user email address are only returned with read_email

3 years agoCheck that use of privileged scopes is restricted to administrators
Tom Hughes [Sun, 1 Aug 2021 21:22:12 +0000 (22:22 +0100)]
Check that use of privileged scopes is restricted to administrators

3 years agoAdd a privileged scope that allows authorization to be skipped
Tom Hughes [Fri, 30 Jul 2021 21:42:45 +0000 (22:42 +0100)]
Add a privileged scope that allows authorization to be skipped

3 years agoAdd a privileged scope that allows email addresses to be returned
Tom Hughes [Fri, 30 Jul 2021 21:39:39 +0000 (22:39 +0100)]
Add a privileged scope that allows email addresses to be returned

3 years agoIntroduce privileged scopes that only an administrator can enable
Tom Hughes [Fri, 30 Jul 2021 21:24:51 +0000 (22:24 +0100)]
Introduce privileged scopes that only an administrator can enable

3 years agoUpdate bundle
Tom Hughes [Tue, 24 Aug 2021 17:44:34 +0000 (18:44 +0100)]
Update bundle

3 years agoImprove testing of user details API responses
Tom Hughes [Sun, 22 Aug 2021 14:40:33 +0000 (15:40 +0100)]
Improve testing of user details API responses

3 years agoCorrect policing of access to private user details
Tom Hughes [Tue, 24 Aug 2021 15:59:35 +0000 (16:59 +0100)]
Correct policing of access to private user details

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Aug 2021 11:11:11 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoImprove behaviour of secondary action lists when wrapping
Tom Hughes [Sat, 21 Aug 2021 14:32:47 +0000 (15:32 +0100)]
Improve behaviour of secondary action lists when wrapping

Based on https://stackoverflow.com/a/31732902 this ensure that when
a secondary action list wraps the additional lines don't start with
an item delimiter by pushing it to the left, outside of a parent nav
element which then hides it.

3 years agoUpdate to rails 6.1.4.1
Tom Hughes [Sat, 21 Aug 2021 13:38:08 +0000 (14:38 +0100)]
Update to rails 6.1.4.1

3 years agoUpdate bundle
Tom Hughes [Sat, 21 Aug 2021 13:36:27 +0000 (14:36 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Aug 2021 11:10:28 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3298'
Tom Hughes [Wed, 18 Aug 2021 14:29:17 +0000 (15:29 +0100)]
Merge remote-tracking branch 'upstream/pull/3298'

3 years agoMerge remote-tracking branch 'upstream/pull/3296'
Tom Hughes [Wed, 18 Aug 2021 14:12:43 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3296'

3 years agoConvert account setting menu to tabs, and include on other pages
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.

3 years agoRefactor the profile page to move the profile information out of the header
Andy Allan [Thu, 12 Aug 2021 14:59:07 +0000 (15:59 +0100)]
Refactor the profile page to move the profile information out of the header

This makes it look like other normal pages, along with removing the unusual full-width class.

3 years agoSplit the non-public information off of the profile page
Andy Allan [Wed, 28 Jul 2021 16:54:57 +0000 (17:54 +0100)]
Split the non-public information off of the profile page

This opens up many possibilities for more interesting things to be
shown on the dashboard, as well as making it easier to find if
you have lots of content in your profile.

3 years agoUpdate to iD v2.20.1
mbrzakovic [Wed, 18 Aug 2021 11:02:49 +0000 (11:02 +0000)]
Update to iD v2.20.1

3 years agoFix new rubocop warnings
Tom Hughes [Tue, 17 Aug 2021 17:17:18 +0000 (18:17 +0100)]
Fix new rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Tue, 17 Aug 2021 17:15:30 +0000 (18:15 +0100)]
Update bundle

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Aug 2021 11:10:49 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3294'
Tom Hughes [Sun, 15 Aug 2021 10:15:23 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/3294'

3 years agorerun script/misc/update-wiki-pages
Mateusz Konieczny [Sun, 15 Aug 2021 08:51:56 +0000 (10:51 +0200)]
rerun script/misc/update-wiki-pages

3 years agoMerge remote-tracking branch 'upstream/pull/3293'
Tom Hughes [Thu, 12 Aug 2021 17:10:54 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/3293'

3 years agoMerge remote-tracking branch 'upstream/pull/3292'
Tom Hughes [Thu, 12 Aug 2021 16:57:54 +0000 (17:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3292'

3 years agoMerge remote-tracking branch 'upstream/pull/3291'
Tom Hughes [Thu, 12 Aug 2021 16:57:51 +0000 (17:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3291'

3 years agoUse named paths for diary comments path
Andy Allan [Thu, 12 Aug 2021 16:53:10 +0000 (17:53 +0100)]
Use named paths for diary comments path

3 years agoUse named paths for various user blocks links
Andy Allan [Thu, 12 Aug 2021 16:52:55 +0000 (17:52 +0100)]
Use named paths for various user blocks links

3 years agoUse user_account_path for links to settings page
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

3 years agoAvoid using raw html in translations for links.
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.

3 years agoUpdate the link for changing your editor preferences
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.

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Aug 2021 11:10:09 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Mon, 9 Aug 2021 17:47:59 +0000 (18:47 +0100)]
Update bundle

3 years agoUse correct link for users with no location
Tom Hughes [Mon, 9 Aug 2021 17:29:54 +0000 (18:29 +0100)]
Use correct link for users with no location

Fixes #3290

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Aug 2021 11:11:14 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoRestore accidentally deleted lines in database structure
Tom Hughes [Thu, 5 Aug 2021 23:19:39 +0000 (00:19 +0100)]
Restore accidentally deleted lines in database structure

3 years agoRemove xid_to_int4 postgres function
Tom Hughes [Thu, 5 Aug 2021 23:15:40 +0000 (00:15 +0100)]
Remove xid_to_int4 postgres function

Fixes #3288

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Aug 2021 11:09:02 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate bundle
Tom Hughes [Tue, 3 Aug 2021 12:49:54 +0000 (13:49 +0100)]
Update bundle

3 years agoMerge remote-tracking branch 'upstream/pull/3282'
Tom Hughes [Tue, 3 Aug 2021 11:30:52 +0000 (12:30 +0100)]
Merge remote-tracking branch 'upstream/pull/3282'

3 years agoUpdate attribution for Australia
Andrew Harvey [Tue, 3 Aug 2021 02:01:50 +0000 (12:01 +1000)]
Update attribution for Australia

Per request from the copyright holder to DWG updated to match requested attribution per https://data.gov.au/data/dataset/bdcf5b09-89bc-47ec-9281-6b8e9ee147aa

3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Aug 2021 11:09:58 +0000 (13:09 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoBump eslint from 7.31.0 to 7.32.0
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>
3 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Jul 2021 11:11:28 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.

3 years agoMerge remote-tracking branch 'upstream/pull/3279'
Tom Hughes [Wed, 28 Jul 2021 19:18:07 +0000 (20:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3279'

3 years agoMerge remote-tracking branch 'upstream/pull/3278'
Tom Hughes [Wed, 28 Jul 2021 19:17:41 +0000 (20:17 +0100)]
Merge remote-tracking branch 'upstream/pull/3278'

3 years agoFix redirect to terms path when not logged in
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.

3 years agoSwitch to html5-compatible fragment encoding for wikipedia URLs
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.

3 years agoMerge remote-tracking branch 'upstream/pull/3277'
Tom Hughes [Wed, 28 Jul 2021 14:05:49 +0000 (15:05 +0100)]
Merge remote-tracking branch 'upstream/pull/3277'

3 years agoUse our darkgrey for bootstrap secondary colour
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.

3 years agoMerge pull request #3268 from tomhughes/capitalisation
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

3 years agoMerge remote-tracking branch 'upstream/pull/3276'
Tom Hughes [Wed, 28 Jul 2021 09:46:21 +0000 (10:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3276'

3 years agoAdd --ignore-engines for yarn in the Dockerfile
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

3 years agoMerge remote-tracking branch 'upstream/pull/3274'
Tom Hughes [Wed, 28 Jul 2021 08:57:49 +0000 (09:57 +0100)]
Merge remote-tracking branch 'upstream/pull/3274'

3 years agoEnable test for showing flash message in the new language
Andy Allan [Wed, 28 Jul 2021 08:38:24 +0000 (09:38 +0100)]
Enable test for showing flash message in the new language

3 years agoAdd missing autocomplete attributes
Tom Hughes [Tue, 27 Jul 2021 18:36:47 +0000 (19:36 +0100)]
Add missing autocomplete attributes

3 years agoPass --ignore-engines to yarn
Tom Hughes [Tue, 27 Jul 2021 18:17:13 +0000 (19:17 +0100)]
Pass --ignore-engines to yarn

3 years agoUpdate bundle
Tom Hughes [Tue, 27 Jul 2021 17:42:57 +0000 (18:42 +0100)]
Update bundle

3 years agoUse terser for javascript compression to get ES6 support
Tom Hughes [Tue, 27 Jul 2021 17:42:13 +0000 (18:42 +0100)]
Use terser for javascript compression to get ES6 support

3 years agoFix locale matching for iD
Tom Hughes [Tue, 27 Jul 2021 16:38:17 +0000 (17:38 +0100)]
Fix locale matching for iD

3 years agoUpdate path to js-cookie
Tom Hughes [Tue, 27 Jul 2021 07:18:53 +0000 (08:18 +0100)]
Update path to js-cookie

3 years agoMerge remote-tracking branch 'upstream/pull/3271'
Tom Hughes [Tue, 27 Jul 2021 07:16:59 +0000 (08:16 +0100)]
Merge remote-tracking branch 'upstream/pull/3271'

3 years agoBump js-cookie from 2.2.1 to 3.0.0
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>
3 years agoMerge remote-tracking branch 'upstream/pull/3270'
Tom Hughes [Mon, 26 Jul 2021 18:11:08 +0000 (19:11 +0100)]
Merge remote-tracking branch 'upstream/pull/3270'

3 years agoiD api url update
Milos Brzakovic [Mon, 26 Jul 2021 17:11:33 +0000 (19:11 +0200)]
iD api url update

3 years agoUpdate to iD v2.20.0
Ubuntu [Mon, 26 Jul 2021 16:40:46 +0000 (16:40 +0000)]
Update to iD v2.20.0