cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11394 commits 4 branches 1 tag 499 MiB
Commit graph

11394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
ad0cfee788 Fix boot warnings for autoloaded constants in initializers 2021-11-16 19:08:26 +00:00
Tom Hughes
02fb858956 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.
 2021-11-16 12:44:52 +00:00
Tom Hughes
e3966479a6 Fix new rubocop warnings 2021-11-16 08:48:35 +00:00
Tom Hughes
7b1e78e247 Update bundle 2021-11-16 08:48:35 +00:00
Tom Hughes
e342314d8b Merge remote-tracking branch 'upstream/pull/3353' 2021-11-16 08:21:17 +00:00
translatewiki.net
0c306b5524 Localisation updates from https://translatewiki.net. 2021-11-15 13:11:44 +01:00
Tom Hughes
e21b9b2bf1 Merge remote-tracking branch 'upstream/pull/3365' 2021-11-11 15:33:08 +00:00
Tom Hughes
33f38fa372 Merge remote-tracking branch 'upstream/pull/3364' 2021-11-11 15:30:37 +00:00
Andy Allan
75749cc540 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
 2021-11-11 15:12:23 +00:00
Andy Allan
3719e8defb Remove the userinformation ids from headings 
The style rule was removed in 3f8cf32272
and they were otherwise only used in the tests.
 2021-11-11 14:53:36 +00:00
translatewiki.net
c615bebc29 Localisation updates from https://translatewiki.net. 2021-11-11 13:10:14 +01:00
Tom Hughes
425818913b Merge remote-tracking branch 'upstream/pull/3363' 2021-11-10 18:26:34 +00:00
Tom Hughes
8da015ac88 Merge remote-tracking branch 'upstream/pull/3362' 2021-11-10 18:21:01 +00:00
Tom Hughes
71f01eab43 Merge remote-tracking branch 'upstream/pull/3361' 2021-11-10 18:15:59 +00:00
Andy Allan
9c9bf153cd 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.
 2021-11-10 15:30:42 +00:00
Andy Allan
a9ca2fe7e7 fixup popup 2021-11-10 15:29:28 +00:00
Andy Allan
dc67e54958 Use grid for dashboard map popups 2021-11-10 15:19:31 +00:00
Andy Allan
aa77ff5aec Use flex grid for issue reports and comments 2021-11-10 15:06:54 +00:00
Andy Allan
2c9d2486ec Use flex grid for diary index headings 2021-11-10 14:54:54 +00:00
Andy Allan
afce5886f4 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.
 2021-11-10 14:46:52 +00:00
Andy Allan
ee9c8ff7c8 Use grid for diary entry heading layout 
This brings it into line with the user profile, which has a similar heading
 2021-11-10 14:41:27 +00:00
Andy Allan
6283d0a47a Rework diary comments to use flex grid rather than floats and margins 2021-11-10 14:32:13 +00:00
Andy Allan
6181919b61 Fix erblint errors from the Rails/ContentTag cop 2021-11-10 12:23:48 +00:00
Tom Hughes
ceebd74bd7 Drop rubocop-rails version lock 2021-11-09 18:31:46 +00:00
Tom Hughes
e2f0aaa1be Update bundle 2021-11-09 18:24:56 +00:00
Tom Hughes
f0f07a76b4 Merge remote-tracking branch 'upstream/pull/3359' 2021-11-09 18:23:42 +00:00
dependabot[bot]
f4c9984aeb
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>
 2021-11-08 23:00:48 +00:00
translatewiki.net
4919fe08ed Localisation updates from https://translatewiki.net. 2021-11-08 13:13:20 +01:00
translatewiki.net
f7499fbe7f Localisation updates from https://translatewiki.net. 2021-11-04 13:10:32 +01:00
Tom Hughes
aad81eb74c Switch to Argon2 for password hashing 2021-11-03 20:39:31 +00:00
Andy Allan
abe8551506 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.
 2021-11-03 18:35:42 +00:00
Andy Allan
ea0f128e9e Remove the paragraph margin overrides for the users list 2021-11-03 18:35:42 +00:00
Andy Allan
6bce75b134 Add button classes for users list action buttons 2021-11-03 18:35:42 +00:00
Andy Allan
826a864e6c 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.
 2021-11-03 18:35:42 +00:00
Andy Allan
2b84452222 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.
 2021-11-03 18:16:38 +00:00
Tom Hughes
c2d6a3090c Merge remote-tracking branch 'upstream/pull/3357' 2021-11-03 00:11:24 +00:00
Tom Hughes
b1884b8449 Merge remote-tracking branch 'upstream/pull/3356' 2021-11-03 00:11:17 +00:00
dependabot[bot]
e4c40cbd36
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>
 2021-11-02 23:06:25 +00:00
dependabot[bot]
3db51bd778
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>
 2021-11-02 23:00:55 +00:00
Tom Hughes
a3162e2b12 Update bundle 2021-11-02 18:23:02 +00:00
translatewiki.net
74c3b206f8 Localisation updates from https://translatewiki.net. 2021-11-01 13:11:10 +01:00
Tom Hughes
3350bd9422 Merge remote-tracking branch 'upstream/pull/3354' 2021-10-28 12:38:33 +01:00
translatewiki.net
0d470250d7 Localisation updates from https://translatewiki.net. 2021-10-28 13:12:48 +02:00
mbrzakovic
1068def90d Update to iD v2.20.2 2021-10-28 11:02:27 +00:00
Tom Hughes
977eed6269 Merge remote-tracking branch 'upstream/pull/3349' 2021-10-27 22:35:37 +01:00
Tom Hughes
be5b725511 Update bundle 2021-10-26 18:17:33 +01:00
Tom Hughes
d66d67805d Serve an updated TOTP token with the browse query response 2021-10-25 20:28:53 +01:00
translatewiki.net
c773162e36 Localisation updates from https://translatewiki.net. 2021-10-25 13:13:44 +02:00
Tom Hughes
99546ae0a1 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.
 2021-10-24 10:38:35 +01:00
Tom Hughes
0b43f6b5a0 Drop duplicate unconfirmed_login definition 
This allows third party logins to use the common definition from
the SessionMethods concern which specifies the controller.
 2021-10-24 10:37:08 +01:00