]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 25 Nov 2021 17:15:10 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3378'
Tom Hughes [Thu, 25 Nov 2021 17:12:26 +0000 (17:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3377'
Tom Hughes [Thu, 25 Nov 2021 17:11:02 +0000 (17:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3376'
translatewiki.net [Thu, 25 Nov 2021 12:12:20 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 17 Nov 2021 18:23:38 +0000 (18:23 +0000)]
Use flex grid to position changeset discussion subscribe button
This avoids needing any floats. Also remove buttons class from two
locations, since there is a min-width on that class and it affects
the button styling negatively for standalone buttons
Andy Allan [Wed, 17 Nov 2021 18:10:11 +0000 (18:10 +0000)]
Remove some unused thumbnail rules
These are all done with flex grids now, so no need to float the image anywhere
Andy Allan [Wed, 17 Nov 2021 18:07:24 +0000 (18:07 +0000)]
Simplify margins when showing diary entries
Andy Allan [Wed, 17 Nov 2021 17:55:35 +0000 (17:55 +0000)]
Remove unused browse-field style rules
Andy Allan [Wed, 17 Nov 2021 17:39:42 +0000 (17:39 +0000)]
Pass classes to override the default thumbnail_tiny style, rather than having another selector overriding
Andy Allan [Wed, 17 Nov 2021 17:33:14 +0000 (17:33 +0000)]
Replace CSS-driven borders with bootstrap borders
This makes future refactoring easier, since the elements will
retain their borders even if the hierarchy changes.
Also round some maps and the legale section since I think those now
look nicer.
Andy Allan [Wed, 17 Nov 2021 16:36:58 +0000 (16:36 +0000)]
Remove border-radius parameter
This overrides the same variable from bootstrap. Since bootstrap
also comes with -sm and -lg variants defined by rem, our px-based
override doesn't sit nicely with those.
Andy Allan [Wed, 17 Nov 2021 15:52:59 +0000 (15:52 +0000)]
Use flex grid instead of floating to position changeset element paging nav
This works much better when either the heading or the paging is long.
The heading was moved into the partial to avoid repetitive grid definitions
Andy Allan [Wed, 17 Nov 2021 11:51:41 +0000 (11:51 +0000)]
Remove the custom flash styling for sidebar flashes
The flash partial is now based on flexbox, so these positioning classes
are no longer required
Andy Allan [Wed, 17 Nov 2021 11:49:52 +0000 (11:49 +0000)]
Remove the floating from the sidebar close buttons
These are mostly positioned with flexbox, and those that aren't
are covered by the similar close-wrap selector elsewhere in this file
Andy Allan [Wed, 24 Nov 2021 10:51:58 +0000 (10:51 +0000)]
Add a user link to the heading of the diary comments page
Fixes #3369
This makes the heading match the layout of the user's Notes page,
which also has a short heading and a subheading with a link.
Additionally, add a page title, again for consistency
dependabot[bot] [Tue, 23 Nov 2021 23:05:29 +0000 (23:05 +0000)]
Bump actions/cache from 2.1.6 to 2.1.7
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 23 Nov 2021 17:19:55 +0000 (17:19 +0000)]
Validate any origin passed the auth failure callback
Fixes #3375
Tom Hughes [Tue, 23 Nov 2021 17:12:19 +0000 (17:12 +0000)]
Improve fallback behaviour for unsafe referer redirects
Tom Hughes [Tue, 23 Nov 2021 17:01:06 +0000 (17:01 +0000)]
Handle authentication failure callbacks with no message
Tom Hughes [Tue, 23 Nov 2021 16:55:06 +0000 (16:55 +0000)]
Handle exceptions rendering flash messages
Tom Hughes [Tue, 23 Nov 2021 11:27:02 +0000 (11:27 +0000)]
Make safe_referer handle invalid URIs
Tom Hughes [Tue, 23 Nov 2021 00:09:19 +0000 (00:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3373'
dependabot[bot] [Mon, 22 Nov 2021 23:00:38 +0000 (23:00 +0000)]
Bump eslint from 8.2.0 to 8.3.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.2.0 to 8.3.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.2.0...v8.3.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 [Mon, 22 Nov 2021 21:36:17 +0000 (21:36 +0000)]
Disable oxipng in image_optim config
Tom Hughes [Mon, 22 Nov 2021 20:52:16 +0000 (20:52 +0000)]
Update bundle
translatewiki.net [Mon, 22 Nov 2021 12:36:51 +0000 (13:36 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 19 Nov 2021 18:10:50 +0000 (18:10 +0000)]
Drop unused browser feature predicates
Tom Hughes [Fri, 19 Nov 2021 18:09:49 +0000 (18:09 +0000)]
Drop es5 polyfill
Tom Hughes [Thu, 18 Nov 2021 17:20:07 +0000 (17:20 +0000)]
Drop use of html5shiv
Fixes #3367
translatewiki.net [Thu, 18 Nov 2021 12:14:19 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 16 Nov 2021 19:08:26 +0000 (19:08 +0000)]
Fix boot warnings for autoloaded constants in initializers
Tom Hughes [Tue, 16 Nov 2021 12:44:52 +0000 (12:44 +0000)]
Send plain errors for non HTML resources
Without this we throw a second error when we can't find a view
of the correct format and issue a 500 response.
Tom Hughes [Tue, 16 Nov 2021 08:30:04 +0000 (08:30 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 16 Nov 2021 08:25:09 +0000 (08:25 +0000)]
Update bundle
Tom Hughes [Tue, 16 Nov 2021 08:21:17 +0000 (08:21 +0000)]
Merge remote-tracking branch 'upstream/pull/3353'
translatewiki.net [Mon, 15 Nov 2021 12:11:44 +0000 (13:11 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 11 Nov 2021 15:33:08 +0000 (15:33 +0000)]
Merge remote-tracking branch 'upstream/pull/3365'
Tom Hughes [Thu, 11 Nov 2021 15:30:37 +0000 (15:30 +0000)]
Merge remote-tracking branch 'upstream/pull/3364'
Andy Allan [Thu, 11 Nov 2021 15:12:18 +0000 (15:12 +0000)]
Convert remaining heading titles to use h1
This makes them consistent with all the other pages that use h1
in the `content_for :heading` sections
Andy Allan [Thu, 11 Nov 2021 14:53:36 +0000 (14:53 +0000)]
Remove the userinformation ids from headings
The style rule was removed in
3f8cf322723750aa4c8d062d4a727f9107ceccb4
and they were otherwise only used in the tests.
translatewiki.net [Thu, 11 Nov 2021 12:10:14 +0000 (13:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 10 Nov 2021 18:26:34 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/3363'
Tom Hughes [Wed, 10 Nov 2021 18:21:01 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/3362'
Tom Hughes [Wed, 10 Nov 2021 18:15:59 +0000 (18:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3361'
Andy Allan [Wed, 10 Nov 2021 15:30:42 +0000 (15:30 +0000)]
Simplify user_image and user_thumbnail css
Now that all uses of the images and thumbnails have been migrated
to flex grids, we can remove the margin and padding from the original
css classes and revert to using them.
Andy Allan [Wed, 10 Nov 2021 15:29:28 +0000 (15:29 +0000)]
fixup popup
Andy Allan [Wed, 10 Nov 2021 15:19:31 +0000 (15:19 +0000)]
Use grid for dashboard map popups
Andy Allan [Wed, 10 Nov 2021 15:06:54 +0000 (15:06 +0000)]
Use flex grid for issue reports and comments
Andy Allan [Wed, 10 Nov 2021 14:54:54 +0000 (14:54 +0000)]
Use flex grid for diary index headings
Andy Allan [Wed, 10 Nov 2021 14:46:52 +0000 (14:46 +0000)]
Rework diary entries to use grid when a heading thumbnail is shown
This happens on the index page, but not individual show pages. I've
reversed the if condition to avoid having an else on a negative
condition.
Andy Allan [Wed, 10 Nov 2021 14:41:27 +0000 (14:41 +0000)]
Use grid for diary entry heading layout
This brings it into line with the user profile, which has a similar heading
Andy Allan [Wed, 10 Nov 2021 14:32:13 +0000 (14:32 +0000)]
Rework diary comments to use flex grid rather than floats and margins
Andy Allan [Wed, 10 Nov 2021 12:23:48 +0000 (12:23 +0000)]
Fix erblint errors from the Rails/ContentTag cop
Tom Hughes [Tue, 9 Nov 2021 18:31:46 +0000 (18:31 +0000)]
Drop rubocop-rails version lock
Tom Hughes [Tue, 9 Nov 2021 18:24:56 +0000 (18:24 +0000)]
Update bundle
Tom Hughes [Tue, 9 Nov 2021 18:23:42 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/3359'
dependabot[bot] [Mon, 8 Nov 2021 23:00:48 +0000 (23:00 +0000)]
Bump eslint from 8.1.0 to 8.2.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.1.0 to 8.2.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.1.0...v8.2.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, 8 Nov 2021 12:13:20 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Nov 2021 12:10:32 +0000 (13:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 27 Oct 2021 18:11:26 +0000 (19:11 +0100)]
Switch to Argon2 for password hashing
Andy Allan [Wed, 3 Nov 2021 17:43:01 +0000 (17:43 +0000)]
Remove custom css overrides for the users list
The margins on the buttons aren't needed since the table has a bottom
margin, and the button class has never been applied since it was
incorrectly in the id field. The table row override had no effect since
the cells have their own vertical-alignment set.
Andy Allan [Wed, 3 Nov 2021 17:38:12 +0000 (17:38 +0000)]
Remove the paragraph margin overrides for the users list
Andy Allan [Wed, 3 Nov 2021 17:37:23 +0000 (17:37 +0000)]
Add button classes for users list action buttons
Andy Allan [Wed, 3 Nov 2021 17:33:01 +0000 (17:33 +0000)]
Remove the contact-activity class
The margin-top is better replaced with a bottom margin on the
preceding element, and the width is unnecessary in the grid layout.
Andy Allan [Wed, 3 Nov 2021 17:27:33 +0000 (17:27 +0000)]
Remove custom margins on sidebar headings
Margin-top in particular is best avoided. The removal of some top
margins required a few corresponding changes to add bottom margins
to other features, mostly done by converting bare text strings to
live within paragraphs.
Tom Hughes [Wed, 3 Nov 2021 00:11:24 +0000 (00:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3357'
Tom Hughes [Wed, 3 Nov 2021 00:11:17 +0000 (00:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3356'
dependabot[bot] [Tue, 2 Nov 2021 23:06:25 +0000 (23:06 +0000)]
Bump actions/checkout from 2.3.5 to 2.4.0
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Tue, 2 Nov 2021 23:00:55 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.74.0 to 0.74.1
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.74.0 to 0.74.1.
- [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.74.0...v0.74.1)
---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Tue, 2 Nov 2021 18:23:02 +0000 (18:23 +0000)]
Update bundle
translatewiki.net [Mon, 1 Nov 2021 12:11:10 +0000 (13:11 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 28 Oct 2021 11:38:33 +0000 (12:38 +0100)]
Merge remote-tracking branch 'upstream/pull/3354'
translatewiki.net [Thu, 28 Oct 2021 11:12:48 +0000 (13:12 +0200)]
Localisation updates from https://translatewiki.net.
mbrzakovic [Thu, 28 Oct 2021 11:02:27 +0000 (11:02 +0000)]
Update to iD v2.20.2
Tom Hughes [Wed, 27 Oct 2021 21:35:37 +0000 (22:35 +0100)]
Merge remote-tracking branch 'upstream/pull/3349'
Tom Hughes [Tue, 26 Oct 2021 17:17:33 +0000 (18:17 +0100)]
Update bundle
Tom Hughes [Mon, 25 Oct 2021 19:25:46 +0000 (20:25 +0100)]
Serve an updated TOTP token with the browse query response
translatewiki.net [Mon, 25 Oct 2021 11:13:44 +0000 (13:13 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Oct 2021 09:38:35 +0000 (10:38 +0100)]
Specify the controller when redirecting a failed login
This ensures that third party logins, whose callback is processed
by the users controller, go to the right place.
Tom Hughes [Sun, 24 Oct 2021 09:37:08 +0000 (10:37 +0100)]
Drop duplicate unconfirmed_login definition
This allows third party logins to use the common definition from
the SessionMethods concern which specifies the controller.
Tom Hughes [Sun, 24 Oct 2021 09:36:30 +0000 (10:36 +0100)]
Test third party logins to pending/suspended/blocked accounts
dependabot[bot] [Fri, 22 Oct 2021 23:00:56 +0000 (23:00 +0000)]
Bump eslint from 8.0.1 to 8.1.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.0.1 to 8.1.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.0.1...v8.1.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 [Thu, 21 Oct 2021 18:09:50 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/3348'
translatewiki.net [Thu, 21 Oct 2021 11:10:08 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 20 Oct 2021 16:48:21 +0000 (17:48 +0100)]
Use em rather than fixed pixels to offset the copyright symbol
Fixes #3302
Also fixes an error where the h5 tag was closed incorrectly.
Andy Allan [Wed, 20 Oct 2021 09:15:24 +0000 (10:15 +0100)]
Merge pull request #3347 from Robbendebiene/patch-3
Make image non-blocking for pointer inputs
Robbendebiene [Wed, 20 Oct 2021 07:52:47 +0000 (09:52 +0200)]
Make image non-blocking for pointer inputs
Currently the arm of the planet on https://www.openstreetmap.org/user/new is blocking pointer inputs on about a third of the email input field. This is solved by adding `pointer-events: none;` to the image.
Tom Hughes [Tue, 19 Oct 2021 17:14:06 +0000 (18:14 +0100)]
Update bundle
Tom Hughes [Mon, 18 Oct 2021 11:35:38 +0000 (12:35 +0100)]
Merge remote-tracking branch 'upstream/pull/3344'
translatewiki.net [Mon, 18 Oct 2021 11:10:55 +0000 (13:10 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 15 Oct 2021 23:04:12 +0000 (23:04 +0000)]
Bump actions/checkout from 2.3.4 to 2.3.5
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 14 Oct 2021 23:12:09 +0000 (00:12 +0100)]
Merge remote-tracking branch 'upstream/pull/3343'
dependabot[bot] [Thu, 14 Oct 2021 23:00:47 +0000 (23:00 +0000)]
Bump eslint from 8.0.0 to 8.0.1
Bumps [eslint](https://github.com/eslint/eslint) from 8.0.0 to 8.0.1.
- [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/v8.0.0...v8.0.1)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 14 Oct 2021 11:11:22 +0000 (13:11 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 13 Oct 2021 18:25:36 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/pull/3341'
Tom Hughes [Wed, 13 Oct 2021 18:22:38 +0000 (19:22 +0100)]
Merge remote-tracking branch 'upstream/pull/3340'
Andy Allan [Wed, 13 Oct 2021 16:36:48 +0000 (17:36 +0100)]
Use flexbox instead of floating to position the comment icon
This ensures both components get appropriate padding. Fixes #3305
Andy Allan [Wed, 29 Sep 2021 17:47:20 +0000 (18:47 +0100)]
Specify avatar dimensions in html tags
This prevents reflow when the images are loaded by the browser.
ActiveStorage variants are resized lazily when the image is requested,
so we only know the dimensions if the image was already loaded. This
means that there will be one reflow just after a new avatar is first
viewed.
Tom Hughes [Tue, 12 Oct 2021 17:16:22 +0000 (18:16 +0100)]
Update bundle
Tom Hughes [Tue, 12 Oct 2021 17:13:49 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/3339'