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

6507 commits

Author SHA1 Message Date
Tom Hughes
a99450f558 Merge remote-tracking branch 'upstream/pull/4210' 2023-08-30 18:10:20 +01:00
Andy Allan
4af54ce93b Use Activerecord '#or' method for queries 
That let's us use relation names (like `sender`) and avoid dealing
directly with ids.
 2023-08-30 17:17:15 +01:00
Andy Allan
b595b87c48 Use trace instead of gpx_id in queries 
This makes the queries easier to read.
 2023-08-30 17:08:46 +01:00
Andy Allan
f5db9cbb20 Avoid using _id in queries 
This makes the queries shorter and easier to read.
 2023-08-30 17:08:16 +01:00
Andy Allan
124909a64c
Merge pull request #4193 from AntonKhorev/lookup-friend 
Lookup friend user before make/remove friend action
 2023-08-30 15:17:11 +01:00
Andy Allan
e68d4efc3c
Merge pull request #4197 from AntonKhorev/user-resources 
Move user lookup/error methods from app controller to concerns
 2023-08-30 15:11:57 +01:00
Andy Allan
a1657f03a8
Merge pull request #4202 from tomhughes/changeset-comment-limit 
Add rate limiting for changeset comments
 2023-08-30 11:12:40 +01:00
Tom Hughes
3422bb541d Merge remote-tracking branch 'upstream/pull/4198' 2023-08-27 09:46:10 +01:00
Tom Hughes
c7a31ebc5d Restore ordering of results from the users#index API call 2023-08-26 17:41:22 +01:00
ENT8R
be96aa7cb4 Sort users by their ids 2023-08-26 10:14:40 +02:00
ENT8R
b9c85c2697 Use where instead of find to prevent 404 2023-08-26 00:31:18 +02:00
Tom Hughes
a274726f46 Add rate limiting for changeset comments 
Fixes #4196
 2023-08-25 19:53:04 +01:00
Tom Hughes
63bf18a3c3 Add support for rate limiting signup requests 2023-08-22 18:45:17 +01:00
Anton Khorev
d6ec3bbc60 Lookup friend user before make/remove friend action 2023-08-21 17:44:50 +03:00
Anton Khorev
7de9f6a977 Lookup user before action in user's notes list 2023-08-21 17:31:59 +03:00
Anton Khorev
2d39ba7954 Render unknown user with concerns code in notes controller 2023-08-21 17:30:23 +03:00
Anton Khorev
4ceebefefa Move user lookup and error render to concerns 2023-08-21 17:29:55 +03:00
Tom Hughes
7054cea48e Merge remote-tracking branch 'upstream/pull/4190' 2023-08-20 18:49:32 +01:00
Tom Hughes
2a1689f962 Merge remote-tracking branch 'upstream/pull/4169' 2023-08-20 11:04:28 +01:00
Milan Cvetkovic
ad164d384e Change provider name to "microsoft" 2023-08-20 10:19:30 +01:00
Anton Khorev
0bd5838f51 Respond with plaintext when user not found in changeset query 
The response used to be of type xml with empty body, which is not valid xml.
 2023-08-19 20:26:13 +03:00
Tom Hughes
406d90c5c8 Merge remote-tracking branch 'upstream/pull/4187' 2023-08-19 11:30:33 +01:00
Tom Hughes
a8ae7b2d3e Replace links to donate.osm.org with supporting.osm.org 2023-08-19 11:22:54 +01:00
Anton Khorev
3f6e344e6a Expose note query limit values in api capabilities 2023-08-19 05:40:34 +03:00
Anton Khorev
bc9f081841 Move note query limit values to settings 2023-08-19 05:06:00 +03:00
Tom Hughes
9790d779f4 Merge remote-tracking branch 'upstream/pull/4185' 2023-08-18 19:32:38 +01:00
Tom Hughes
c58f4e4813 Make the versions call default to XML 2023-08-18 19:26:53 +01:00
Anton Khorev
1acd8e25a7 Add 'User' to selectable types in issues search for moderators 
Reported users are either directly assigned to moderators or ofter reassigned to them.
 2023-08-18 18:48:38 +03:00
