Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,275 Commits 74 Branches 58 Tags
05e5db91c74a03dea89876409c2d3cc1b7146fc0
Commit Graph

14478 Commits

Author SHA1 Message Date
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 4ebdfed8ea 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 8962f11578 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 e9462960a7 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 e2f085e2b2 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
Daniel M Brasil
0db7558822 Fix HTTP 500 on POST /api/v1/admin/ip_blocks (#29308) 2025-01-13 13:50:58 +00:00
Jonathan de Jong
3a762cddf6 Reject announce payload if object is nil (#33570) 2025-01-13 13:35:16 +00:00
Matt Jankowski
3c4a83fc62 Remove unused LanguagePresenter#native_name (#33551) 2025-01-13 12:58:53 +00:00
Claire
68d818121d Switch webpush dependency to latest version of Mastodon-maintained fork (#33572) 2025-01-13 12:46:32 +00:00
Claire
50449ae7ac Fix media preview height in compose form when 3 or more images are attached (#33571) 2025-01-13 11:48:47 +00:00
Claire
d517fa5ab7 Change ActivityPub path generation to all happen in ActivityPub::TagManager (#33527) 2025-01-13 09:39:05 +00:00
github-actions[bot]
53885b0fdb New Crowdin Translations (automated) (#33559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-13 09:13:47 +00:00
Matt Jankowski
22c1b6f3ee Fix Invite#code changing value on every save (#33550) 2025-01-10 20:34:18 +00:00
Claire
0270bd2ee5 [Glitch] Require specific subtype of formatMessage in timeAgoString 
Port 6b1ea8dd2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-10 20:56:20 +01:00
Claire
00f410a089 [Glitch] Fix use of deprecated Iterable.isIndexed from immutable 
Port 1bf6195763 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-10 20:55:27 +01:00
Emelia Smith
fb48fc4cce [Glitch] Include time portion in formatted datetimes when provided 
Port JS part of 15669fcf75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-10 20:53:48 +01:00
Claire
19b9884bb2 [Glitch] Fix preview card sizing in “Author attribution” in profile settings 
Port 82e046ea06 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-10 20:53:12 +01:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
4f6edc7596 Use in_order_of in trends/* classes (#33531) 2025-01-10 09:33:07 +00:00