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

13391 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
64786faddf Merge remote-tracking branch 'upstream/pull/4221' 2023-09-03 18:52:54 +01:00
Anton Khorev
2b10195441 Remove unused partial _user.atom.builder 2023-09-03 14:47:35 +03:00
Anton Khorev
11df872c3e Add bbox parameter to notes search api 2023-09-03 11:26:05 +03:00
Anton Khorev
0ef4a299bb Check required bbox parameter presence outside of BoundingBox class 2023-09-03 09:47:27 +03:00
Tom Hughes
0b1cf53fb9 Drop non-functional check for nil email 2023-09-02 11:51:43 +01:00
Tom Hughes
431ff96b66 Merge remote-tracking branch 'upstream/pull/4216' 2023-09-02 11:48:56 +01:00
Tom Hughes
9693a09664 Merge remote-tracking branch 'upstream/pull/4214' 2023-09-02 11:47:39 +01:00
Tom Hughes
704781ad0b Add some additional preloads to notes#feed 2023-09-02 11:44:59 +01:00
Anton Khorev
f5c20527aa Move email-related methods to mixin 2023-09-02 13:43:41 +03:00
Anton Khorev
d2bdf1f0ae Add notes feed description for unspecified area 2023-09-01 17:05:07 +03:00
Anton Khorev
09225bc02d Use i18n at_least_pattern in issues count helper 2023-09-01 08:19:22 +03:00
Anton Khorev
963b8f43f1 Change issue count logic from (n-1)+ to n+ 2023-09-01 08:05:01 +03:00
Anton Khorev
fff98f2afb Move max value of issues counter to settings 2023-09-01 07:14:45 +03:00
translatewiki.net
abecde92f5 Localisation updates from https://translatewiki.net. 2023-08-31 13:19:07 +02:00
Tom Hughes
5317d9481c Merge remote-tracking branch 'upstream/pull/4212' 2023-08-31 11:12:03 +01:00
Andy Allan
cdfd617eba
Merge pull request #4211 from tomhughes/changeset-comment-cleanup 
Address review comments for changeset comment limiting
 2023-08-31 10:02:18 +01:00
Tom Hughes
8e3af42fe1 Bump facebook API version 2023-08-30 20:31:24 +01:00
Tom Hughes
75bde83a13 Improve testing of changeset comment rate limits 2023-08-30 19:11:08 +01:00
Tom Hughes
f32b4bc044 Move changeset comment rate limit check to a predicate method 2023-08-30 18:36:33 +01:00
Tom Hughes
e210b4efbf Improve naming of changeset comment rate limit settings 2023-08-30 18:25:06 +01:00
Andy Allan
1253bdcdc5 Use bootstrap badges to implement count-number badges 
This leaves bootstrap to take care of most aspects, while retaining
the current colours and font weights.
 2023-08-30 18:11:56 +01:00
Tom Hughes
a99450f558 Merge remote-tracking branch 'upstream/pull/4210' 2023-08-30 18:10:20 +01:00
Tom Hughes
0c2f5a8ad1 Merge remote-tracking branch 'upstream/pull/4209' 2023-08-30 18:09:41 +01:00
Andy Allan
4af54ce93b Use Activerecord '#or' method for queries 
That let's us use relation names (like `sender`) and avoid dealing
directly with ids.
 2023-08-30 17:17:15 +01:00
Andy Allan
b595b87c48 Use trace instead of gpx_id in queries 
This makes the queries easier to read.
 2023-08-30 17:08:46 +01:00
Andy Allan
f5db9cbb20 Avoid using _id in queries 
This makes the queries shorter and easier to read.
 2023-08-30 17:08:16 +01:00
Andy Allan
124909a64c
Merge pull request #4193 from AntonKhorev/lookup-friend 
Lookup friend user before make/remove friend action
 2023-08-30 15:17:11 +01:00
Andy Allan
e68d4efc3c
Merge pull request #4197 from AntonKhorev/user-resources 
Move user lookup/error methods from app controller to concerns
 2023-08-30 15:11:57 +01:00
Andy Allan
a1657f03a8
Merge pull request #4202 from tomhughes/changeset-comment-limit 
Add rate limiting for changeset comments
 2023-08-30 11:12:40 +01:00
Tom Hughes
4b206ff769 Update bundle 2023-08-29 18:08:56 +01:00
Tom Hughes
c1a5c0c4e3 Merge remote-tracking branch 'upstream/pull/4208' 2023-08-29 18:08:06 +01:00
dependabot[bot]
14f86dd576
Bump osm-community-index from 5.5.5 to 5.6.0 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.5 to 5.6.0.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.5...v5.6.0)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 23:28:12 +00:00
translatewiki.net
2588c14d26 Localisation updates from https://translatewiki.net. 2023-08-28 13:26:20 +02:00
Tom Hughes
3422bb541d Merge remote-tracking branch 'upstream/pull/4198' 2023-08-27 09:46:10 +01:00