Anton Khorev
5bdaf0b73b Add JSON output to /api/versions 2023-08-18 05:16:39 +03:00
Tom Hughes
54164f6cc6 Merge remote-tracking branch 'upstream/pull/4171' 2023-08-17 19:07:37 +01:00
Tom Hughes
6b8c8e8d7e Merge remote-tracking branch 'upstream/pull/4179' 2023-08-17 18:55:03 +01:00
Anton Khorev
d69ae84963 Add color keys to note tables 2023-08-17 19:26:26 +03:00
Anton Khorev
e3e5b9fbf1 Remove right leaflet toolbar position override 
Has no effect, doesn't take rtl into account.
Was added in 537d72b0f6 (diff-fe520170ce0c939dc1e59f3395a360a1866b4da19b474c9f0b35112f72e952d8R117)
 2023-08-17 17:48:59 +03:00
Milan Cvetkovic
568bf4939d Replace references to windowslive with microsoft_graph 2023-08-17 13:01:15 +00:00
Milan Cvetkovic
7428da74c2 Use omniauth-microsoft_graph instead of omniauth-windowslive 
Omniauth-microsoft_graph correctly populates 'email' and 'name' fields used by OpenStreetMap.
It also  uses updated endpoints for Microsoft identity provider.

Use email address returned by microsoft_graph provider as a verified address.

Upgrading exisiting users from windowslive to microsoft_graph:
 - upon next login existing `windowslive` users will have to authorizei
   OpenStreetMap application to "Read Your Profile," required for proper reading
   of display name field.

The name of the identity provider in OSM is kept to 'windowslive':
 - the entries in users table with `provider == 'windowslive'`
   can be reused for microsoft_graph provider, since
   the uid field is preserved. Users will not need to repeat the sign up process.
 - OAuth2 callback is still `/auth/windowslive`, no updates to Microsoft Identity Provider portal
   App registration are necessary.
 2023-08-17 13:01:15 +00:00
Martin Raifer
41a7ca4241
Update to iD v2.27.0 2023-08-16 18:47:10 +02:00
Andy Allan
6b633e9d4a
Merge pull request #4133 from AntonKhorev/flex-leaflet-controls 
Use multiple columns for map controls if they don't fit vertically
 2023-08-16 13:43:42 +01:00
Andy Allan
9174049d6b
Merge pull request #4150 from AntonKhorev/note-table-bootstrap-highlight 
Use Bootstrap highlight class in note tables
 2023-08-16 13:35:47 +01:00
Andy Allan
28b00b85da
Merge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix 
Don't do direction override from Bootstrap reboot of <code>
 2023-08-16 13:24:11 +01:00
Andy Allan
9173dd3192
Merge pull request #4148 from tomhughes/avatar-image 
Use correct extension and type for avatar images attached to mails
 2023-08-16 11:35:33 +01:00
Andy Allan
59e9203a0a
Merge pull request #4173 from AntonKhorev/comments 
Small changes of diary comments
 2023-08-16 11:27:42 +01:00
Anton Khorev
8efc15ea7a Replace top margin on comments with bottom padding on diary posts 2023-08-16 04:22:50 +03:00
Anton Khorev
e5ce6ffbb8 Remove empty comments anchor 2023-08-16 04:17:50 +03:00
Tom Hughes
6982903ae7 Fix predicate method names in the user model 2023-08-15 18:53:14 +01:00
Tom Hughes
65d092a579 Fix new rubocop warnings 2023-08-15 18:22:45 +01:00
Anton Khorev
5016defff0 Add 'from' and 'to' changeset query parameters 2023-08-15 19:29:06 +03:00
Anton Khorev
86f254380b Revert misleading comment about time restriction 
Was added in afe8dd51ec (diff-22d3daaccac3ac960d6dbb47e9c6a9d15b0b4cffbbf9ad32d525600f562827f1R420)
 2023-08-15 19:29:06 +03:00
Anton Khorev
7bca06a3d3 Disallow changesets query with both time and order=oldest 2023-08-15 19:29:06 +03:00
Anton Khorev
b350c78bc8 Sort changesets by creation time 2023-08-15 19:29:06 +03:00
Tom Hughes
e6a8b40098 Make the close icon on banners more visible 
Fixes #4165
 2023-08-14 08:31:10 +01:00