monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,219 Commits 1 Branch 0 Tags 290 MiB
Commit Graph

14455 Commits

Author SHA1 Message Date
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 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
Matt Jankowski 4fb3dc0363
Extract `CSS_COLORS` constant for `UserRole` regex validation (#33532) 2025-01-10 09:02:48 +00:00
github-actions[bot] 846c89b66e
New Crowdin Translations (automated) (#33541) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-10 09:00:41 +00:00
Matt Jankowski f98972e4eb
Use `with_options` for Account `if: :local?` validation group (#33529) 2025-01-10 09:00:31 +00:00
Matt Jankowski 54e2030146
Add `AccountWarning#appeal_eligible?` method (#33526) 2025-01-09 15:08:39 +00:00
Matt Jankowski 3a4aed9890
Rename `app/helpers/jsonld_helper.rb` to `app/helpers/json_ld_helper.rb` (#33489) 2025-01-09 14:39:49 +00:00
Matt Jankowski 9b8d1fb6d1
Add `Account#actor_type_application?` query method (#33525) 2025-01-09 14:32:48 +00:00
Claire a8b2b474d7
Add timestamp to all announcements in Web UI (#18329) 2025-01-09 14:22:33 +00:00
Claire c6c8e7e6ab
Fix last paginated notification group only including data on a single notification (#33271) 2025-01-09 13:47:12 +00:00
Claire 91c75a6361
Re-introduce `application_id` in `ScheduledStatusSerializer` (#33505) 2025-01-09 13:38:23 +00:00
Christian Schmidt 8e2c642d44
Do now swallow response body on persistent connection (#32729) 2025-01-09 08:35:35 +00:00
github-actions[bot] 4e2c15b45d
New Crowdin Translations (automated) (#33522) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-09 08:21:47 +00:00
Claire 10e24113a8
Fix issue with “Translate” button being overlayed on text (#2935) 
Fixes #2932
 2025-01-08 18:25:09 +01:00
Claire dc14695f8a
Fix extraneous margins below CW in absence of mentions (#2936) 2025-01-08 18:24:57 +01:00
Claire 6b1ea8dd2c
Require specific subtype of `formatMessage` in `timeAgoString` (#33511) 2025-01-08 16:26:54 +00:00
Claire 1bf6195763
Fix use of deprecated `Iterable.isIndexed` from immutable (#33510) 2025-01-08 16:25:41 +00:00
Matt Jankowski f22a2aab40
Add `Account#remote?` query method (#33508) 2025-01-08 14:28:08 +00:00
Emelia Smith 15669fcf75
Include time portion in formatted datetimes when provided (#33191) 2025-01-08 14:26:08 +00:00
github-actions[bot] 35e57138f1
New Crowdin Translations (automated) (#33500) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-08 09:01:28 +00:00
Matt Jankowski c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
Matt Jankowski b3243ef41c
Refer to constant values from `api/v1/apps` request spec (#33488) 2025-01-07 16:28:54 +00:00
Matt Jankowski 7ad44e22ed
Remove role color highlighting from custom css (#33493) 2025-01-07 16:28:35 +00:00
Claire 82e046ea06
Fix preview card sizing in “Author attribution” in profile settings (#33482) 2025-01-07 11:29:38 +00:00
Nick Schonning c12b85e7a9
Fix Style/MultipleComparison (#33313) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2025-01-07 11:24:52 +00:00