Anton Khorev
2626c763b5
Add regexp constraints to trace ids
2025-01-18 22:37:37 +03:00
Anton Khorev
2074e9dce2
Merge branch 'pull/5512'
2025-01-18 18:23:51 +03:00
Tom Hughes
09aa3ccc78
Merge remote-tracking branch 'upstream/pull/5507'
2025-01-18 12:06:58 +00:00
Marwin Hochfelsner
e066ed3e77
Use the dark version of TransportMap in dark mode
2025-01-18 11:56:11 +00:00
Marwin Hochfelsner
4241d49c63
Disable dark mode filtering by default
2025-01-18 11:50:55 +00:00
Marwin Hochfelsner
01d8dba8ce
Allow map layers to specify an alternate tile set for dark mode
2025-01-18 11:50:54 +00:00
Tom Hughes
8312ddfe0c
Merge remote-tracking branch 'upstream/pull/5513'
2025-01-18 11:45:38 +00:00
Tom Hughes
8809e1fd08
Merge remote-tracking branch 'upstream/pull/5510'
2025-01-18 11:41:08 +00:00
Anton Khorev
9c744ab65d
Remove "Public editing" line from settings page
2025-01-18 03:32:57 +03:00
Tom Hughes
42d622b735
Rename friends as followings
2025-01-17 23:01:56 +00:00
Tom Hughes
5eb4c7c0d1
Rename friends rate limit as follows
2025-01-17 23:01:55 +00:00
Tom Hughes
b5006acd81
Drop rubocop exclusions that weren't doing anything
2025-01-17 22:58:37 +00:00
Tom Hughes
3fcdeba29e
Rename friendship_notification to follow_notification
2025-01-17 22:58:36 +00:00
Tom Hughes
256637f6cb
Remove trailing whitespace from translation
2025-01-17 22:58:36 +00:00
Tom Hughes
bc630bca87
Rename friends_with to follows
2025-01-17 22:58:35 +00:00
Andy Allan
4370fe45ad
Merge pull request #5437 from AntonKhorev/user-status-resource
...
Use resourceful route for user status
2025-01-17 17:55:02 +00:00
Andy Allan
d6238e87a1
Merge pull request #5508 from AntonKhorev/fix-dashboard-follow
...
Fix missing translation of Follow links on dashboard
2025-01-17 17:53:51 +00:00
Andy Allan
8f25c0987a
Merge pull request #5509 from AntonKhorev/restore-follows-form
...
Use form with normal-sized button on follows show pages
2025-01-17 17:53:00 +00:00
Nenad Vujicic
297e8374f4
Adds validating of notes foreign key
...
Adds migration for validation foreign key in notes table referencing users table.
2025-01-17 11:15:22 +01:00
Anton Khorev
84a9d7117d
Use form with normal-sized button on follows show pages
2025-01-17 05:28:59 +03:00
Anton Khorev
835756e979
Fix missing translation of Follow links on dashboard
2025-01-17 05:09:05 +03:00
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
Anton Khorev
8db2ff289f
Use resourceful route for user status
2025-01-16 02:17:06 +03:00
Nenad Vujicic
aba6b5592d
Removed unused translations in preferences.show
...
After merging 967e6d4
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
