]> git.openstreetmap.org Git - rails.git/log
rails.git
2 years agoTest fetching the iD frame when not logged in
Tom Hughes [Tue, 26 Jul 2022 16:38:56 +0000 (17:38 +0100)]
Test fetching the iD frame when not logged in

2 years agoTest that verified emails from OAuth signups are accepted automatically
Tom Hughes [Tue, 26 Jul 2022 16:33:59 +0000 (17:33 +0100)]
Test that verified emails from OAuth signups are accepted automatically

2 years agoUpdate bundle
Tom Hughes [Tue, 26 Jul 2022 16:02:40 +0000 (17:02 +0100)]
Update bundle

2 years agoDon't try and write directly to the user status
Tom Hughes [Mon, 25 Jul 2022 23:32:16 +0000 (00:32 +0100)]
Don't try and write directly to the user status

This causes an exception when processing the authentication callback for
providers like google where we treat the email address as verified.

2 years agoRequire a logged in user for the iD frame
Tom Hughes [Mon, 25 Jul 2022 23:30:50 +0000 (00:30 +0100)]
Require a logged in user for the iD frame

The frame will error if the user is not logged in as it wants
to be able to access their OAuth token.

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

2 years agoMonkey patch MailDeliveryJob to work with delayed_job under ruby 3
Tom Hughes [Sat, 23 Jul 2022 11:03:51 +0000 (12:03 +0100)]
Monkey patch MailDeliveryJob to work with delayed_job under ruby 3

The delayed_job gem does not currently perserve keyword arguments
properly leading to errors when running under ruby 3 and try to run
a job that requires them.

This affects our deferred mail deliveries so we monkey patch the
mail delivery job to unpack the hash from the normal arguments and
use it to provide the expected keyword arguments.

https://github.com/collectiveidea/delayed_job/issues/1134

2 years agoFix test for change in class
Tom Hughes [Fri, 22 Jul 2022 21:48:31 +0000 (22:48 +0100)]
Fix test for change in class

