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

15372 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton Khorev
3eccf65d8c Merge branch 'pull/5261' 2025-01-17 04:01:22 +03:00
Tom Hughes
bde5fb48db Merge remote-tracking branch 'upstream/pull/5500' 2025-01-16 19:03:43 +00:00
Tom Hughes
0ab8d954ad Merge remote-tracking branch 'upstream/pull/5499' 2025-01-16 18:38:36 +00:00
Tom Hughes
283e7b975b Merge remote-tracking branch 'upstream/pull/5494' 2025-01-16 18:35:36 +00:00
Tom Hughes
dfc843e7af Merge remote-tracking branch 'upstream/pull/5506' 2025-01-16 18:18:06 +00:00
Tom Hughes
702a861ea0 Merge remote-tracking branch 'upstream/pull/5502' 2025-01-16 18:03:08 +00:00
Anton Khorev
87e7f887f5 Remove account terms code unreachable for unregistered users 2025-01-16 19:05:53 +03:00
translatewiki.net
b45eb03a6c
Localisation updates from https://translatewiki.net. 2025-01-16 13:13:45 +01:00
Anton Khorev
ddba8fbcb8 Merge branch 'pull/5503' 2025-01-16 03:54:43 +03:00
dependabot[bot]
eb8416b73e
Bump osm-community-index from 5.9.0 to 5.9.1 
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.9.0 to 5.9.1.
- [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.9.0...v5.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-15 23:45:56 +00:00
Nenad Vujicic
aba6b5592d Removed unused translations in preferences.show 
After merging 967e6d4 preferences.show.{preferred_editor, preferred_languages} are not used anymore.
 2025-01-15 17:45:22 +01:00
Andy Allan
f32aea6d14
Merge pull request #5433 from AntonKhorev/user-routes-api-namespace 
Resourceful routes for users api
 2025-01-15 12:55:41 +00:00
Andy Allan
b8a1a904c6
Merge pull request #5449 from AntonKhorev/edit-preferences 
Make preferences page editable without clicking 'Edit Preferences'
 2025-01-15 12:49:34 +00:00
Andy Allan
699b6803a6
Merge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/qs-6.14.0 
Bump qs from 6.13.1 to 6.14.0
 2025-01-15 11:45:08 +00:00
Nenad Vujicic
11e0444f36 Added unit tests for new Note methods 
Added unit tests for new Note methods and updated system tests to use description instead of first comment's body.
 2025-01-15 12:12:56 +01:00
Nenad Vujicic
2c19c2143e Changed note's first comment body to description 
Replaced using note's first comment body with note's description.
 2025-01-15 12:03:08 +01:00
dependabot[bot]
22d64544a1
Bump qs from 6.13.1 to 6.14.0 
Bumps [qs](https://github.com/ljharb/qs) from 6.13.1 to 6.14.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.13.1...v6.14.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-14 23:14:53 +00:00
Anton Khorev
9d7e59784f Install add/remove event listeners directly on note layer 2025-01-15 02:02:47 +03:00
Tom Hughes
914fff9d4d Merge remote-tracking branch 'upstream/pull/5495' 2025-01-14 19:05:09 +00:00
Tom Hughes
9e67c267a7 Merge remote-tracking branch 'upstream/pull/5498' 2025-01-14 18:45:19 +00:00
Tom Hughes
473aff084d Fix new rubocop warnings 2025-01-14 18:31:52 +00:00
Tom Hughes
59f15a9bc0 Update bundle 2025-01-14 18:08:36 +00:00
Nenad Vujicic
f3fc4cdb49 Added description and author_id methods to Note 
Added description and author_id (author_ip already exists) methods to Note model. They still use first comment (but will be soon replaced to use records from Note model).
 2025-01-14 14:27:02 +01:00
Anton Khorev
f99bf8a139 Remove references to OAuth 1 client_application model 2025-01-14 14:55:25 +03:00
nertc
be11f2075e Refactor friendships controller and model 2025-01-14 11:33:56 +04:00
nertc
2b7a48029b Modify the way Friends are added 2025-01-14 11:32:54 +04:00
Anton Khorev
e9fd07a799 Test that encouragement disappears after verified email signup 2025-01-13 15:03:58 +03:00
Anton Khorev
03c7b18fa8 Test that anonymous note encouragement disappears after signup 2025-01-13 15:03:58 +03:00
Anton Khorev
fe214adbc6 Test that anonymous note encouragement disappears after login 2025-01-13 15:03:58 +03:00
Anton Khorev
f745cae93b Test that encouragement appears after 10 anonymous notes 2025-01-13 15:03:58 +03:00
Anton Khorev
1732325768 Merge branch 'anonymous-notes-counter' 2025-01-13 14:50:26 +03:00
Etilène Jourdier
0f2df0b9ef display an encouragement to contribute after many anonymous notes 
create a counter of anonymous notes in a cookie, read by new note controller to display an encouragement to contribute in the already existing anonymous warning if the anonymous visitor has already created at least 10 anonymous notes. Cookie deleted on log-in and sign-up after email validation
 2025-01-13 14:36:21 +03:00
Nenad Vujicic
16bdcac6d7 Added description, user_id, user_ip columns to notes 
Added migration for adding new columns (description, user_id, user_ip) to notes table. Also, migration adds foreign key connecting notes and users tables (using user_id column).
 2025-01-13 10:52:38 +01:00
Tom Hughes
5d76ec051e Merge remote-tracking branch 'upstream/pull/5492' 2025-01-12 16:02:07 +00:00
Tom Hughes
5d79f1233b Merge remote-tracking branch 'upstream/pull/5491' 2025-01-12 16:00:09 +00:00
Anton Khorev
4c73b2651c Rename gpx description template to details 
"Description" is just one of trace properties, details include description and other things.
 2025-01-11 16:03:59 +03:00
Anton Khorev
be8d76926c Move number of points to file details in gpx emails 2025-01-11 16:03:59 +03:00
dependabot[bot]
0535615fd5
Bump eslint from 9.17.0 to 9.18.0 
Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.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/v9.17.0...v9.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>
 2025-01-10 23:43:33 +00:00
Tom Hughes
a6c6f26acb Merge remote-tracking branch 'upstream/pull/5487' 2025-01-09 18:08:31 +00:00
Anton Khorev
45abfe49e1 Merge branch 'pull/5484' 2025-01-09 17:20:25 +03:00
Andy Allan
55e3f90dd4 Show diary entry after creation 
This allows users to review their post and use the social share
buttons more easily.

Refs #1391
 2025-01-09 13:38:54 +00:00
Anton Khorev
6c0366d2a2 Move trace descriptions out of success/failure sentences in emails 2025-01-09 14:16:32 +03:00
Tom Hughes
d877cd1ebc Merge remote-tracking branch 'upstream/pull/5486' 2025-01-08 20:19:16 +00:00
Andy Allan
fa51bcbcb2
Merge pull request #5462 from AntonKhorev/user-terms-resource 
Use resourceful routes for terms view/accept/decline
 2025-01-08 19:31:17 +00:00
Anton Khorev
606b5c1b6a Use resourceful routes for terms view/accept/decline 2025-01-08 22:19:35 +03:00
Andy Allan
2d77633d40 Update documentation to avoid erb_lint deprecations 
I didn't spot this in #5357
 2025-01-08 19:15:22 +00:00
Anton Khorev
44843c1dd7 Remove slashes from body css classes 2025-01-08 22:11:28 +03:00
Tom Hughes
2c1428c9ad Merge remote-tracking branch 'upstream/pull/5483' 2025-01-08 18:57:37 +00:00
Andy Allan
14b33b9433 Restrict version of dry-schema for ruby 3.1.2 compatibility 
https://bugs.ruby-lang.org/issues/18673 affects some methods using
anonymous blocks, and was fixed in ruby 3.1.3. However, debian/bookworm
ruby 3.1 package is based on 3.1.2 and does not yet contain this fix.

Since bookworm is used in our Docker build, and also used in production
by OSMF, then we can restrict dry-schema to a version that does not
use anonymous blocks.

Fixes #5482
 2025-01-08 18:50:05 +00:00
Tom Hughes
dcbfe85bcd Merge remote-tracking branch 'upstream/pull/5480' 2025-01-08 18:29:14 +00:00