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

2159 commits

Author SHA1 Message Date
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
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
Tom Hughes
702c071e19 Sort changesets by close time to match selection 
This ensures that the sort can be optimised using the index
when selecting by time.
 2023-08-13 19:09:54 +01:00
Tom Hughes
f059045848 Make the capabilities call default to XML 2023-08-13 12:48:02 +01:00
Tom Hughes
6d74aa2873 Merge remote-tracking branch 'upstream/pull/4158' 2023-08-13 10:00:29 +01:00
Anton Khorev
0abab48f5d Add order parameter to changeset query api entry point 2023-08-12 03:57:48 +03:00
Anton Khorev
033c032ed6 Add home location condition to user model 2023-08-11 21:44:15 +03:00
Tom Hughes
38369675b7 Merge remote-tracking branch 'upstream/pull/4135' 2023-08-09 19:22:36 +01:00
Tom Hughes
a11679d3eb Take exclude_place_ids from Nominatim results directly 
Fixes #4137
 2023-08-08 18:27:53 +01:00
Anton Khorev
a5d14a1815 Move changeset query limit values to settings 2023-08-08 03:33:04 +03:00
Andy Allan
68fa607811 Use hashes to define where..in sql queries 
This is preferable to using SQL statements.
 2023-08-03 11:04:28 +01:00
Anton Khorev
b801f3e3e5 Add titles to issue pages 2023-08-03 03:09:54 +03:00
Andy Allan
aceef47cd8
Merge pull request #4106 from tomhughes/diary-paging 
Replace page numbers with ID based selection for diary indexes
 2023-08-02 16:57:26 +01:00
Andy Allan
9619e699e1
Merge pull request #4107 from tomhughes/diary-visibility 
Allow administrators to see deleted diary entries
 2023-08-02 14:47:05 +01:00
Tom Hughes
f29ba01eb9 Replace page numbers with ID based selection for diary indexes 2023-07-27 20:37:07 +01:00
Tom Hughes
edfe0dde67 Disambiguate ID queries for tagged trace lists 2023-07-27 20:29:29 +01:00
Tom Hughes
6651d713d7 Allow administrators to see deleted diary entries 2023-07-27 18:03:58 +01:00
Andy Allan
925d12cc81
Merge pull request #3933 from AntonKhorev/api-changesets-limit 
Add limit parameter to api changesets query
 2023-07-26 16:45:00 +01:00
Tom Hughes
c909b29c35 Replace page numbers with ID based selection for trace indexes 2023-07-23 19:28:37 +01:00
Andy Allan
e9e4b10473
Merge pull request #3907 from Dimitar5555/patch-1 
Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar
 2023-06-14 14:08:38 +01:00
Tom Hughes
7cdf5b0b19 Fix new rubocop warnings 2023-06-06 18:45:38 +01:00
Dimitar
318064b2a7 Facelift offline.html and use Bootstrap classes for "notifications" 
Update site_controller_test.rb

Update site_controller_test.rb

Remove whitespace

Reset Settings.status after test is done

Update test for offline page

Update site_controller.rb

Fix indentation

Update offline controller

Update offline.html.erb

Remove flash CSS classes and fix missed tests

Updated tests

Address most PR comments

Update _flash.html.erb

Update _flash.html.erb

Update edit.html.erb

Update offline.html.erb
 2023-03-26 13:57:51 +03:00
Tom Hughes
0571802b31 Remove accidental commit 2023-03-12 17:53:30 +00:00
Tom Hughes
35c59bff0d Fix "load more" button on search results 
Fixes #3969
 2023-03-12 17:52:39 +00:00
Tom Hughes
6e6d806560 Set the locale when rendering a generic error page 2023-03-12 16:10:14 +00:00
Anton Khorev
e286ce515c Add limit parameter to api changesets query 2023-02-14 20:56:29 +03:00
Tom Hughes
52591c5561 Merge remote-tracking branch 'upstream/pull/3911' 2023-02-01 19:10:22 +00:00
Andy Allan
9748ce301c Move browse#note to notes#show 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Andy Allan
b5046fdcd0 Move browse#new_note to notes#new 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Tom Hughes
b5b2e4dfbc Sort issues in descending order of their last update 2023-01-26 09:04:37 +00:00
Tom Hughes
226e2d654a Merge remote-tracking branch 'upstream/pull/3891' 2023-01-11 18:42:16 +00:00
Andy Allan
4c564e5a32 Move more api-related helper methods to ApiController 
This prevents them from being inadvertently used in non-API controllers
 2023-01-11 15:28:59 +00:00
Andy Allan
a7f0de41e6 Use web_timeout for notes controller 
This controller doesn't handle any API methods, and so the api call
error handling isn't appropriate.
 2023-01-11 15:28:02 +00:00
Tom Hughes
a119240216 Add database checks to issue and report controllers 
Fixes #3875
 2023-01-11 11:12:36 +00:00
Richard Fairhurst
b7887b049f Remove Geonames and geocoder.ca 2023-01-09 21:23:48 +00:00
Tom Hughes
3ff8ef52b7 Merge remote-tracking branch 'upstream/pull/3848' 2022-12-22 16:43:41 +00:00
Andy Allan
ace8e9a9c3 Fix redirection to wiki when terms are declined 
Adds missing test to pick this up.

Fixes #3826.
 2022-12-21 15:39:23 +00:00
Tom Hughes
fd283efa51 Fix new rubocop warnings 2022-12-20 18:57:12 +00:00
Christian Beiwinkel
85f627c5c2 added valhalla routing engine 2022-12-16 17:05:36 +01:00
Andy Allan
067b0de439
Merge pull request #3676 from harry-wood/notes-disappear-time 
Display how long until a note will disappear
 2022-11-23 15:44:26 +00:00
Tom Hughes
8cef62cd2c Merge remote-tracking branch 'upstream/pull/3301' 2022-11-22 18:47:24 +00:00
Tom Hughes
dc28f1dccc Fix new rubocop warnings 2022-11-22 18:32:02 +00:00
Andy Allan
972249ce9d Reconfigure the suspended flash message to avoid html_safe 
This also avoids having raw html in the translation strings
 2022-11-17 12:04:28 +00:00
Andy Allan
6bbd8490fe Remove outdated comments 
The action no longer deals with sending, and there's no display_name
param in this bit of code so it's a bit confusing.
 2022-11-02 11:22:29 +00:00
Andy Allan
22946d703a Enable the ActionOrder cop for remaining controllers 
Where actions were reordered, the rails standard actions were
also moved to the top of each controller.
 2022-11-02 11:06:00 +00:00
Tom Hughes
49cde0e901 Fix new rubocop warnings 2022-11-01 18:42:24 +00:00
Tom Hughes
3d0b94abda Merge remote-tracking branch 'upstream/pull/3768' 2022-10-25 19:28:10 +01:00
Tom Hughes
460ed0c844 Fix new rubocop warnings 2022-10-25 19:19:57 +01:00
Anton Khorev
225b260640 Pass min/max lat/lon to notes index rss builder 2022-10-25 13:52:28 +03:00