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

1748 commits

Author SHA1 Message Date
Tom Hughes
0254f7ee09 Fix confirmation prompt when granting or revoking roles 2023-07-01 15:21:02 +01:00
Tom Hughes
772e480766 Merge remote-tracking branch 'upstream/pull/4063' 2023-06-14 17:08:59 +01:00
Andy Allan
73e0c4ed21 Use Time.utc for consistency with other tests 
This also allows times to be created in short form, e.g. Time.utc(2020)
 2023-06-14 16:46:27 +01:00
Andy Allan
2f7642aa03 Fix test to work in non-UK timezones 
Time.new(...).utc is not the same as Time.utc(...). The
first creates a given date in local time, and then converts that to
utc, whereas the second creates the given time in UTC.
 2023-06-14 16:46:06 +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
52296d1cad Add rubocop-factory_bot and fix warnings 2023-05-16 18:44:14 +01:00
Andy Allan
387d130e87 Add some validations for i18n values 
These only apply to the en.yml file for now, but can be expanded
in due course.
 2023-04-12 13:58:55 +01:00
Andy Allan
fad3aedbbb Rework note events to avoid raw html in translations 2023-04-02 10:22:30 +01:00
Andy Allan
4ac0c9c1e8 Rework browse pages to avoid raw html in translations 2023-03-29 18:52:45 +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
Andy Allan
a91afa0e78 Use .with_locale for about page 
This simplifies the code, since we can avoid having to specify the
locale for every translation.

The test was added since I originally developed another approach,
but that caused exceptions on invalid locales.
 2023-03-22 10:13:01 +00:00
Tom Hughes
8919c8c404 Use POST for geocoder backends 
The geocoder backend calls are a private implementation detail
and using POST enables request forgery checks and makes scraping
of nominatim via the backend calls harder.
 2023-03-07 17:24:48 +00:00
Tom Hughes
2b3133d2e8 Fix new rubocop warnings 2023-02-28 15:20:33 +00:00
Tom Hughes
721d33033c Merge remote-tracking branch 'upstream/pull/3936' 2023-02-22 18:17:51 +00:00
Andy Allan
4af923dbf9 Ensure kramdown table alignment styles are converted to bootstrap classes 
Adds tests for commit f42a7a2d8d
 2023-02-22 09:46:52 +00:00
Andy Allan
10e035df93 Refactor trace guidance to avoid raw html in translations 
Also rearrange to avoid multiple sentences in a heading.
 2023-02-22 09:16:17 +00:00
Andy Allan
47362f432a
Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links 
Link prefixed wikipedia tags
 2023-02-08 17:30:25 +00:00
Tom Hughes
52591c5561 Merge remote-tracking branch 'upstream/pull/3911' 2023-02-01 19:10:22 +00:00
Andy Allan
c226d8e85e Avoid converting conditional restriction tags into emails 
Fixes #3884
 2023-02-01 18:57:16 +00:00
Andy Allan
9bb8dd739a Use data attributes to pass alternative button labels 
This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.
 2023-02-01 17:24:47 +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
Andy Allan
f7367baa6b Rename api_notes resource to avoid conflict with non-API resource 
This allows using e.g. note_path for notes#show in the future.
 2023-01-25 19:01:57 +00:00
Tom Hughes
4704059096 Update tests for changes in osm-community-index 2023-01-14 15:12:23 +00:00
Richard Fairhurst
b7887b049f Remove Geonames and geocoder.ca 2023-01-09 21:23:48 +00:00
Tom Hughes
52078b5d76 Escape each portion of a semicolon seprated value individually 
Fixes #3872
 2023-01-04 15:41:54 +00:00
Kyle Hensel
305acfe516
fix formatting of tag values with semicolon-separated URLs 2022-12-31 17:30:03 +13:00
Tom Hughes
6033359bd0 Preserve rel=me on links in rich text 
Fixes #3859
 2022-12-29 18:02:23 +00:00
Tom Hughes
600ed78b04 Use CGI.escape for ruby 2.7 compatibility 2022-12-29 17:45:29 +00:00
Tom Hughes
27e9965dd2 Require integer IDs for diary_entries#show 
Fixes #3865
 2022-12-29 17:14:05 +00:00
Tom Hughes
e5406c6836 Make test names clearer 2022-12-29 16:52:19 +00:00
Andy Allan
0925035a3e Add tests to ensure tokens are revoked 
This ensures that tokens are revoked or invalidated when a user
is soft destroyed.
 2022-12-28 15:25:57 +00:00
Tom Hughes
9cb7a7b36b Don't allow any abilities for inactive users 2022-12-23 16:37:33 +00:00
Tom Hughes
5be5155e03 Merge remote-tracking branch 'upstream/pull/3856' 2022-12-22 15:49:28 +00:00
Andy Allan
6f471c72c9 Wait for the button to be disabled, before checking the tooltip behaviour 
Rather than sleeping for a fixed period, we can use Capybara's built-in
ability to wait for elements to be present. Since we're only changing
the state of existing elements though, we need to wait for their
"disabled" property to be set.

Fixes some timing-related problems with the test suite.
 2022-12-21 17:08:51 +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
Andy Allan
415ac577f3 Remove some old debugging comments 2022-12-21 12:05:15 +00:00
Andy Allan
4ab134d869 Use fallbacks for OCI resource names 
This uses the fallbacks for OCI translations. For example, if a
local chapter doesn't have an explicitly translated name, it will
use a template for osm-lc resources and fill in the appropriate
translated community name.

Fixes #3814
 2022-12-14 14:54:01 +00:00
Tom Hughes
e2f071869f Increase delay to improve test reliability 2022-12-09 15:43:23 +00:00
mmd-osm
ec121dde4f Add more testcases to changesets_controller 
Extracted from pull request #1995
 2022-11-30 22:32:20 +01:00
Tom Hughes
6ffe31795b Make tooltip tests more robust 2022-11-30 12:58:13 +00:00
Tom Hughes
152414861c Merge remote-tracking branch 'upstream/pull/3688' 2022-11-30 12:19:57 +00: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
Andy Allan
97b7bac956 Use the mail_to method to construct a mailto link for browse tag values 
This is easier than building a mailto link ourselves. Also implement
the missing title tag and write a test for it.
 2022-11-17 12:53:33 +00:00
Andy Allan
af6fec502a Validate URLs against supply-chain attacks 
Unfortunately validates_url gem doesn't support mailto or xmpp urls,
so we need to write our own validation.
 2022-11-02 18:21:00 +00:00
Tom Hughes
49cde0e901 Fix new rubocop warnings 2022-11-01 18:42:24 +00:00
Anton Khorev
34a8d08209 Merge changeset <ol>s on Load more 2022-10-26 15:02:49 +03: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