Commit graph

15741 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
12920987f5 Merge remote-tracking branch 'upstream/pull/5669' 2025-02-15 09:11:03 +00:00
Tom Hughes
7236d6d49b Update bundle 2025-02-15 08:52:19 +00:00
Tom Hughes
b7ee8034dc Merge remote-tracking branch 'upstream/pull/5673' 2025-02-15 08:51:36 +00:00
Tom Hughes
485cbf59b0 Merge remote-tracking branch 'upstream/pull/5674' 2025-02-15 08:50:34 +00:00
Tom Hughes
09555d0668 Merge remote-tracking branch 'upstream/pull/5675' 2025-02-15 08:44:47 +00:00
Anton Khorev
0e93af3e30 Use changeset tag factory in api changeset json test 2025-02-15 05:56:32 +03: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
Marwin Hochfelsner
bf194952d7 Transition more requests to fetch 2025-02-14 09:41:20 +01:00
Tom Hughes
f5af8befa9 Merge remote-tracking branch 'upstream/pull/5666' 2025-02-13 22:03:28 +00:00
Anton Khorev
a91ba62c4c Test commenting changesets with different scopes 2025-02-14 00:17:45 +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
Anton Khorev
bb5bad9115 Split api changeset comment unhide fail tests 2025-02-14 00:15:52 +03:00
Anton Khorev
97b9d5acdb Split api changeset comment hide fail tests 2025-02-14 00:15:52 +03:00
Anton Khorev
c3b0a278d8 Split changeset comment subscription emails test 2025-02-14 00:15:52 +03:00
Anton Khorev
c0ef1a88ad Test state of created comment 2025-02-14 00:15:52 +03:00
Anton Khorev
c9057188aa Split api changeset comment create scope and terms tests 2025-02-14 00:15:52 +03:00
Anton Khorev
4073e0fc47 Split api changeset comment create fail tests 2025-02-14 00:15:52 +03:00
Anton Khorev
1632d010d3 Rename api changeset comment tests 2025-02-14 00:15:52 +03:00
Tom Hughes
cef7eab25d Merge remote-tracking branch 'upstream/pull/5668' 2025-02-13 18:08:02 +00:00
Tom Hughes
d3e2c3eb03 Merge remote-tracking branch 'upstream/pull/5665' 2025-02-13 17:49:59 +00:00
Mateusz Konieczny
0f689d36be rerun script/misc/update-wiki-pages 2025-02-13 14:52:48 +01:00
translatewiki.net
8747d82869
Localisation updates from https://translatewiki.net. 2025-02-13 13:15:54 +01:00
dependabot[bot]
c622866224
Bump rack from 2.2.10 to 2.2.11
Bumps [rack](https://github.com/rack/rack) from 2.2.10 to 2.2.11.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.10...v2.2.11)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-12 23:46:31 +00:00
Tom Hughes
46f642d5cd Merge remote-tracking branch 'upstream/pull/5632' 2025-02-12 18:21:02 +00:00
Tom Hughes
c3f0dc8969 Merge remote-tracking branch 'upstream/pull/5661' 2025-02-12 18:11:38 +00:00
Tom Hughes
22f590c9ef Merge remote-tracking branch 'upstream/pull/5622' 2025-02-12 17:59:25 +00:00
Tom Hughes
cb0c5262a8 Merge remote-tracking branch 'upstream/pull/5642' 2025-02-12 17:58:06 +00:00
Tom Hughes
42f44d3a71 Merge remote-tracking branch 'upstream/pull/5650' 2025-02-12 17:55:26 +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
663459d1c1 Adds index to notes on description column
Adds text index to description column to table notes.
2025-02-12 18:22:50 +01:00
Martin Raifer
c025613ff6
replace all occurrences of + 2025-02-12 16:23:31 +01:00
Martin Raifer
0b5fa06a39
lint 2025-02-12 14:10:25 +01:00
Martin Raifer
051ae5953f
workaround for iD bug #10761
the current version of iD (v2.31, before the fix for https://github.com/openstreetmap/iD/issue/10761: https://github.com/openstreetmap/iD/pull/10766), does not fully support `x-www-form-urlencoded` "query-style" strings in the hash: Specifically, spaces encoded as `+` will not be decoded back to ` `.

This workaround essentially temporarily reverts the behaviour of the website to the state before #5592, and can be dropped again with the next minor version upgrade of iD (`v2.32`).
2025-02-12 14:08:19 +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
Andy Allan
d642adc6e4
Merge pull request #5658 from tomhughes/flash-skip-terms
Stop using session flash to communicate with callbacks
2025-02-12 09:40:16 +00:00
Andy Allan
b6ea8f03ca
Merge pull request #5659 from SergeCroise/patch-1
Fix spelling of the word available in DOCKER md
2025-02-12 09:34:17 +00:00
Marwin Hochfelsner
e1055764d8 Get directions using fetch
Co-authored-by: Holger Jeromin <h.jeromin@beckhoff.com>
2025-02-12 05:13:12 +01:00
Marwin Hochfelsner
5310c5b9dd Set map param with array 2025-02-12 04:34:01 +01:00
Serge Croisé
c973b0f237
Fix spelling of the word available in DOCKER md 2025-02-12 02:04:44 +01:00
Tom Hughes
6c779d1ca5 Merge remote-tracking branch 'upstream/pull/5657' 2025-02-12 00:18:25 +00:00
Tom Hughes
43f40c5d03 Stop using session flash to communicate with callbacks 2025-02-12 00:09:40 +00:00
dependabot[bot]
a2ab27854c
Bump eslint from 9.20.0 to 9.20.1
Bumps [eslint](https://github.com/eslint/eslint) from 9.20.0 to 9.20.1.
- [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.20.0...v9.20.1)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-11 23:57:08 +00:00