14492 Commits

Author SHA1 Message Date
Eugen Rochko
bfb9092890 [Glitch] Refactor <DomainPill> into TypeScript
Port 8b24085f8e614568712102d1a4844d2c0ab58dd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-23 13:38:35 +01:00
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Claire
3178acc5cb
Fix language detection taking mentions and URLs into account (#33700) 2025-01-23 10:25:14 +00:00
Matt Jankowski
8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates (#33691) 2025-01-23 09:04:12 +00:00
Matt Jankowski
4a9c49ee43
Fix issue with saving empty fields values on profile update (#33689) 2025-01-22 18:50:15 +00:00
Claire
8dcfd3f246
Fix WebUI crash when language detection code returns undefined (#33683) 2025-01-22 15:30:59 +00:00
Matt Jankowski
607f65a0a5
Use expect for api/v1 and api/web push subs controllers (#33682) 2025-01-22 14:55:44 +00:00
Jonathan de Jong
b18caff5b6
Change first_of_value to first_of_hash, and add more test cases (#33647) 2025-01-22 14:02:05 +00:00
Matt Jankowski
e155aab39e
Use expect for nested params in settings/* controllers (#33673) 2025-01-22 08:49:52 +00:00
Eugen Rochko
8b24085f8e
Refactor <DomainPill> into TypeScript (#33680) 2025-01-22 08:39:13 +00:00
github-actions[bot]
38c27a7708
New Crowdin Translations (automated) (#33679)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-22 08:35:41 +00:00
Matt Jankowski
d2cc28813f
Use expect for nested params in more controllers (#33675) 2025-01-22 08:35:34 +00:00
Jonathan de Jong
e380e803a8
Order emoji categories (in admin interface) by name (#33630) 2025-01-22 08:31:51 +00:00
Eugen Rochko
5e7c079787 [Glitch] Change design of edit media modal in web UI
Port 11786f1114f9dfb5a17810d14477a94162f94064 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-21 19:43:38 +01:00
Claire
05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
2025-01-21 19:23:25 +01:00
Claire
3dcf5e12b1
Change notifications from moderators to not be filtered (#33654) 2025-01-21 11:39:53 +00:00
Eugen Rochko
11786f1114
Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire
785543b5a6 [Glitch] Fix opening modals losing some location parameters
Port 4ebdfed8ea7d16d203da73051ef26bbcdeb63681 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-21 12:07:40 +01:00
Claire
ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
Claire
4ebdfed8ea
Fix opening modals losing some location parameters (#33670) 2025-01-21 09:53:52 +00:00
github-actions[bot]
9e90248abc
New Crowdin Translations (automated) (#33668)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-21 08:37:53 +00:00
Matt Jankowski
45149cd5e1
Use expect for nested params in auth/setup#update (#33657) 2025-01-21 08:16:40 +00:00
Eugen Rochko
89b7f8884a [Glitch] Add warning when selected and detected language is different in web UI
Port 8962f1157816848b1eff8ee992410c120d4696e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-20 18:07:59 +01:00
Claire
08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
Eugen Rochko
8962f11578
Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
github-actions[bot]
329a9e1ac1
New Crowdin Translations (automated) (#33643)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-20 08:59:23 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
2025-01-18 12:42:17 +01:00
github-actions[bot]
1c23ebd62f
New Crowdin Translations (automated) (#33626)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-17 10:05:41 +00:00
Claire
092e60eb7d
Change activity distribution error handling to skip retrying for deleted accounts (#33617) 2025-01-17 09:12:59 +00:00
Christian Schmidt
a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Claire
da4e55eb17
Merge commit from fork 2025-01-16 11:10:08 +01:00
github-actions[bot]
4a44c47982
New Crowdin Translations (automated) (#33609)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-16 09:13:39 +00:00
Matt Jankowski
3db8498903
Fix Style/MutableConstant cop (#33602) 2025-01-16 09:09:06 +00:00
Matt Jankowski
998cf0dd53
Convert auth/setup spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
Claire
ad71a8d1f7 Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream 2025-01-15 19:32:04 +01:00
Plastikmensch
e489410b0f
Fix attachment list in conversation component (#2941)
`media` is no longer part of `StatusContent`, so the attachment list wasn't shown in the private mentions column.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-15 08:18:39 +01:00
Plastikmensch
5395154832
Fix media attachments in report modal
Media attachments weren't shown in the report modal since they were passed as `media` to `StatusContent`, but `StatusContent` doesn't use the media prop anymore.

Instead match the file with vanilla.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-14 23:47:09 +01:00
Claire
09bd5aa156 [Glitch] Redirect new users to onboarding
Port e9462960a7cf416b9e459d599a0f2cc8c5b070f0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 20:47:40 +01:00
Claire
563ff91cf8 [Glitch] Use final specification for new WebPush subscriptions in web interface
Port e2f085e2b2cec08dc1f5ae825730c2a3bf62e054 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 20:46:21 +01:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
Matt Jankowski
68c9f91ccb
Treat non-null but blank account domain as local (#33576) 2025-01-14 17:40:55 +00:00
Matt Jankowski
50013b10a5
Add Status::Visibility concern to hold visibility logic (#33578) 2025-01-14 14:32:57 +00:00
Claire
e9462960a7
Redirect new users to onboarding (#33471) 2025-01-14 13:10:48 +00:00
Claire
e2f085e2b2
Use final specification for new WebPush subscriptions in web interface (#33587) 2025-01-14 10:42:06 +00:00
S1m
4a2813158d
Add support for standard webpush (#33528)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
github-actions[bot]
ee4edbb94f
New Crowdin Translations (automated) (#33582)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-14 08:44:58 +00:00
Jeong Arm
74da9e9281
Fix custom css cache miss (#33583) 2025-01-14 08:24:00 +00:00
Wolfgang
77a44e61a8
Add enum validation to DomainBlock#severity (#29158) 2025-01-13 16:05:24 +00:00
Matt Jankowski
f9451c5614
Fix issue with trending order when user has chosen languages (#33557) 2025-01-13 14:27:30 +00:00