24350 Commits

Author SHA1 Message Date
Claire
4b4de02fee
Remove broken link to Terms of Service when none are defined (#33699) 2025-01-23 14:34:30 +00:00
Claire
ffaf458f99
Change “Prohibited uses” section of ToS template according to feedback (#33703) 2025-01-23 14:09:33 +00:00
github-actions[bot]
1b2c952471
New Crowdin Translations (automated) (#33697)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-23 13:36:03 +00:00
Matt Jankowski
51ecc7326f
Fix intermittent services/ap/process_status_update tags failure (#33695) 2025-01-23 13:35:19 +00:00
Eugen Rochko
0885c31633
Add information about alt text to alt text modal in web UI (#33702) 2025-01-23 13:01:11 +00:00
Claire
db146046c4
Convert LanguageDropdown to a functional component (#33701) 2025-01-23 12:54:23 +00:00
Claire
45093e7abf [Glitch] Fix language detection taking mentions and URLs into account
Port 3178acc5cb8415a72b646dbe77be05255d3966f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-23 13:40:00 +01:00
Claire
38905ae658 [Glitch] Fix WebUI crash when language detection code returns undefined
Port 8dcfd3f246ff68d5bd190d57a8b7c422076a4943 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-23 13:38:35 +01:00
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
a6fc776c6f
Change mastodon:setup to prevent overwriting already-configured servers (#33684) 2025-01-22 15:34:22 +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
renovate[bot]
2a6a418f48
Update dependency irb to v1.15.1 (#33674)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-22 08:34:58 +00:00
Jonathan de Jong
e380e803a8
Order emoji categories (in admin interface) by name (#33630) 2025-01-22 08:31:51 +00:00
Claire
78a4d617a3
Merge pull request #2952 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8
2025-01-22 08:57:37 +01: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
b0bf355911
Merge pull request #2951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 4ebdfed8ea7d16d203da73051ef26bbcdeb63681
2025-01-21 13:22:49 +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
Matt Jankowski
7543c90642
Use bundler version 2.6.3 (#33658) 2025-01-21 08:00:35 +00:00
renovate[bot]
004e120e02
Update dependency selenium-webdriver to v4.28.0 (#33667)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-21 07:59:52 +00:00
Claire
c400122665
Merge pull request #2950 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 7f866daf637e9303c7b503e0ed29ef8802fcb4c0
2025-01-20 23:52:49 +01: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
renovate[bot]
7f866daf63
Update formatjs monorepo (#33652)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-20 10:36:25 +00:00
renovate[bot]
2deab346b3
Update dependency nokogiri to v1.18.2 (#33651)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-20 10:36:21 +00:00
renovate[bot]
a0c76f6017
Update dependency i18n to v1.14.7 (#33650)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-20 10:36:19 +00:00
Claire
ac59ed39dd
Fix re-encoding of high-framerate VFR videos with FFmpeg 6+ (#33634) 2025-01-20 09:22:49 +00: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
0d09884521
Merge pull request #2947 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 4bd969e4bb54297981d385903bf8a4348b394f09
2025-01-18 15:01:00 +01: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
Nicholas La Roux
4bd969e4bb
Fix broken CONTRIBUTING link in DEVELOPMENT (#33637) 2025-01-17 15:53:32 +00:00
Matt Jankowski
bc63f2b908
Update CONTRIBUTING doc with various clarifications (#33517) 2025-01-17 15:38:06 +00:00
Claire
ab4874ff13
Further harden the warnings against changing encryption secrets (#33631) 2025-01-17 10:42:52 +00:00