Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,561 Commits 74 Branches 58 Tags
1ce0733cac6384ea470c511ca78847a00c3f534c
Commit Graph

8262 Commits

Author SHA1 Message Date
Claire
1ce0733cac Add option to stretch columns to available width (#3040) (#3042) 2025-04-15 13:57:49 +02:00
Claire
459e3451b6 Merge commit '6f16011c5a46bfa131cc1d6be89347dcff1b0fc1' into glitch-soc/merge-4.3 2025-04-02 12:10:24 +02:00
Jeong Arm
58d2c7b481 Merge pull request #2972 from tribela/fix-secondary-button 
Fix secondary post button alignment
 2025-04-02 12:09:17 +02:00
github-actions[bot]
527d9200d0 New Crowdin Translations for stable-4.3 (automated) (#34336) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-01 11:10:20 +02:00
Claire
cbb9b83160 [Glitch] Fix bookmarks and favourites not being filtered 
Port 2eb6d815d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-31 20:17:32 +02:00
Claire
51fcb9ca99 [Glitch] Fix filters not applying in detailed view 
Port 8c3eeb4d29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-31 20:15:13 +02:00
Claire
4a271072f5 Merge commit '6d53e8c6c5273bc8405ed8cf10ec6455ad7cc677' into glitch-soc/merge-4.3 2025-03-31 19:55:39 +02:00
Claire
105e5b1d76 Fix bookmarks and favourites not being filtered (#34260) 2025-03-31 15:38:00 +02:00
Claire
d6442b5455 Fix filters not applying in detailed view (#34259) 2025-03-31 15:38:00 +02:00
Claire
2340f4df81 Fix “x” hotkey not working on boosted filtered posts (#33758) 2025-03-31 15:38:00 +02:00
Claire
24304fbbe6 [Glitch] Change hashtag suggestion to prefer personal history capitalization 
Port 62f019252a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-10 12:25:32 +01:00
Claire
644caeb156 [Glitch] Fix preview cards under Content Warnings not being shown in detailed statuses 
Port 1ed1cdba1b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-10 12:25:06 +01:00
Claire
ad92660de6 [Glitch] Fix username and display name being hidden on narrow screens in moderation interface 
Port b73e968641 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-10 12:23:53 +01:00
Claire
c5d17a3997 Merge commit 'a8613b7cda61e46209cace4379a9dea81f45529e' into glitch-soc/merge-4.3 2025-03-10 12:20:09 +01:00
Claire
62f019252a Change hashtag suggestion to prefer personal history capitalization (#34070) 2025-03-10 10:14:17 +01:00
Claire
1ed1cdba1b Fix preview cards under Content Warnings not being shown in detailed statuses (#34068) 2025-03-10 10:14:17 +01:00
Claire
b73e968641 Fix username and display name being hidden on narrow screens in moderation interface (#33064) 2025-03-10 10:14:17 +01:00
Claire
559f7a8e61 [Glitch] Fix media preview height in compose form when 3 or more images are attached (#2988) 
Port 50449ae7ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-08 16:13:49 +01:00
Claire
fba7e85b9b [Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji 
Port 44f5f1f0a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-25 18:40:30 +01:00
Claire
bc95675236 [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-02-25 18:39:00 +01:00
Eugen Rochko
ccc4fcbdb8 [Glitch] Fix notification polling showing a loading bar in web UI 
Port e856838e0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-25 18:38:35 +01:00
Oliver Geer
e3afbab115 [Glitch] Fix accounts table long display name 
Port 0ad5c212c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-25 18:38:12 +01:00
Claire
baac429103 Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
  In addition, upstream changed how notifications from follow subscriptions were
  handled, refactoring this file in the process.
  Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.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.
 2025-02-25 18:33:54 +01:00
github-actions[bot]
b1a584d252 New Crowdin Translations for stable-4.3 (automated) (#33999) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-25 17:12:07 +01:00
Claire
2954c2facb Change preview cards to be shown when Content Warnings are expanded (#33827) 2025-02-25 17:11:09 +01:00
Claire
44e38b79de Fix emoji rewrite adding unnecessary curft to the DOM for most emoji (#33818) 2025-02-25 17:11:09 +01:00
Claire
7ad9581940 Fix media preview height in compose form when 3 or more images are attached (#33571) 2025-02-25 17:11:09 +01:00
Claire
e4f2a054c9 Fix preview card sizing in “Author attribution” in profile settings (#33482) 2025-02-25 17:11:09 +01:00
Claire
68eb62f4a9 Fix processing of incoming notifications for unfilterable types (#33429) 2025-02-25 17:11:09 +01:00
Eugen Rochko
fa2625a0d9 Fix notification polling showing a loading bar in web UI (#32960) 2025-02-25 17:11:09 +01:00
Oliver Geer
1005b2f7b2 Fix accounts table long display name (#29316) 2025-02-25 17:11:09 +01:00
Claire
df0b641914 [Glitch] Fix duplicate notifications in notification groups when using slow mode 
Port 4bfb8887bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:58:22 +01:00
Claire
624b942c2e [Glitch] Redesign Content Warning and filters 
Port 393f0a0159 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:57:14 +01:00
Claire
cfa2e0503a [Glitch] Fix alt-text pop-in not using the translated description 
Port 0a1b5df202 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:57:00 +01:00
Renato "Lond" Cerqueira
de945eef63 [Glitch] Fix 'unknown' media attachment rendering in detailed view 
Port 01e25af2e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:56:45 +01:00
Claire
9a7030fb69 [Glitch] Fix preview cards with long titles erroneously causing layout changes 
Port 742eb549ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:56:24 +01:00
Nathan Sparrow
221da1ba04 [Glitch] Embed modal mobile fix 
Port de1d8dc63a

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:56:05 +01:00
David Roetzel
ff85540904 [Glitch] Do not change follow counters when already following 
Port 029c99bd7b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:55:41 +01:00
Emelia Smith
c2862049a2 [Glitch] Fix 'unknown' media attachment type rendering 
Port 346cdb998c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-02 21:55:26 +01:00
Claire
0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-12-02 21:49:12 +01:00
github-actions[bot]
26f25ef4ba New Crowdin Translations for stable-4.3 (automated) (#33135) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-02 16:53:28 +01:00
Claire
90c7c1bf7d Fix duplicate notifications in notification groups when using slow mode (#33014) 2024-12-02 16:20:32 +01:00
Claire
c634da32cf Redesign Content Warning and filters (#32543) 2024-12-02 16:20:32 +01:00
Claire
2d8ce9e19a Fix alt-text pop-in not using the translated description (#32766) 2024-12-02 16:20:32 +01:00
Renato "Lond" Cerqueira
1ddf1aedf1 Fix 'unknown' media attachment rendering in detailed view (#32713) 2024-12-02 16:20:32 +01:00
Claire
931870ca34 Fix preview cards with long titles erroneously causing layout changes (#32678) 2024-12-02 16:20:32 +01:00
Nathan Sparrow
7f9b0f36ba Embed modal mobile fix (#32641) 2024-12-02 16:20:32 +01:00
David Roetzel
c13b8026f0 Do not change follow counters when already following (#32622) 2024-12-02 16:20:32 +01:00
Emelia Smith
bf1375ae37 Fix 'unknown' media attachment type rendering (#32613) 2024-12-02 16:20:32 +01:00
Claire
5d79af928c Fix collapse icon opening the post (#2899) 2024-11-24 18:36:54 +01:00