5c97ccf939
Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream
2024-09-06 20:10:53 +02:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
b716248fc5
Add link to `/admin/roles` in moderation interface when changing someone's role ( #31791 )
2024-09-06 17:21:49 +00:00
7335a43b6d
Use async count in admin dashboard ( #30606 )
2024-09-06 16:52:35 +00:00
0a433d08fb
Move shares/modal body class to layout ( #31789 )
2024-09-06 16:46:55 +00:00
4f81ad2494
Add coverage for `media#player`, move body class to view ( #31790 )
2024-09-06 16:46:25 +00:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
a9d0b48b65
Set "admin" body class from `admin` nested layout ( #31269 )
2024-09-06 13:58:46 +00:00
fd7fc7bdc3
Disable actions on reports that have already been taken ( #31773 )
2024-09-06 12:50:30 +00:00
be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
cc4865193a
New Crowdin Translations (automated) ( #31781 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-06 07:38:08 +00:00
7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
db6b1fe8fb
[Glitch] Fix radio checkbox visibility in Report dialogs
...
Port b4b639ee4a
2024-09-05 20:40:31 +02:00
cb324b5d7c
[Glitch] Change design of unread conversations in web UI
...
Port ec4c49082e
2024-09-05 20:40:04 +02:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
bc435c63bd
Change width of columns in advanced web UI ( #31762 )
2024-09-05 14:57:53 +00:00
d58faa2018
Remove references to deprecated `Import` model ( #31759 )
2024-09-05 14:07:17 +00:00
b4b639ee4a
Fix radio checkbox visibility in Report dialogs ( #31752 )
2024-09-05 12:34:13 +00:00
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
f9712fad1b
Direct link to each authorized_application entry with html anchor ( #31677 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-09-05 09:48:42 +00:00
b265a654d7
Fix wrong width on content warnings and filters in web UI ( #31761 )
2024-09-05 09:46:11 +00:00
eb23d9f0f6
New Crowdin Translations (automated) ( #31765 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-05 09:40:38 +00:00
ec4c49082e
Change design of unread conversations in web UI ( #31763 )
2024-09-05 09:39:59 +00:00
4678473e54
Add `AnnualReport::Source#report_statuses` method for subclasses to use ( #31753 )
2024-09-04 19:50:33 +00:00
1fb31ad9b1
[Glitch] Fix display name being displayed instead of domain in remote reports
...
Port 585e369e0b
2024-09-04 19:43:21 +02:00
1d86377ba9
[Glitch] Fix all notification types being stored without filtering when polling
...
Port fab29ebbe8
2024-09-04 19:42:45 +02:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
559958f8c5
Fix email language when recipient has no selected locale ( #31747 )
2024-09-04 17:35:40 +00:00
fe04291af4
Use more accurate beginning/ending times in annual report source ( #31751 )
2024-09-04 17:19:53 +00:00
585e369e0b
Fix display name being displayed instead of domain in remote reports ( #31613 )
2024-09-04 13:43:08 +00:00
fab29ebbe8
Fix all notification types being stored without filtering when polling ( #31745 )
2024-09-04 13:28:16 +00:00
1fcffa573c
Fix 500 error in `GET /api/v2_alpha/notifications` when there are no notifications to return ( #31746 )
2024-09-04 12:54:15 +00:00
58df00f04d
Extract method for self-referencing records in `AccountStatusCleanupPolicy` ( #31244 )
2024-09-04 08:52:37 +00:00
1c17dca6d9
New Crowdin Translations (automated) ( #31741 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-04 08:42:36 +00:00
8e3c47aff5
[Glitch] `frequentlyUsedLanguages` not updated correctly
...
Port 8adf67f2db
2024-09-03 21:55:32 +02:00
663cebbe3b
[Glitch] Fix radio buttons styling in web UI
...
Port 0437dd9e77
2024-09-03 21:54:41 +02:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
8adf67f2db
`frequentlyUsedLanguages` not updated correctly ( #31386 )
2024-09-03 15:55:13 +00:00
7c26e5e4a1
Add `Reviewable` model concern ( #31152 )
2024-09-03 15:37:45 +00:00
2f0d0fc127
Add coverage for `CLI::Accounts#fix_duplications` task ( #30639 )
2024-09-03 15:36:59 +00:00
5b595b8a5a
Remove usage of `assigns` in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
ae363f0555
Fix spacing between icons and labels in settings/admin interface ( #31728 )
2024-09-03 14:43:34 +00:00
ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` ( #31725 )
2024-09-03 14:32:26 +00:00
c9641c8070
Remove un-needed edge case sort condition in languages helper ( #31724 )
2024-09-03 13:19:48 +00:00
0437dd9e77
Fix radio buttons styling in web UI ( #31723 )
2024-09-03 11:37:09 +00:00
e9adba60af
[Glitch] Fix not being able to load more notifications after trimming
...
Port c1795ee963
2024-09-03 12:13:19 +02:00
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
2a244e2fdb
Remove unused `merge_context` helper ( #31703 )
2024-09-03 08:59:37 +00:00
48379e62e4
Remove unused `User#inactive_message` method ( #31698 )
2024-09-03 08:04:00 +00:00
406b8211f5
Remove unused `Mention#active?` method ( #31697 )
2024-09-03 08:03:25 +00:00
Claire