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

2142 commits

Author SHA1 Message Date
Tom Hughes
edfe0dde67 Disambiguate ID queries for tagged trace lists 2023-07-27 20:29:29 +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
Anton Khorev
0c8b9eabf3 Pass min/max lat/lon to notes rss feed builder 2022-10-25 13:35:18 +03:00
Robbendebiene
ed1112bcef Allow setting HTTP ACCEPT header for notes API 
Previously the notes API return type could only be specified by appending the file extension like .json or .rss
 2022-09-23 11:40:19 +02:00
Tom Hughes
09263bc4a1 Cancel running queries when a timeout occurs 2022-09-21 22:47:16 +01:00
Harry Wood
e057e1c479 Define a DEFAULT_FRESHLY_CLOSED_LIMIT constant 
Define DEFAULT_FRESHLY_CLOSED_LIMIT in the Note model to allow the 7 day limit to be referenced in the API controller and in the new `freshy_closed_until` logic. The default value is `7.days`. API users can still override this, but the website uses that default for the duration of the green "freshly closed" notes markers.
 2022-09-14 23:59:41 +01:00
Adam Hoyle
7e5cbe87ed Merge branch 'master' into feature/add-communities-page 
# Conflicts:
#	Gemfile.lock
#	package.json
#	yarn.lock
 2022-09-10 16:13:17 +01:00
Tom Hughes
9cd96bd452 Fix new rubocop warnings 2022-09-09 22:45:58 +01:00
Tom Hughes
fa93526f76 Use nominatim_url setting more consistently 2022-09-07 08:45:27 +01:00
Tom Hughes
cd5b793dca Redirect to open issues when an issue is reassigned 2022-08-26 13:49:09 +01:00
Andy Allan
a0d0dee886 Return to issue index if you can't view reassigned issue 
Fixes #3652
 2022-08-24 14:05:19 +01:00
Tom Hughes
e9f62a8c30 Rename piwik to matomo and merge configuration into settings 2022-08-01 22:42:04 +01:00
Andy Allan
bb7f5ac2c8 Switch to using FrozenRecord for loading communities 
This allows us to query the records to get the local chapters, which
is more flexible and allows us to use other resources too.
 2022-07-27 16:19:08 +01:00
Tom Hughes
2cbf6062fc Don't try and write directly to the user status 
This causes an exception when processing the authentication callback for
providers like google where we treat the email address as verified.
 2022-07-26 00:52:22 +01:00
Tom Hughes
aa32dba482 Require a logged in user for the iD frame 
The frame will error if the user is not logged in as it wants
to be able to access their OAuth token.
 2022-07-26 00:52:22 +01:00
Tom Hughes
0ae438a5c1 Add a configuration option to disable HTTP basic authentication 2022-07-08 17:25:20 +01:00
Tom Hughes
0c524b2408 Log any use of basic authentication 2022-07-08 17:13:02 +01:00
Tom Hughes
1a4faa4507 There is no need to do setup_user_auth and authorize for the same action 2022-07-08 16:38:51 +01:00
Tom Hughes
35cd8f80cc Restore intended title for GPS trace view 2022-06-19 12:52:47 +01:00