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

13125 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
7ac0e897ff Merge remote-tracking branch 'upstream/pull/4245' 2023-09-10 17:24:16 +01:00
Tom Hughes
d14e97e1be Merge remote-tracking branch 'upstream/pull/4243' 2023-09-10 17:23:24 +01:00
Tom Hughes
43cc2bd6e0 Merge remote-tracking branch 'upstream/pull/4242' 2023-09-10 17:22:21 +01:00
Tom Hughes
7cf0936295 Update to rails 7.0.8 2023-09-10 17:11:17 +01:00
Anton Khorev
4b92988555 Add comment ids to changeset discussion api responses 2023-09-10 17:30:06 +03:00
Anton Khorev
9c9edb6054 Remove authorize_web call from traces api controller 2023-09-09 19:40:28 +03:00
Anton Khorev
9442829d31 Add json output for show user block api 2023-09-09 16:50:36 +03:00
Anton Khorev
71654e563e Add show user block api endpoint 2023-09-09 15:53:22 +03:00
Anton Khorev
e143726f1a Combine comments and traces pagination partials 2023-09-09 14:33:59 +03:00
Anton Khorev
a780a7456f Don't interpolate in pagination partial 2023-09-09 14:33:58 +03:00
Anton Khorev
ea86f8f682 Make pagination partial view 2023-09-09 14:23:12 +03:00
Anton Khorev
c213abb8e3 Refactor diary paging queries 2023-09-09 14:23:11 +03:00
Anton Khorev
299c59e34f Change diary comments pagination to before/after id 2023-09-09 14:23:10 +03:00
dependabot[bot]
63b258141b
Bump eslint from 8.48.0 to 8.49.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.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.48.0...v8.49.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-08 23:16:24 +00:00
Tom Hughes
0e21afc565 Merge remote-tracking branch 'upstream/pull/4241' 2023-09-08 18:09:00 +01:00
Tom Hughes
614a4c1284 Merge remote-tracking branch 'upstream/pull/4236' 2023-09-08 17:55:54 +01:00
Tom Hughes
65cb7d7b2d Merge remote-tracking branch 'upstream/pull/4237' 2023-09-08 17:53:42 +01:00
Anton Khorev
9682fe6431 Add user id to api trace output 2023-09-08 17:13:57 +03:00
dependabot[bot]
9a055251a5
Bump coverallsapp/github-action from 2.2.2 to 2.2.3 
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.2...v2.2.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>
 2023-09-07 23:46:21 +00:00
Anton Khorev
5244b2cd0b Fix alignment in profile and diary location forms 2023-09-07 17:20:43 +03:00
translatewiki.net
aceae23c8e Localisation updates from https://translatewiki.net. 2023-09-07 13:26:57 +02:00
Tom Hughes
d1d3c2597e Handle timeouts inside a view for API calls 2023-09-07 00:32:11 +01:00
Tom Hughes
f138055849 Merge remote-tracking branch 'upstream/pull/4225' 2023-09-06 18:42:29 +01:00
Tom Hughes
1220a9930e Merge remote-tracking branch 'upstream/pull/4234' 2023-09-06 18:36:28 +01:00
Tom Hughes
1db26ff5f9 Merge remote-tracking branch 'upstream/pull/4233' 2023-09-06 18:36:25 +01:00
Andy Allan
fdb687517e Match the top spacing of the leaflet buttons to the gap between groups 
This removes a usage of sass division operator
 2023-09-06 18:10:02 +01:00
Andy Allan
6eac50525b Use h2 as the main header on the map-ui panel 2023-09-06 18:10:02 +01:00
Andy Allan
c162a9660e Use standard padding size for map-ui sidebar 
The previous padding didn't match the main sidebar, and also used
sass division as part of the calculation.
 2023-09-06 18:10:02 +01:00
Andy Allan
6fc0f764d5 Round the clickable map previews on the layer switcher 
Most interactive elements on the site are rounded, so we can do the
same for these map previews.
 2023-09-06 18:10:02 +01:00
Andy Allan
01eed9b96c Make the sharing controls read-only 
They aren't used for inputting any information, only for copying.
 2023-09-06 18:10:02 +01:00
Andy Allan
dc24f6c219 Use bootstrap form controls for the link and html controls 2023-09-06 18:10:02 +01:00
Andy Allan
0ea6646fb6 Use bootstrap for share forms 
This fixes alignment of the checkboxes, and uses bootstrap form
controls for the image format and scale inputs.

Move the custom dimensions input to beside the custom dimensions
display.
 2023-09-06 18:10:02 +01:00
Anton Khorev
cabee40032 Mute hidden comment text in each table cell 2023-09-06 18:10:02 +01:00
Andy Allan
b7ad61560c Fix lack of margin on changeset browsing messages 
The display area here uses negative margins to make the flush list
work, so we need to add them back in for normal text.
 2023-09-06 16:51:25 +01:00
Tom Hughes
368465287d Merge remote-tracking branch 'upstream/pull/4232' 2023-09-06 10:43:43 +01:00
Andy Allan
cb4f99fef2 Use implicit style for associations with factory overrides 
This matches our usage of implicit style for associations generally,
e.g. `user`.
 2023-09-06 10:20:23 +01:00
Tom Hughes
8aba3c4ec4 Merge remote-tracking branch 'upstream/pull/4230' 2023-09-05 17:30:03 +01:00
Tom Hughes
dc6e30bab6 Merge remote-tracking branch 'upstream/pull/4231' 2023-09-05 17:22:04 +01:00
Tom Hughes
dc54ce7d0a Update argon2 tests for change in library default costs 2023-09-05 17:16:53 +01:00
Tom Hughes
7db41b4688 Update bundle 2023-09-05 16:54:41 +01:00
Anton Khorev
caf49bb25d Show user id on profile pages to moderators and admins 2023-09-05 13:35:08 +03:00
Anton Khorev
728ad161c4 Mute hidden comment text in each table cell 2023-09-05 11:50:58 +03:00
Tom Hughes
f5095fe3bd Merge remote-tracking branch 'upstream/pull/4229' 2023-09-05 08:26:06 +01:00
Tom Hughes
acddb37722 Merge remote-tracking branch 'upstream/pull/4228' 2023-09-05 08:26:02 +01:00
dependabot[bot]
749ba82e89
Bump coverallsapp/github-action from 2.2.1 to 2.2.2 
Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.1...v2.2.2)

---
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>
 2023-09-04 23:17:23 +00:00
dependabot[bot]
07c95fc425
Bump actions/checkout from 3 to 4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [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/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 23:17:21 +00:00
Anton Khorev
7e6de66444 Swap older/newer diary entries buttons 2023-09-04 16:32:54 +03:00
translatewiki.net
050fc582e9 Localisation updates from https://translatewiki.net. 2023-09-04 13:19:10 +02:00
Tom Hughes
b207cf78a3 Merge remote-tracking branch 'upstream/pull/4223' 2023-09-03 18:55:39 +01:00
Tom Hughes
be3baea4de Merge remote-tracking branch 'upstream/pull/4222' 2023-09-03 18:54:18 +01:00