Jeremy Kescher
8292e2c912
Merge remote-tracking branch 'upstream/main' into develop
CodeQL / Analyze (ruby) (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-21 19:12:23 +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
Jeremy Kescher
2819f96f93
Prevent status content click on detailed status view again
2024-09-20 13:18:55 +02:00
Jeremy Kescher
566205ab1c
Rename Mastodon::RejectPayload to Mastodon::RejectPayloadError to match naming scheme for ValidationErrors
2024-09-20 11:56:27 +02:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02: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
