Commit graph

2561 commits

Author SHA1 Message Date
Andy Allan
aebacc88de
Merge pull request #5514 from AntonKhorev/pd-declaration
Remove public domain checkbox from signup and terms pages
2025-02-15 14:03:55 +00:00
Tom Hughes
5ca24de0d0 Merge remote-tracking branch 'upstream/pull/5452' 2025-02-15 11:15:25 +00:00
Tom Hughes
b7ee8034dc Merge remote-tracking branch 'upstream/pull/5673' 2025-02-15 08:51:36 +00:00
Anton Khorev
037bafcd1c Check user instead of scope when getting note author info
Previously it was possible to create a note while authorized but having no write_notes scope. Currently it's not possible.
2025-02-15 03:45:53 +03:00
Anton Khorev
03867e2fee Remove current_user branch from ApiController#deny_access
Unreachable because if there's no doorkeeper_token, there's also no current_user.
2025-02-15 01:20:06 +03:00
Anton Khorev
f6572e3712 Output active blocks list 2025-02-14 14:16:48 +03:00
Anton Khorev
9ec7e8c888 Skip blocks check when getting active blocks list 2025-02-14 14:16:48 +03:00
Anton Khorev
6d558003aa Add active blocks list api endpoint with empty response 2025-02-14 14:16:48 +03:00
Anton Khorev
2d46b44872 Add write_changeset_comments scope 2025-02-14 00:17:45 +03:00
Anton Khorev
77a2657d33 Pass scopes instead of token to ApiAbility 2025-02-14 00:15:52 +03:00
Anton Khorev
304e0ef638 Pass user to ApiAbility 2025-02-14 00:15:52 +03:00
Tom Hughes
22f590c9ef Merge remote-tracking branch 'upstream/pull/5622' 2025-02-12 17:59:25 +00:00
Nenad Vujicic
4133936c63 Updates notes filtering to search description too
Updates notes filtering to search for query text in both note comments and note's description.
2025-02-12 18:22:50 +01:00
Nenad Vujicic
fadbee0af0 Adds storing note's properties to notes
Adds storing note's description, author_id and author_ip to notes table too when creating new note.
2025-02-12 10:54:31 +01:00
Tom Hughes
43f40c5d03 Stop using session flash to communicate with callbacks 2025-02-12 00:09:40 +00:00
Tom Hughes
2cfc030bba Merge remote-tracking branch 'upstream/pull/5403' 2025-02-10 18:54:14 +00:00
Anton Khorev
f2ed3c1935 Make api old element show paths resourceful 2025-02-10 02:07:48 +03:00
Anton Khorev
29323be33b Merge branch 'pull/5636' 2025-02-10 01:26:12 +03:00
Anton Khorev
98af87d1cb Convert api element history actions to versions resources 2025-02-09 19:18:47 +03:00
Tom Hughes
ba481319f4 Use subqueries to find nested members more efficiently 2025-02-09 15:40:49 +00:00
Anton Khorev
18b8e0cb34 Clean up after creating nested relation resources 2025-02-08 18:22:55 +03:00
Anton Khorev
f696b5439e Declare api relation relations as nested resources 2025-02-08 18:22:55 +03:00
Anton Khorev
2a38dca0b7 Declare api way relations as nested resources 2025-02-08 18:22:55 +03:00
Anton Khorev
a6e614e44e Declare api node relations as nested resources 2025-02-08 18:22:55 +03:00
Anton Khorev
6a50a5e871 Declare api node ways as nested resources 2025-02-08 18:22:55 +03:00
Tom Hughes
cb51f46a4f Correct test for notes opened by inactive users 2025-02-06 17:08:44 +00:00
Nenad Vujicic
592b28fd23 Removes dropping note's first comment
Removes dropping note's first visible comment in case of deleted note's author. After adding displaying "deleted" as note's description, first visible comment is now displayed as note's comment. Moves logic of calculating which note comments will be displayed and if note contains anonymous author / comments to the controller.
2025-02-06 11:43:53 +01:00
Anton Khorev
04c6d38649 Map 'full' to api relation show action 2025-02-05 21:07:19 +03:00
Anton Khorev
0f2aa939d4 Map 'full' to api way show action 2025-02-05 21:07:19 +03:00
Anton Khorev
18f65b78eb Make api show/update/destroy relation actions resourceful 2025-02-05 20:22:16 +03:00
Anton Khorev
35fc840b41 Make api show/update/destroy way actions resourceful 2025-02-05 20:22:16 +03:00
Anton Khorev
3b0be171b9 Make api show/update/destroy node actions resourceful 2025-02-05 20:22:16 +03:00
Tom Hughes
f8ad4c79a4 Merge remote-tracking branch 'upstream/pull/5586' 2025-02-02 10:30:04 +00:00
Tom Hughes
22761a9d1f Merge remote-tracking branch 'upstream/pull/5585' 2025-02-02 10:16:43 +00:00
Anton Khorev
83167c368e Use flat_map to collect way node ids in maps controller 2025-02-01 20:36:07 +03:00
Anton Khorev
b9f1e31122 Use filter instead of loop in visible node/way collections 2025-02-01 20:19:00 +03:00
Anton Khorev
560146d88c Remove ids collected in parallel to model instances in map api 2025-02-01 20:09:38 +03:00
Anton Khorev
8508c4f0a7 Remove unused visible_nodes hashes from api element controllers 2025-02-01 19:35:46 +03:00
Anton Khorev
547fbf6415 Select user ids from reports using pluck 2025-01-29 19:00:55 +03:00
Anton Khorev
0cd18eb02f Merge branch 'pull/4990' 2025-01-29 18:22:21 +03:00
nertc
1a23bfa1ec Show reporting user on issues screen 2025-01-29 12:39:46 +04:00
Tom Hughes
6ef11b2c9a Merge remote-tracking branch 'upstream/pull/5536' 2025-01-26 10:09:17 +00:00
Tom Hughes
49e257200e Merge remote-tracking branch 'upstream/pull/5545' 2025-01-24 15:10:03 +00:00
Tom Hughes
605d7a5f69 Merge remote-tracking branch 'upstream/pull/5544' 2025-01-24 15:06:37 +00:00
Tom Hughes
959bc5562a Merge remote-tracking branch 'upstream/pull/5543' 2025-01-24 15:00:25 +00:00
Anton Khorev
01b5ed5d28 Create api map resource 2025-01-24 10:47:58 +03:00
Anton Khorev
47d55a2b0f Simplify write_notes scope check in api notes controller 2025-01-24 06:16:11 +03:00
Anton Khorev
47a8907e2a Move scope_enabled? to ApiController 2025-01-24 05:56:23 +03:00
Anton Khorev
74854f831b Remove doorkeeper_token branch from web deny_access 2025-01-24 05:28:46 +03:00
Anton Khorev
fafed5f821 Create message mute resource 2025-01-24 04:36:04 +03:00