2 years agoMerge remote-tracking branch 'upstream/pull/3616'
Tom Hughes [Fri, 22 Jul 2022 21:32:26 +0000 (22:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3616'

2 years agoMerge remote-tracking branch 'upstream/pull/3615'
Tom Hughes [Fri, 22 Jul 2022 21:32:24 +0000 (22:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3615'

2 years agoBootstrap 5: Change rounded-lg to rounded-3
mxdanger [Fri, 22 Jul 2022 20:17:36 +0000 (13:17 -0700)]
Bootstrap 5: Change rounded-lg to rounded-3

2 years agoUncomment asserts for namespaced elements in note rss test
Anton Khorev [Fri, 22 Jul 2022 15:02:00 +0000 (18:02 +0300)]
Uncomment asserts for namespaced elements in note rss test

2 years agoMerge remote-tracking branch 'upstream/pull/3612'
Tom Hughes [Thu, 21 Jul 2022 18:20:26 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3612'

2 years agoMerge remote-tracking branch 'upstream/pull/3610'
Tom Hughes [Thu, 21 Jul 2022 17:36:29 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/3610'

2 years agoMerge remote-tracking branch 'upstream/pull/3609'
Tom Hughes [Thu, 21 Jul 2022 17:25:27 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3609'

2 years agoAdd xmlns:dc namespace to note show rss actions
Anton Khorev [Thu, 21 Jul 2022 14:14:49 +0000 (17:14 +0300)]
Add xmlns:dc namespace to note show rss actions

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

2 years agoBootstrap 5: Use dropdown-menu-end for dropdown alignment
Andy Allan [Wed, 20 Jul 2022 18:34:19 +0000 (19:34 +0100)]
Bootstrap 5: Use dropdown-menu-end for dropdown alignment

2 years agoBootstrap 5: Fix table striping background colour
Andy Allan [Wed, 20 Jul 2022 17:49:10 +0000 (18:49 +0100)]
Bootstrap 5: Fix table striping background colour

2 years agoBootstrap-5: use logical alternative for text alignment
Andy Allan [Wed, 20 Jul 2022 17:45:26 +0000 (18:45 +0100)]
Bootstrap-5: use logical alternative for text alignment

Using start/end rather than left/right, for better RTL support.

2 years agoBootstrap 5: Use symmetrical padding in toggled dropdown
Andy Allan [Wed, 20 Jul 2022 17:43:45 +0000 (18:43 +0100)]
Bootstrap 5: Use symmetrical padding in toggled dropdown

Required since pl-* classes have been removed, but also works fine
without bringing start/end considerations into play.

2 years agoRework trace index to use secondary-actions
Andy Allan [Wed, 20 Jul 2022 16:36:01 +0000 (17:36 +0100)]
Rework trace index to use secondary-actions

The border between items is familiar UI, so we can keep it, but lets
use the secondary-actions approach instead.

This avoids using left-right specific border, margin and padding
classes

2 years agoBootstrap 5: Remove the padding from trace nav buttons on larger sizes
Andy Allan [Wed, 20 Jul 2022 10:39:52 +0000 (11:39 +0100)]
Bootstrap 5: Remove the padding from trace nav buttons on larger sizes

If additional py is added when the tabs are laid out in full, then the
other tabs start to become detatched from the rest of the page and a
line appears under the active tab.

We don't need the padding in the horizontal layout, so remove it, and
tweak the size of the padding when collapsed.

2 years agoBootstrap 5: Override button text colours, force to white
Andy Allan [Wed, 6 Jul 2022 17:23:35 +0000 (18:23 +0100)]
Bootstrap 5: Override button text colours, force to white

2 years agoUse bootstrap variables to style links
Andy Allan [Wed, 6 Jul 2022 17:09:24 +0000 (18:09 +0100)]
Use bootstrap variables to style links

Bootstrap 5 now has a hover color, and instead of trying to override
with CSS, it's easier to use the variables instead.

2 years agoBootstrap 5: data-toggle renamed to data-bs-toggle for dropdown menus
Andy Allan [Wed, 29 Jun 2022 16:46:59 +0000 (17:46 +0100)]
Bootstrap 5: data-toggle renamed to data-bs-toggle for dropdown menus

2 years agoBootstrap 5: no-gutters renamed to g-0
Andy Allan [Wed, 29 Jun 2022 16:35:09 +0000 (17:35 +0100)]
Bootstrap 5: no-gutters renamed to g-0

2 years agoBootstrap 5: Replace card-deck with a row-cols-* based grid
Andy Allan [Wed, 29 Jun 2022 16:31:59 +0000 (17:31 +0100)]
Bootstrap 5: Replace card-deck with a row-cols-* based grid

2 years agoBootstrap 5: Replace all form-group classes with mb-3
Andy Allan [Wed, 29 Jun 2022 16:14:10 +0000 (17:14 +0100)]
Bootstrap 5: Replace all form-group classes with mb-3

2 years agoBootstrap 5: Add form-label class to hand-crafted form labels
Andy Allan [Wed, 29 Jun 2022 16:02:43 +0000 (17:02 +0100)]
Bootstrap 5: Add form-label class to hand-crafted form labels

This is done automatically for forms created by bootstrap_form

2 years agoBootstrap 5: Override float attribute on legends
Andy Allan [Wed, 29 Jun 2022 14:29:42 +0000 (15:29 +0100)]
Bootstrap 5: Override float attribute on legends

I don't fully understand why bootstrap added this in v5, as the
discussion on the issue tracker isn't clear. But we neither want
nor need this.

2 years agoBootstrap 5: Update manual select boxes to use form-select class
Andy Allan [Wed, 29 Jun 2022 14:29:21 +0000 (15:29 +0100)]
Bootstrap 5: Update manual select boxes to use form-select class

2 years agoBootstrap 5: Remove use of form-row class
Andy Allan [Wed, 11 May 2022 14:31:50 +0000 (15:31 +0100)]
Bootstrap 5: Remove use of form-row class

This has been replaced by simple `row` class in v5. We can also use the
gx-N classes here, which tighten up the horizontal gutter sizes for
space-constrained forms.

2 years agoBootstrap 5: Enable negative margins
Andy Allan [Wed, 11 May 2022 13:26:05 +0000 (14:26 +0100)]
Bootstrap 5: Enable negative margins

2 years agoBootstrap 5: change rounded-sm to rounded-1
Andy Allan [Wed, 11 May 2022 13:16:28 +0000 (14:16 +0100)]
Bootstrap 5: change rounded-sm to rounded-1

2 years agoUpgrade to bootstrap 5
Andy Allan [Wed, 11 May 2022 13:07:09 +0000 (14:07 +0100)]
Upgrade to bootstrap 5

2 years agoSwitch actions workflows to use ruby/setup-ruby
Tom Hughes [Tue, 19 Jul 2022 17:51:29 +0000 (18:51 +0100)]
Switch actions workflows to use ruby/setup-ruby

2 years agoUpdate bundle
Tom Hughes [Tue, 19 Jul 2022 16:07:43 +0000 (17:07 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3604'
Tom Hughes [Tue, 19 Jul 2022 16:03:19 +0000 (17:03 +0100)]
Merge remote-tracking branch 'upstream/pull/3604'

2 years agoMerge remote-tracking branch 'upstream/pull/3597'
Tom Hughes [Tue, 19 Jul 2022 16:02:18 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/3597'

2 years agoMerge remote-tracking branch 'upstream/pull/3603'
Tom Hughes [Tue, 19 Jul 2022 16:01:35 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/3603'

2 years agoStrip leading/trailing whitespace from comma-separated trace tags
Anton Khorev [Tue, 19 Jul 2022 10:47:28 +0000 (13:47 +0300)]
Strip leading/trailing whitespace from comma-separated trace tags

2 years agoBump eslint from 8.19.0 to 8.20.0
dependabot[bot] [Mon, 18 Jul 2022 23:00:56 +0000 (23:00 +0000)]
Bump eslint from 8.19.0 to 8.20.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.19.0 to 8.20.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.19.0...v8.20.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 agoMerge branch 'master' into trace-description-maxlength
Anton Khorev [Mon, 18 Jul 2022 14:50:30 +0000 (17:50 +0300)]
Merge branch 'master' into trace-description-maxlength

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

2 years agoMerge remote-tracking branch 'upstream/pull/3602'
Tom Hughes [Sun, 17 Jul 2022 21:33:54 +0000 (22:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3602'

2 years agooptimize image file size
Martin Raifer [Sun, 17 Jul 2022 19:55:27 +0000 (21:55 +0200)]
optimize image file size

2 years agoremove blue circle in top right corner, improving contrast with "x" button
Martin Raifer [Sun, 17 Jul 2022 19:47:10 +0000 (21:47 +0200)]
remove blue circle in top right corner, improving contrast with "x" button

2 years agoMerge remote-tracking branch 'upstream/pull/3601'
Tom Hughes [Sun, 17 Jul 2022 10:15:06 +0000 (11:15 +0100)]
Merge remote-tracking branch 'upstream/pull/3601'

2 years agoUpdate bundle
Tom Hughes [Sun, 17 Jul 2022 10:13:34 +0000 (11:13 +0100)]
Update bundle

2 years agoadd banner for sotm 2022
Martin Raifer [Sat, 16 Jul 2022 19:48:06 +0000 (21:48 +0200)]
add banner for sotm 2022

2 years agoSet trace description input max length
Anton Khorev [Fri, 15 Jul 2022 02:19:00 +0000 (05:19 +0300)]
Set trace description input max length

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

2 years agoUpdate to rails 7.0.3.1
Tom Hughes [Wed, 13 Jul 2022 15:55:26 +0000 (16:55 +0100)]
Update to rails 7.0.3.1

2 years agoUpdate bundle
Tom Hughes [Wed, 13 Jul 2022 15:52:28 +0000 (16:52 +0100)]
Update bundle

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

2 years agoAdd a configuration option to disable HTTP basic authentication
Tom Hughes [Fri, 8 Jul 2022 16:25:20 +0000 (17:25 +0100)]
Add a configuration option to disable HTTP basic authentication

2 years agoLog any use of basic authentication
Tom Hughes [Fri, 8 Jul 2022 16:13:02 +0000 (17:13 +0100)]
Log any use of basic authentication

2 years agoThere is no need to do setup_user_auth and authorize for the same action
Tom Hughes [Fri, 8 Jul 2022 08:48:00 +0000 (09:48 +0100)]
There is no need to do setup_user_auth and authorize for the same action

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

2 years agoUpdate bundle
Tom Hughes [Tue, 5 Jul 2022 17:12:20 +0000 (18:12 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3588'
Tom Hughes [Tue, 5 Jul 2022 17:06:54 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/3588'

2 years agoBump eslint from 8.18.0 to 8.19.0
dependabot[bot] [Mon, 4 Jul 2022 23:00:42 +0000 (23:00 +0000)]
Bump eslint from 8.18.0 to 8.19.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.18.0 to 8.19.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.18.0...v8.19.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, 4 Jul 2022 11:14:17 +0000 (13:14 +0200)]
Localisation updates from https://translatewiki.net.

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

2 years agoFix new rubocop warning
Tom Hughes [Tue, 28 Jun 2022 20:11:12 +0000 (21:11 +0100)]
Fix new rubocop warning

2 years agoUpdate bundle
Tom Hughes [Tue, 28 Jun 2022 20:09:05 +0000 (21:09 +0100)]
Update bundle

2 years agoMerge remote-tracking branch 'upstream/pull/3583'
Tom Hughes [Tue, 28 Jun 2022 20:07:49 +0000 (21:07 +0100)]
Merge remote-tracking branch 'upstream/pull/3583'

2 years agoBump qs from 6.10.5 to 6.11.0
dependabot[bot] [Mon, 27 Jun 2022 23:00:54 +0000 (23:00 +0000)]
Bump qs from 6.10.5 to 6.11.0

Bumps [qs](https://github.com/ljharb/qs) from 6.10.5 to 6.11.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.5...v6.11.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  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, 27 Jun 2022 11:15:32 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix eslint warnings
Tom Hughes [Sun, 26 Jun 2022 18:56:27 +0000 (19:56 +0100)]
Fix eslint warnings

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

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

2 years agoUpdate bundle
Tom Hughes [Sun, 19 Jun 2022 11:53:46 +0000 (12:53 +0100)]
Update bundle

2 years agoRestore intended title for GPS trace view
Tom Hughes [Sun, 19 Jun 2022 11:52:47 +0000 (12:52 +0100)]
Restore intended title for GPS trace view

2 years agoMerge remote-tracking branch 'upstream/pull/3569'
Tom Hughes [Sun, 19 Jun 2022 11:49:38 +0000 (12:49 +0100)]
Merge remote-tracking branch 'upstream/pull/3569'

2 years agoMerge remote-tracking branch 'upstream/pull/3574'
Tom Hughes [Sun, 19 Jun 2022 11:38:49 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3574'

2 years agoMerge remote-tracking branch 'upstream/pull/3577'
Tom Hughes [Sun, 19 Jun 2022 11:38:08 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3577'

2 years agoMerge remote-tracking branch 'upstream/pull/3571'
Tom Hughes [Sun, 19 Jun 2022 11:33:52 +0000 (12:33 +0100)]
Merge remote-tracking branch 'upstream/pull/3571'

2 years agoMerge remote-tracking branch 'upstream/pull/3576'
Tom Hughes [Sun, 19 Jun 2022 11:32:44 +0000 (12:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3576'

2 years agoMerge remote-tracking branch 'upstream/pull/3573'
Tom Hughes [Sun, 19 Jun 2022 11:32:22 +0000 (12:32 +0100)]
Merge remote-tracking branch 'upstream/pull/3573'

2 years agoFix map edit controls min-zoom behaviour
faebebin [Sun, 19 Jun 2022 06:15:37 +0000 (08:15 +0200)]
Fix map edit controls min-zoom behaviour

The map dropdown and tooltip of the map edit controls should
behave similar when zooming in and out.
This is achieved by disabling the button-group and the buttons.

2 years agoBump eslint from 8.17.0 to 8.18.0
dependabot[bot] [Fri, 17 Jun 2022 23:01:04 +0000 (23:01 +0000)]
Bump eslint from 8.17.0 to 8.18.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.17.0 to 8.18.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.17.0...v8.18.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 [Thu, 16 Jun 2022 11:16:29 +0000 (13:16 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to iD v2.21.1
Martin Raifer [Wed, 15 Jun 2022 22:55:25 +0000 (00:55 +0200)]
Update to iD v2.21.1

2 years agoFix small error in _header.html.erb
Sky [Wed, 15 Jun 2022 21:14:34 +0000 (00:14 +0300)]
Fix small error in _header.html.erb

2 years agoonly parse hashParams if there is a hash
Martin Raifer [Tue, 14 Jun 2022 18:41:10 +0000 (20:41 +0200)]
only parse hashParams if there is a hash

Presumably this was an oversight in the original implementation, as `OSM.params` falls back to the page's `query` string if the function's parameter (here: the page's `hash`) is an empty string.

This fixes some inconsistent behaviour of the website. In the example below, the first URL sets the `background` to `none` while in the second example it doesn't.

* https://www.openstreetmap.org/edit.html?background=none
* https://www.openstreetmap.org/edit.html?background=none#map=…

2 years agoFix new rubocop warnings
Tom Hughes [Tue, 14 Jun 2022 18:04:39 +0000 (19:04 +0100)]
Fix new rubocop warnings

2 years agoUpdate bundle
Tom Hughes [Tue, 14 Jun 2022 18:02:40 +0000 (19:02 +0100)]
Update bundle

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

2 years agoRemove duplicate keys from en locale data
Anton Khorev [Sat, 11 Jun 2022 00:26:39 +0000 (03:26 +0300)]
Remove duplicate keys from en locale data

2 years agoMerge remote-tracking branch 'upstream/pull/3568'
Tom Hughes [Fri, 10 Jun 2022 15:46:24 +0000 (16:46 +0100)]
Merge remote-tracking branch 'upstream/pull/3568'

2 years agoMargins for 'comment from' / 'reported by' lines on issues page
Anton Khorev [Fri, 10 Jun 2022 14:22:15 +0000 (17:22 +0300)]
Margins for 'comment from' / 'reported by' lines on issues page

2 years agoAdd validation for relation member roles
Tom Hughes [Thu, 9 Jun 2022 18:11:59 +0000 (19:11 +0100)]
Add validation for relation member roles

Fixes #3563

2 years agoMerge remote-tracking branch 'upstream/pull/3566'
Tom Hughes [Thu, 9 Jun 2022 18:20:49 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/3566'

2 years agoWrap issue comment rich text in div
Anton Khorev [Thu, 9 Jun 2022 13:37:20 +0000 (16:37 +0300)]
Wrap issue comment rich text in div

2 years agoWrap issue report rich text in div
Anton Khorev [Thu, 9 Jun 2022 00:46:12 +0000 (03:46 +0300)]
Wrap issue report rich text in div

2 years agoMerge remote-tracking branch 'upstream/pull/3565'
Tom Hughes [Thu, 9 Jun 2022 18:18:53 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/3565'

2 years agoUpdate copyright notice
Dermot McNally [Thu, 12 May 2022 15:19:42 +0000 (16:19 +0100)]
Update copyright notice

Updated in accordance with LWG decision to better reflect updated
guidance, including providing a link to the Attribution Guidelines.

Closes #3565

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