Commit graph

8085 commits

Author SHA1 Message Date
Anton Khorev
98af87d1cb Convert api element history actions to versions resources 2025-02-09 19:18:47 +03:00
Tom Hughes
974e404a6e Merge remote-tracking branch 'upstream/pull/5633' 2025-02-09 15:09:45 +00:00
Tom Hughes
699e73a22a Merge remote-tracking branch 'upstream/pull/5626' 2025-02-09 15:02:14 +00:00
Tom Hughes
97bd4579b0 Merge remote-tracking branch 'upstream/pull/5634' 2025-02-09 14:51:56 +00:00
Marwin Hochfelsner
cdacfafd11 Further usage of URLSearchParams 2025-02-09 08:17:13 +01:00
Marwin Hochfelsner
8130b38368 Remove IE<10 workaround 2025-02-09 06:51:56 +01:00
Marwin Hochfelsner
98e4dfb87e Lessen code repetition 2025-02-09 06:51:56 +01:00
Marwin Hochfelsner
a3c45f6ed6 Reduce condition complexity 2025-02-09 06:51:56 +01: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
Marwin Hochfelsner
957ae192b6 Refactor direction engines and unify structure 2025-02-07 04:22:30 +01:00
Tom Hughes
e206dd527e Merge remote-tracking branch 'upstream/pull/5598' 2025-02-06 20:27:32 +00:00
Anton Khorev
a9dcb66e7b Merge branch 'pull/5627' 2025-02-06 22:10:31 +03:00
Tom Hughes
08359d8d5f Merge remote-tracking branch 'upstream/pull/5613' 2025-02-06 17:41:46 +00:00
Tom Hughes
6f9dfc667b Merge remote-tracking branch 'upstream/pull/5614' 2025-02-06 17:19:32 +00: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
Nenad Vujicic
85bc737dee Switches from comments to all_comments
Switches from using note's .comments to .all_comments. Fixes bug with notes of deleted users without comments, which are filtered out, but the code tries to access the first comment.
2025-02-06 10:58:52 +01:00
Holger Jeromin
a4e6934d59 Fix all no-implicit-globals eslint errors 2025-02-06 09:22:40 +01:00
Holger Jeromin
c855d86bf8 Mark valid usecases for alert 2025-02-06 08:35:50 +01:00
Tom Hughes
361dcbb1df Merge remote-tracking branch 'upstream/pull/5603' 2025-02-05 19:14:02 +00:00
Tom Hughes
cfd2c5ddda Merge remote-tracking branch 'upstream/pull/5597' 2025-02-05 19:09:37 +00:00
Tom Hughes
6df5bd4acd Merge remote-tracking branch 'upstream/pull/5620' 2025-02-05 19:00:14 +00:00
Marwin Hochfelsner
1e57668c7e Simplify initialisation of iD 2025-02-05 19:56:01 +01:00
Tom Hughes
1b20b5187e Merge remote-tracking branch 'upstream/pull/5604' 2025-02-05 18:50:20 +00:00
Tom Hughes
5d5d0beefa Merge remote-tracking branch 'upstream/pull/5610' 2025-02-05 18:35:10 +00: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
Tom Hughes
51dab659f5 Merge remote-tracking branch 'upstream/pull/5605' 2025-02-05 18:02:04 +00:00
Tom Hughes
992755c0a6 Merge remote-tracking branch 'upstream/pull/5602' 2025-02-05 17:58:26 +00: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
Andy Allan
6142d8b8fe
Merge pull request #5559 from hlfan/eslint-plugin-erb
Add eslint-plugin-erb to provide linting of .js.erb files
2025-02-05 17:07:50 +00:00
Marwin Hochfelsner
bc18e85d5c Add eslint-plugin-erb for .js.erb file linting
* Add eslint-plugin-erb to provide linting of our .js.erb files
* Lint osm.js.erb and API-ify OSM.params()
---------
Co-authored-by: Andy Allan <git@gravitystorm.co.uk>
2025-02-05 17:00:38 +01:00
Martin Raifer
cb5157c492
Update to iD v2.31.0 2025-02-05 13:54:53 +01:00
Anton Khorev
b3a0038d27 Write the new role in reassign checkbox label 2025-02-05 13:00:04 +03:00
Marwin Hochfelsner
550e5d336f Reevaluate iteration methods 2025-02-04 17:12:15 +01:00
Anton Khorev
abcd22854c Don't html-escape note description
The description is already html-safe after to_html.
2025-02-04 18:29:47 +03:00
Anton Khorev
06cece27fe Merge branch 'pull/5579' 2025-02-04 16:42:00 +03:00
Marwin Hochfelsner
628f6149d1
Close directions popup with sidebar 2025-02-04 07:16:05 +01:00
Marwin Hochfelsner
500f0e49b8 Collect parseFloat/Int and restructure mapParams 2025-02-04 06:53:20 +01:00
Marwin Hochfelsner
518936bdb6 Remove parseFloat calls and restructure 2025-02-04 06:53:20 +01:00
Nenad Vujicic
2d0b7b6b87 Adds optional use of note's author and description
Adds optional use of author and description from notes (in case data-migration is done) and author and description from first visible note comment (in case data-migration is not done). Also, adds author association to Note model.
2025-02-04 01:29:45 +01:00
Nenad Vujicic
5755386567 Removes note's author from RSS
Removes writing note's author to note's RSS if author is missing or data-migration is done and note's author is deleted.
2025-02-04 01:29:45 +01:00
Nenad Vujicic
a16c1138e9 Replaces using description with note_description
Replaces using note's description method with note_description helper routine.
2025-02-04 01:23:48 +01:00
Nenad Vujicic
a6d7c772e5 Adds helper routine note_description
Adds new helper routine note_description for retrieving note's description. Helper routine returns "deleted" if author is deleted otherwise note's description.
2025-02-04 01:22:28 +01:00