Eugen Rochko
80cb285819
[Glitch] Fix sass deprecation warning
...
Port 29656cb9e0
2024-09-21 15:14:54 +02:00
Renaud Chaput
d77348f830
[Glitch] Fix the appearance of avatars when they do not load
...
Port 8b70834035
2024-09-21 15:13:57 +02:00
Christian Schmidt
0820cbcb35
[Glitch] Mute XHR abort errors
...
Port 7740f1a6bb
2024-09-21 15:13:23 +02:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
github-actions[bot]
b0f6d3e112
New Crowdin Translations (automated) ( #2773 )
...
* New Crowdin translations
* Fix bogus `no.yml`
* Fix bogus `simple_form.no.yml`
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-21 14:57:30 +02:00
Claire
7ed9c590b9
Fix issue when encountering reblog of deleted post in feed rebuild ( #32001 )
2024-09-20 14:58:06 +00:00
Claire
ed8b0e4b1e
Fix links for reblogs in moderation interface ( #31979 )
2024-09-20 13:33:26 +00:00
Matt Jankowski
a7dbf6f5a5
Use heredoc/squish for inline css styles in oembed serializer ( #31991 )
2024-09-20 12:50:51 +00:00
Matt Jankowski
bdf83c353f
Move default embed size knowledge into OEmbedSerializer ( #31990 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-20 12:39:48 +00:00
Claire
8afa3bb2fa
Change Mastodon to issue correctly-signed queries by default ( #31994 )
2024-09-20 10:10:09 +00:00
Eugen Rochko
e7fd0985c9
Change zoom icon in web UI ( #29683 )
2024-09-20 09:42:02 +00:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Matt Jankowski
c922af2737
Add LIMIT constant for api/v1/peers/search endpoint ( #31989 )
2024-09-20 08:31:58 +00:00
github-actions[bot]
162f9a3c90
New Crowdin Translations (automated) ( #31993 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-20 08:31:28 +00:00
Renaud Chaput
ae03e4ffc6
Update directory page options to use URL params ( #31977 )
2024-09-19 15:34:08 +00:00
Claire
57a38f071b
Fix custom history.push and history.replace building bogus location if path is omitted ( #31980 )
2024-09-19 14:58:33 +00:00
Matt Jankowski
2946a9286b
Use headers shorthand in mailers ( #31956 )
2024-09-19 13:38:32 +00:00
Eugen Rochko
ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI ( #31960 )
2024-09-19 10:52:46 +00:00
github-actions[bot]
efdc17513d
New Crowdin Translations (automated) ( #31974 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-19 10:34:19 +00:00
Matt Jankowski
5d573c976e
Remove unused E2EE-related methods ( #31964 )
2024-09-19 10:23:58 +00:00
Eugen Rochko
29656cb9e0
Fix sass deprecation warning ( #31961 )
2024-09-18 17:39:32 +00:00
Renaud Chaput
8b70834035
Fix the appearance of avatars when they do not load ( #31966 )
2024-09-18 17:39:15 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Christian Schmidt
7740f1a6bb
Mute XHR abort errors ( #31952 )
2024-09-18 08:43:24 +00:00
github-actions[bot]
bd86c692cf
New Crowdin Translations (automated) ( #31959 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-18 08:06:44 +00:00
Matt Jankowski
a397141d78
Move non-action public method controller callback to private methods ( #31933 )
2024-09-18 08:05:25 +00:00
Claire
6bd86fede0
[Glitch] Increase no-gap-breakpoint by 32px to fix overflow
...
Port d2f9075078
2024-09-17 18:13:36 +02:00
Michael Stanclift
a85b2476c2
[Glitch] Fix background of text detection progress
...
Port 5a33a5658b
2024-09-17 18:13:36 +02:00
Claire
93b2c8164e
[Glitch] Fix selectSettingsNotificationsExcludedTypes not being memoized properly
...
Port ca8e892c1a
2024-09-17 18:13:36 +02:00
Claire
11de3dbef6
[Glitch] Enable grouped notifications unconditionally
...
Port c620452fd7
2024-09-17 18:13:36 +02:00
Claire
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
David Roetzel
d8f9db547a
Merge commit from fork
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-09-17 16:59:29 +02:00
github-actions[bot]
6a233cbfcf
New Crowdin Translations (automated) ( #31946 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-17 13:02:53 +00:00
Claire
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow ( #31889 )
2024-09-17 03:19:42 +00:00
Michael Stanclift
5a33a5658b
Fix background of text detection progress ( #31943 )
2024-09-17 03:19:04 +00:00
Claire
18209d2011
Merge pull request #2847 from ClearlyClaire/glitch-soc/fixes/click-detailed-status
...
Fix detailed statuses being clickable and linking to broken pages
2024-09-16 23:51:37 +02:00
Claire
43f6792e1b
Fix detailed statuses being clickable and linking to broken pages
2024-09-16 22:51:19 +02:00
Claire
0740352ce6
[Glitch] Rename /api/v2_alpha/notifications* to /api/v2/notifications*
...
Port e0648a916a
2024-09-16 21:28:05 +02:00
Eugen Rochko
b6398cf2d3
[Glitch] Fix horizontal scrollbar on who to follow carousel in web UI
...
Port efb0e2c34b
2024-09-16 21:28:05 +02:00
Claire
e25634ccef
[Glitch] Convert notification requests actions and reducers to Typescript
...
Port c0eda832f3
2024-09-16 21:28:05 +02:00
Claire
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
ca8e892c1a
Fix selectSettingsNotificationsExcludedTypes not being memoized properly ( #31881 )
2024-09-16 14:51:56 +00:00
Claire
6c76a7a907
Fix cancel follow request button sometimes saying “Follow back” ( #31934 )
2024-09-16 13:20:44 +00:00
Claire
c620452fd7
Enable grouped notifications unconditionally ( #31929 )
2024-09-16 13:12:10 +00:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* ( #31840 )
2024-09-16 12:10:02 +00:00
Eugen Rochko
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI ( #31912 )
2024-09-16 12:08:37 +00:00
Claire
c0eda832f3
Convert notification requests actions and reducers to Typescript ( #31866 )
2024-09-16 09:54:03 +00:00
github-actions[bot]
474abf3c7f
New Crowdin Translations (automated) ( #31911 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-16 08:48:20 +00:00
Matt Jankowski
abd2f5654a
Add validation coverage for CustomEmoji shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
Claire
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
Claire
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
David Roetzel
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
Matt Jankowski
a2c4f5f5c0
Add coverage for ListAccount follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
Matt Jankowski
49cbee3836
Remove unused argument from AccountMigration.within_cooldown ( #31892 )
2024-09-13 08:43:21 +00:00
github-actions[bot]
353ade767b
New Crowdin Translations (automated) ( #31898 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-13 08:41:46 +00:00
Claire
427ed60274
Fix link handling within detailed status contents
2024-09-12 22:42:07 +02:00
Claire
4050beb6e2
Fix detailed status timestamp link target not being the original URL
2024-09-12 22:30:40 +02:00
Michael Stanclift
9b1ecf7aee
[Glitch] Fix review history and action modal styling
...
Port a269ff9253
2024-09-12 21:38:15 +02:00
Claire
afd3953cdd
[Glitch] Autofocus primary button in modals
...
Port 5f782f9629
2024-09-12 21:35:03 +02:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Eugen Rochko
bd68d2ab21
[Glitch] Change design of embed modal in web UI
...
Port 24ef8255b3
2024-09-12 20:58:23 +02:00
Eugen Rochko
e705ec13db
[Glitch] Change embedded posts to use web UI
...
Port 3d46f47817
2024-09-12 20:58:02 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Eugen Rochko
2d31cdbc28
[Glitch] Fix notifications re-rendering spuriously in web UI
...
Port f2a92c2d22
2024-09-12 17:35:05 +02:00
Claire
caaa412e6e
Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream
2024-09-12 17:34:16 +02:00
renovate[bot]
17e3a12d3d
[Glitch] Update typescript-eslint monorepo to v8 (major)
...
Port a27f7f4e56
2024-09-12 17:32:41 +02:00
Eugen Rochko
196b141af5
[Glitch] Change inner borders in media galleries in web UI
...
Port a3215c0f88
2024-09-12 17:28:44 +02:00
Michael Stanclift
eb28472ded
[Glitch] Fix alt text modal styling
...
Port e09f9f885e
2024-09-12 17:23:59 +02:00
Claire
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
Michael Stanclift
a269ff9253
Fix review history and action modal styling ( #31864 )
2024-09-12 14:18:43 +00:00
Taylor Chaparro
1b6a82b799
Fix invalid date searches returning 503 ( #31526 )
2024-09-12 13:40:20 +00:00
Matt Jankowski
f3c4874522
Remove unused statuses#embed body class assignment ( #31787 )
2024-09-12 13:38:15 +00:00
Matt Jankowski
4aa600387e
Move redirect/base body class to view ( #31796 )
2024-09-12 13:31:50 +00:00
Christian Schmidt
8cdc148167
Handle invalid visibility ( #31571 )
2024-09-12 13:29:55 +00:00
Matt Jankowski
17c57c46e7
Add coverage for title/limit validations in List model ( #31869 )
2024-09-12 13:25:23 +00:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
Claire
5f782f9629
Autofocus primary button in modals ( #31883 )
2024-09-12 13:15:05 +00:00
Claire
c35ea59ee6
Fix security context sometimes not being added in LD-Signed activities ( #31871 )
2024-09-12 12:58:12 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
David Roetzel
ab763c493f
Ignore undefined as canonical url ( #31882 )
2024-09-12 11:14:42 +00:00
Eugen Rochko
77cbe2332a
[Glitch] Add ability to manage which websites can credit you in link previews
...
Port CSS changes from e0c27a5047
2024-09-12 12:30:31 +02:00
Eugen Rochko
abe1717215
[Glitch] Change design of hide media button in web UI
...
Port 3929e3c6d2
2024-09-12 12:30:31 +02:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Eugen Rochko
f2a92c2d22
Fix notifications re-rendering spuriously in web UI ( #31879 )
2024-09-12 08:16:07 +00:00
github-actions[bot]
7d53ca56d2
New Crowdin Translations (automated) ( #31878 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-12 07:54:53 +00:00
Eugen Rochko
e2c101ec35
[Glitch] Change labels on thread indicators in web UI
...
Partial port of a021dee642
2024-09-11 21:27:46 +02:00
Claire
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
renovate[bot]
a27f7f4e56
Update typescript-eslint monorepo to v8 (major) ( #31231 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-09-11 13:59:46 +00:00
github-actions[bot]
2babfafaff
New Crowdin Translations (automated) ( #31855 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-11 08:18:10 +00:00
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method ( #31846 )
2024-09-11 07:47:16 +00:00
Eugen Rochko
a3215c0f88
Change inner borders in media galleries in web UI ( #31852 )
2024-09-11 07:29:18 +00:00
Michael Stanclift
e09f9f885e
Fix alt text modal styling ( #31844 )
2024-09-10 17:33:55 +00:00
Matt Jankowski
0c3c06f7cc
Remove vendor prefix from mobile-web-app-capable meta tag ( #31845 )
2024-09-10 17:32:58 +00:00
Matt Jankowski
da07adfe6c
Add CustomEmoji.enabled scope ( #31830 )
2024-09-10 13:21:40 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
Eugen Rochko
3929e3c6d2
Change design of hide media button in web UI ( #31807 )
2024-09-10 09:29:17 +00:00
github-actions[bot]
5260233b81
New Crowdin Translations (automated) ( #31835 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-10 09:22:49 +00:00
Matt Jankowski
5b995143f1
Use with_options for shared Account validation option value ( #31827 )
2024-09-10 08:03:45 +00:00
Matt Jankowski
d0ab94c4d2
Add FeaturedTag coverage, use pick in model ( #31828 )
2024-09-09 19:57:19 +00:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
Eugen Rochko
a021dee642
Change labels on thread indicators in web UI ( #31806 )
2024-09-09 15:28:54 +00:00
github-actions[bot]
2caa3f365d
New Crowdin Translations (automated) ( #31800 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-09 12:38:43 +00:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 ( #31814 )
2024-09-09 10:59:42 +00:00
Matt Jankowski
e6969cf4e4
Add method for media-referencing status in AccountStatusCleanupPolicy ( #31798 )
2024-09-09 08:33:51 +00:00
Mike Dalessio
82161d8ae5
Change Account::Field parsing to use HTML5::DocumentFragment ( #31813 )
2024-09-08 18:56:18 +00:00
Mike Dalessio
afa2e257e4
Change verify link service to use CSS selectors instead of a complex XPath query ( #31815 )
2024-09-08 18:50:22 +00:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
Claire
5c97ccf939
Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream
2024-09-06 20:10:53 +02:00
Claire
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
Claire
b716248fc5
Add link to /admin/roles in moderation interface when changing someone's role ( #31791 )
2024-09-06 17:21:49 +00:00
Matt Jankowski
7335a43b6d
Use async count in admin dashboard ( #30606 )
2024-09-06 16:52:35 +00:00
Matt Jankowski
0a433d08fb
Move shares/modal body class to layout ( #31789 )
2024-09-06 16:46:55 +00:00
Matt Jankowski
4f81ad2494
Add coverage for media#player, move body class to view ( #31790 )
2024-09-06 16:46:25 +00:00
Emelia Smith
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
Matt Jankowski
a9d0b48b65
Set "admin" body class from admin nested layout ( #31269 )
2024-09-06 13:58:46 +00:00
Emelia Smith
fd7fc7bdc3
Disable actions on reports that have already been taken ( #31773 )
2024-09-06 12:50:30 +00:00
Matt Jankowski
be77a1098b
Extract Account::AUTOMATED_ACTOR_TYPES for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
github-actions[bot]
cc4865193a
New Crowdin Translations (automated) ( #31781 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-06 07:38:08 +00:00
Matt Jankowski
7efe0bde9d
Add have_http_link_header matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
Michael Stanclift
db6b1fe8fb
[Glitch] Fix radio checkbox visibility in Report dialogs
...
Port b4b639ee4a
2024-09-05 20:40:31 +02:00
Eugen Rochko
cb324b5d7c
[Glitch] Change design of unread conversations in web UI
...
Port ec4c49082e
2024-09-05 20:40:04 +02:00
Claire
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
Eugen Rochko
bc435c63bd
Change width of columns in advanced web UI ( #31762 )
2024-09-05 14:57:53 +00:00
Matt Jankowski
d58faa2018
Remove references to deprecated Import model ( #31759 )
2024-09-05 14:07:17 +00:00
Michael Stanclift
b4b639ee4a
Fix radio checkbox visibility in Report dialogs ( #31752 )
2024-09-05 12:34:13 +00:00
Matt Jankowski
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
James May
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
Eugen Rochko
b265a654d7
Fix wrong width on content warnings and filters in web UI ( #31761 )
2024-09-05 09:46:11 +00:00
github-actions[bot]
eb23d9f0f6
New Crowdin Translations (automated) ( #31765 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-05 09:40:38 +00:00
Eugen Rochko
ec4c49082e
Change design of unread conversations in web UI ( #31763 )
2024-09-05 09:39:59 +00:00
Matt Jankowski
4678473e54
Add AnnualReport::Source#report_statuses method for subclasses to use ( #31753 )
2024-09-04 19:50:33 +00:00
Claire
1fb31ad9b1
[Glitch] Fix display name being displayed instead of domain in remote reports
...
Port 585e369e0b
2024-09-04 19:43:21 +02:00
Claire
1d86377ba9
[Glitch] Fix all notification types being stored without filtering when polling
...
Port fab29ebbe8
2024-09-04 19:42:45 +02:00
Claire
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
Claire
559958f8c5
Fix email language when recipient has no selected locale ( #31747 )
2024-09-04 17:35:40 +00:00
Matt Jankowski
fe04291af4
Use more accurate beginning/ending times in annual report source ( #31751 )
2024-09-04 17:19:53 +00:00
Claire
585e369e0b
Fix display name being displayed instead of domain in remote reports ( #31613 )
2024-09-04 13:43:08 +00:00
Claire
fab29ebbe8
Fix all notification types being stored without filtering when polling ( #31745 )
2024-09-04 13:28:16 +00:00
Claire
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
Matt Jankowski
58df00f04d
Extract method for self-referencing records in AccountStatusCleanupPolicy ( #31244 )
2024-09-04 08:52:37 +00:00
github-actions[bot]
1c17dca6d9
New Crowdin Translations (automated) ( #31741 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-04 08:42:36 +00:00
Christian Schmidt
8e3c47aff5
[Glitch] frequentlyUsedLanguages not updated correctly
...
Port 8adf67f2db
2024-09-03 21:55:32 +02:00
Claire
663cebbe3b
[Glitch] Fix radio buttons styling in web UI
...
Port 0437dd9e77
2024-09-03 21:54:41 +02:00
Claire
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
Christian Schmidt
8adf67f2db
frequentlyUsedLanguages not updated correctly (#31386 )
2024-09-03 15:55:13 +00:00
Matt Jankowski
7c26e5e4a1
Add Reviewable model concern ( #31152 )
2024-09-03 15:37:45 +00:00
Matt Jankowski
2f0d0fc127
Add coverage for CLI::Accounts#fix_duplications task ( #30639 )
2024-09-03 15:36:59 +00:00
Matt Jankowski
5b595b8a5a
Remove usage of assigns in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
Claire
ae363f0555
Fix spacing between icons and labels in settings/admin interface ( #31728 )
2024-09-03 14:43:34 +00:00
Claire
ea0d691e19
Add GET /api/v2_alpha/notifications/:group_key/accounts ( #31725 )
2024-09-03 14:32:26 +00:00
Matt Jankowski
c9641c8070
Remove un-needed edge case sort condition in languages helper ( #31724 )
2024-09-03 13:19:48 +00:00
Claire
0437dd9e77
Fix radio buttons styling in web UI ( #31723 )
2024-09-03 11:37:09 +00:00
Claire
e9adba60af
[Glitch] Fix not being able to load more notifications after trimming
...
Port c1795ee963
2024-09-03 12:13:19 +02:00
Claire
ac4002fe08
Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream
2024-09-03 12:12:23 +02:00
Matt Jankowski
2a244e2fdb
Remove unused merge_context helper ( #31703 )
2024-09-03 08:59:37 +00:00
Matt Jankowski
48379e62e4
Remove unused User#inactive_message method ( #31698 )
2024-09-03 08:04:00 +00:00
Matt Jankowski
406b8211f5
Remove unused Mention#active? method ( #31697 )
2024-09-03 08:03:25 +00:00
github-actions[bot]
e5155c50fd
New Crowdin Translations (automated) ( #31716 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-03 08:02:08 +00:00
Christian Schmidt
a5bbe83dfd
media_ids is an array of strings ( #31709 )
2024-09-02 20:18:09 +00:00
Claire
c1795ee963
Fix not being able to load more notifications after trimming ( #31652 )
2024-09-02 20:14:04 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
Christian Schmidt
491033c86c
Reject status creation with invalid media_ids parameter ( #31681 )
2024-09-02 15:30:48 +00:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
Claire
a23b3747ac
Fix N+1s in grouped notifications ( #31638 )
2024-09-02 09:56:00 +00:00
github-actions[bot]
2f2b98c8cb
New Crowdin Translations (automated) ( #31671 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-02 08:35:09 +00:00
Claire
b06907e4e4
Rewrite favourite modal as a Typescript functional component, use revamped design ( #2831 )
2024-08-31 18:41:25 +02:00
Claire
ee2c38fcb8
[Glitch] Change background color of notifications on private messages
...
Port 3ddeaca863
2024-08-31 16:10:55 +02:00
Claire
4f1da814a8
[Glitch] Fix inconsistencies between code and notification source translation strings
...
Port 35538fe694
2024-08-31 16:10:26 +02:00
Claire
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Claire
3ddeaca863
Change background color of notifications on private messages ( #31657 )
2024-08-30 09:42:48 +00:00
Claire
35538fe694
Fix inconsistencies between code and notification source translation strings ( #31658 )
2024-08-30 09:37:39 +00:00
Matt Jankowski
1ee1c329cc
Convert admin/announcements controller spec to system spec ( #31655 )
2024-08-30 07:15:28 +00:00
github-actions[bot]
92eba9096b
New Crowdin Translations (automated) ( #31656 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-30 07:12:56 +00:00
Claire
ad0a28a8bf
Add grouped_types parameter to allow clients to restrict which notifications types get grouped ( #31594 )
2024-08-29 12:39:07 +00:00
Matt Jankowski
662f87dbe9
Use MediaAttachment.supported_mime_types method where relevant ( #31635 )
2024-08-29 08:52:29 +00:00
Matt Jankowski
b9269c8d38
Convert admin/reset controller spec to system spec ( #31643 )
2024-08-29 08:38:17 +00:00
github-actions[bot]
5d725b2c12
New Crowdin Translations (automated) ( #31647 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-29 08:30:39 +00:00
HolgerHuo
3c412578c9
update: max_media_attachments follow server advertised value ( #31616 )
2024-08-28 09:28:48 +00:00
github-actions[bot]
26d6d291c3
New Crowdin Translations (automated) ( #31627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-28 08:59:15 +00:00
Claire
435ff8e550
[Glitch] Add ability for admins to force grouped notifications in web UI
...
Port c73868cd78
2024-08-27 20:33:50 +02:00
Eugen Rochko
e15fad27bc
[Glitch] Change design of boost modal in web UI
...
Port 29b9642b31
2024-08-27 20:33:50 +02:00
Emelia Smith
d3629d191f
[Glitch] Add quick links to Administration and Moderation Reports from Web UI
...
Port d820c0883d
2024-08-27 20:16:52 +02:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Claire
33ad67fcea
Fix target account link in old report notifications
2024-08-27 18:11:14 +02:00
Claire
c73868cd78
Add ability for admins to force grouped notifications in web UI ( #31610 )
2024-08-27 14:55:51 +00:00
github-actions[bot]
0e7c88aa6d
New Crowdin Translations (automated) ( #31609 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-27 07:54:58 +00:00
Eugen Rochko
29b9642b31
Change design of boost modal in web UI ( #31555 )
2024-08-26 17:12:17 +00:00
Claire
2379bfe3ea
[Glitch] Fix spurious loading bar middleware usage
...
Port e38ce3beb7
2024-08-26 18:54:27 +02:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Emelia Smith
d820c0883d
Add quick links to Administration and Moderation Reports from Web UI ( #24838 )
2024-08-26 16:42:46 +00:00
Claire
e38ce3beb7
Fix spurious loading bar middleware usage ( #31592 )
2024-08-26 16:38:34 +00:00
Matt Jankowski
a6df125303
Fix Rails/CompactBlank cop ( #31581 )
2024-08-26 07:35:33 +00:00
github-actions[bot]
626d44b6c6
New Crowdin Translations (automated) ( #31572 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-26 07:25:39 +00:00
Noa Himesaka
ab4dd54fdf
fix: English not working
2024-08-24 23:22:21 +09:00
Noa Himesaka
3cd560117e
fix: error running #1
2024-08-24 23:12:32 +09:00
Noa Himesaka
28899f8c3e
fix: build
2024-08-24 23:05:38 +09:00
Noa Himesaka
744e0709d4
mastodon-modern 2.0.1
2024-08-24 23:00:28 +09:00
Noa Himesaka
bd3ef05053
Merge commit 'refs/pull/2462/head' of https://github.com/glitch-soc/mastodon
2024-08-24 22:54:36 +09:00
Noa Himesaka
acf40f349d
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-08-24 22:53:34 +09:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) ( #31559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
Claire
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
Claire
e18bd0450a
Extract strings removed upstream
2024-08-22 22:17:33 +02:00
Claire
7ce079cd26
[Glitch] Fix missing CSS in moderation interface
...
Port e08d22724d
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c
[Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
...
Port abe292b0ec
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3
[Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
...
Port 376088f6da
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Essem
e3dbd2e648
Fix grouped reaction notification text
2024-08-22 12:24:08 -05:00
Essem
4399c948fb
Fix reblog reactions being hydrated improperly
2024-08-22 12:24:00 -05:00
Essem
9b69c6468f
Fix i18n
2024-08-22 12:24:00 -05:00
Essem
1c57f5257b
Fix reactions bar alignment in grouped notifications
2024-08-22 12:24:00 -05:00
Essem
f02eee39f6
Add notification grouping for reactions
2024-08-22 12:24:00 -05:00
Essem
69adea4342
Turn custom emoji regexps into class level constants
2024-08-22 12:24:00 -05:00
Essem
c791890b77
Disable reactions in detailed status view when visibleReactions is 0
2024-08-22 12:24:00 -05:00
Jeremy Kescher
8104b63e6c
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code
2024-08-22 12:24:00 -05:00
Essem
524dd8c447
Fix reaction picker dropdown appearance
2024-08-22 12:23:59 -05:00
Essem
5edb855e67
Merge fixes
2024-08-22 12:23:59 -05:00
Essem
b42196e4c1
Hydrate reactions on streaming API
2024-08-22 12:23:59 -05:00
Essem
0db9282bd7
Purge status reactions on account delete
2024-08-22 12:23:59 -05:00
Essem
89e9f95e8b
Fix rubocop lint issue
2024-08-22 12:23:59 -05:00
Essem
4bcd275151
Refactor status reactions query
...
This was done to announcement reactions in 1b0cb3b54d
2024-08-22 12:23:59 -05:00
Essem
df6d11d630
Simplify reactions API controller
2024-08-22 12:23:58 -05:00
Essem
229fafe681
Update reaction emails
...
Reaction icon made by t3rminus@calamity.world
2024-08-22 12:23:58 -05:00
Essem
76ecfbd608
Revert variant selector normalization
...
Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.
2024-08-22 12:23:58 -05:00
Essem
ac7f4af7db
Move reaction normalization to API controller
2024-08-22 12:23:58 -05:00
Essem
7c28621855
Quick fixes
2024-08-22 12:23:58 -05:00
Essem
730370dcb4
Make name of like content parser function more general
2024-08-22 12:23:58 -05:00
Essem
c23c41915d
Normalize emojis with variant selectors
2024-08-22 12:23:57 -05:00
Essem
bc99b5434e
Check for content attribute in Misskey likes
2024-08-22 12:23:57 -05:00
Essem
254981f1ec
Add reaction notification column settings
...
This was in a previous PR. Not quite sure how it didn't carry over.
2024-08-22 12:23:57 -05:00
Essem
19ca103f3c
Linting fixes
2024-08-22 12:23:57 -05:00
Essem
09fc1ecb14
Refactor react services
2024-08-22 12:23:57 -05:00
Essem
991da0ce48
Fix reblog reactions
2024-08-22 12:23:57 -05:00
Essem
90b2d9e768
Add notification emails for reactions
2024-08-22 12:23:56 -05:00
Essem
26254c3c45
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-08-22 12:23:56 -05:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
98237207e6
Fix unnecessary “next” link when API returns fewer notification requests than requested ( #31541 )
2024-08-22 13:42:04 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) ( #31536 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
1e814f58cc
[Glitch] Remove dead CSS code
...
Port 2da687a28b
2024-08-21 20:33:39 +02:00
Claire
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
Claire
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
Claire
3ffdb7cdac
[Glitch] Remove fontawesome leftovers
...
Port edeae945c0
2024-08-21 18:52:40 +02:00
Claire
24849cdb1f
[Glitch] Add automatic notification polling for grouped notifications
...
Port d67e11733e
2024-08-21 18:51:27 +02:00
