mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,834 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

23834 Commits (28751ff04244bffc4b21ecc4b4e6dd0df2358563)

Author SHA1 Message Date
Claire 28751ff042
Remove status background feature (#2640) 2024-12-10 08:55:08 +01:00
Claire ec9f360217
Merge pull request #2912 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 752d49eefe
 2024-12-02 22:23:47 +01:00
Eugen Rochko 119b7583fd [Glitch] Change profile bios to be displayed during onboarding in web UI 
Port ca11740dc9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:12:14 +01:00
Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
 2024-12-02 21:08:15 +01:00
Claire 543eced5a1
Port missed CSS change from latest ported upstream changes (#2911) 2024-12-02 21:06:07 +01:00
Matt Jankowski 752d49eefe
Add coverage for `api/v1/push/subscriptions#show` action (#33134) 2024-12-02 15:08:41 +00:00
renovate[bot] de37bc7722
Update dependency json-schema to v5.1.1 (#33132) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 15:08:37 +00:00
Jonathan de Jong 360b6d3a44
Fix exclusive lists interfering with notifications (#28162) 2024-12-02 09:26:04 +00:00
Claire 5c06fe4902
Fix processing incoming post edits with mentions to unresolvable accounts (#33129) 2024-12-02 09:24:34 +00:00
github-actions[bot] 4b80ff92bd
New Crowdin Translations (automated) (#33114) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-02 08:27:19 +00:00
renovate[bot] 459be1f4e7
Update dependency active_model_serializers to v0.10.15 (#33120) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 08:14:46 +00:00
Eugen Rochko ca11740dc9
Change profile bios to be displayed during onboarding in web UI (#33119) 2024-12-02 08:11:45 +00:00
renovate[bot] f72831b9c2
Update dependency aws-sdk-s3 to v1.175.0 (#33128) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 08:11:28 +00:00
renovate[bot] 9e8da55d99
Update docker/dockerfile Docker tag to v1.12 (#33127) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 08:11:25 +00:00
renovate[bot] 462e0717d6
Update devDependencies (non-major) (#33126) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-12-02 08:11:22 +00:00
Robert R George a98a8ee93f
Update robots.txt to prevent crawling of domain blocks (#26470) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 08:03:24 +00:00
Matt Jankowski a17e7d10fc
Always validate `inbox_url` presence on Relay (#32364) 2024-12-02 07:38:06 +00:00
Matt Jankowski 3cd308523a
Add shared example for `RankedTrend` concern (#33125) 2024-12-02 00:44:14 +00:00
Claire 5550f53a7e
Merge pull request #2910 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 75ecc6df06
 2024-12-01 23:05:31 +01:00
Eugen Rochko b55c31e01b [Glitch] Change "social web" to "fediverse" in a few banners in web UI 
Port 4de108e755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 19:04:36 +01:00
Eugen Rochko e03b5868a4 [Glitch] Change server rules to be collapsible 
Port 986a3676d3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 19:02:28 +01:00
Claire 10a24d67d4 Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-soc/merge-upstream 2024-12-01 18:57:49 +01:00
Eugen Rochko 64fc79cbc2 [Glitch] Change design of modal loading and error screens in web UI 
Port 7f2cfcccab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 18:47:56 +01:00
Emelia Smith 170f76c82c [Glitch] Add link from Web UI for Hashtags to the Moderation UI 
Port eef8d2c855 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 18:47:56 +01:00
Eugen Rochko f441e3db4e [Glitch] Change onboarding flow in web UI 
Port 7a3dea385e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 18:47:56 +01:00
Eugen Rochko cedacd6435 [Glitch] Remove old notifications route from web UI 
Port 429e08e3d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 18:47:56 +01:00
Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict due to upstream adding fallback support for MathML Core while
  glitch-soc supported slightly more tags than upstream.
  Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
  Ditto.
 2024-12-01 18:22:00 +01:00
Eugen Rochko bdbe7c30e7 [Glitch] Fix arrow in the wrong place on empty list members screen in web UI 
Port 1a88c05274 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 17:48:19 +01:00
Claire a518b60bb3 [Glitch] Fix username and display name being hidden on narrow screens in moderation interface 
Port 1be83c6982 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 17:47:40 +01:00
Nick Schonning 0fcbdc01c5 [Glitch] Update immutable imports for v5 
Port 27e79da6b9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 17:46:58 +01:00
Oliver Geer c2f6ab6ae9 [Glitch] Fix accounts table long display name 
Port 0ad5c212c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 17:45:52 +01:00
Christian Schmidt b779f9e0b8 [Glitch] Fix CSS warnings 
Port 9ebed5d410 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-01 17:45:24 +01:00
Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00
Matt Jankowski 75ecc6df06
Fix typo `dimsiss` -> `dismiss` in changelog (#33116) 2024-11-30 21:37:17 +00:00
Eugen Rochko 4de108e755
Change "social web" to "fediverse" in a few banners in web UI (#33101) 2024-11-29 16:44:05 +00:00
Eugen Rochko 986a3676d3
Change server rules to be collapsible (#33039) 2024-11-29 16:33:06 +00:00
Yann 4635ce2926
Remove constant definition from global scope in embed.js (#33107) 2024-11-29 15:33:25 +00:00
Claire c58967c3bd
Add `tootctl feeds vacuum` (#33065) 2024-11-29 14:08:57 +00:00
Claire 9ff01403ea
Fix middle-click handling conflicting with automatic scrolling (#33106) 2024-11-29 14:04:22 +00:00
github-actions[bot] 9296d58024
New Crowdin Translations (automated) (#33104) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-29 09:39:52 +00:00
Eugen Rochko 7f2cfcccab
Change design of modal loading and error screens in web UI (#33092) 2024-11-29 07:50:08 +00:00
Emelia Smith eef8d2c855
Add link from Web UI for Hashtags to the Moderation UI (#31448) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-11-29 07:36:17 +00:00
Claire 7a4370f2d9
Fix inactive users' timelines being backfilled on follow and unsuspend (#33094) 2024-11-28 17:40:53 +00:00
Calvin Lee 7f4858b339
Correctly sanitize MathML out of post content (#27107) 2024-11-28 12:02:34 +00:00
Eugen Rochko 48f3ed738f
Fix list error messages (#33082) 2024-11-28 10:13:06 +00:00
github-actions[bot] fa3577e04b
New Crowdin Translations (automated) (#33084) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-28 10:10:38 +00:00
renovate[bot] e4bd3162e8
Update opentelemetry-ruby (non-major) (#33083) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-28 09:40:25 +00:00
Eugen Rochko 46c43d263c
Change avatar and header size limits from 2MB to 8MB when using libvips (#33002) 2024-11-26 21:01:52 +00:00
Eugen Rochko 7a3dea385e
Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
Eugen Rochko 429e08e3d2
Remove old notifications route from web UI (#33038) 2024-11-26 09:59:11 +00:00