Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,587 Commits 74 Branches 58 Tags
be5c1cceea6837c969c6969bcc402cd0f9c1e7c0
Commit Graph

9584 Commits

Author SHA1 Message Date
Echo
be5c1cceea [Glitch] Emoji: Fix autoplay incorrectly being applied 
Port 7530f06dee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 19:26:41 +02:00
diondiondion
614dd00457 [Glitch] Restructure appearance settings to introduce new Advanced settings section 
Port SCSS changes from 05244c335d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 19:26:07 +02:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
Claire
383445c977 [Glitch] Fix pinned hashtag columns fully refreshing unprompted 
Port ef53dcfd8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:38:10 +02:00
diondiondion
2fb14cbb2b [Glitch] Show new replies early if the fetch-all-replies task takes long to finish 
Port 869eeecfee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:37:48 +02:00
diondiondion
0512ffcbcd [Glitch] Fix low-contrast hover colour of alert actions (light theme only) 
Port 28a42bb62c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:37:13 +02:00
Claire
f56fc1bab4 Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream 2025-10-16 18:36:25 +02:00
Echo
7530f06dee Emoji: Fix autoplay incorrectly being applied (#36503) 2025-10-16 12:46:17 +00:00
github-actions[bot]
5404f92cee New Crowdin Translations (automated) (#36494) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-16 10:29:07 +00:00
diondiondion
05244c335d Restructure appearance settings to introduce new Advanced settings section (#36496) 2025-10-16 09:44:24 +00:00
Claire
ef53dcfd8c Fix pinned hashtag columns fully refreshing unprompted (#36497) 2025-10-16 09:10:53 +00:00
diondiondion
869eeecfee Show new replies early if the fetch-all-replies task takes long to finish (#36481) 2025-10-15 17:30:47 +00:00
diondiondion
28a42bb62c Fix low-contrast hover colour of alert actions (light theme only) (#36484) 2025-10-15 15:38:36 +00:00
Matt Jankowski
ef3f2ced09 [Glitch] Update stylelint-config-standard-scss to version 16.0.0 
Port c6de46d12d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-15 16:42:23 +02:00
Emelia Smith
2ccab68636 [Glitch] Fix rendering of poll options in status history modal 
Port d8bdce2835 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-15 16:37:45 +02:00
Claire
ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Matt Jankowski
c6de46d12d Update stylelint-config-standard-scss to version 16.0.0 (#36429) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-15 11:30:09 +00:00
Emelia Smith
d8bdce2835 Fix rendering of poll options in status history modal (#35633) 2025-10-15 09:05:10 +00:00
github-actions[bot]
339673d533 New Crowdin Translations (automated) (#36476) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-15 08:54:47 +00:00
Claire
c4c906eb0c [Glitch] Fix error in logged-out hashtag view when remote posts require log-in 
Port 3232eee358 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:05:28 +02:00
Claire
7330ec670b [Glitch] Fix WebUI mistakenly allowing to attach quotes when editing 
Port 156f031ed0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:04:48 +02:00
Echo
8d1e67b6b2 [Glitch] Emoji: Cleanup new code 
Port 0c64e7f75e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:04:18 +02:00
diondiondion
a7f207604a [Glitch] Fix videos not being indented properly in thread view 
Port 9a001e7839 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:03:25 +02:00
Claire
302e3fe8be Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream 2025-10-14 18:01:40 +02:00
Claire
3232eee358 Fix error in logged-out hashtag view when remote posts require log-in (#36467) 2025-10-14 14:04:18 +00:00
github-actions[bot]
484225895f New Crowdin Translations (automated) (#36457) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-14 12:26:21 +00:00
Claire
156f031ed0 Fix WebUI mistakenly allowing to attach quotes when editing (#36464) 2025-10-14 12:21:13 +00:00
Echo
0c64e7f75e Emoji: Cleanup new code (#36402) 2025-10-14 09:36:25 +00:00
diondiondion
9a001e7839 Fix videos not being indented properly in thread view (#36459) 2025-10-14 08:58:03 +00:00
Echo
ed456a6446 [Glitch] Emoji: Picker native rendering 
Port edd7fd9872 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-13 18:07:21 +02:00
Claire
af82db5271 Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream 2025-10-13 18:07:08 +02:00
Echo
edd7fd9872 Emoji: Picker native rendering (#36454) 2025-10-13 15:29:39 +00:00
Claire
8921494571 Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream 2025-10-13 14:26:11 +02:00
github-actions[bot]
8b78c033e8 New Crowdin Translations (automated) (#36433) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-13 09:25:52 +00:00
Emelia Smith
5dff3414ce [Glitch] Improve display of content warnings in Admin UI 
Port 8898f120dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 19:01:38 +02:00
Emelia Smith
adc0e15167 [Glitch] Add support for displaying link previews for Admin UI 
Port 81350c7cfb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 19:01:38 +02:00
Claire
ee88f8550c Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream 2025-10-10 19:01:35 +02:00
github-actions[bot]
bcccfb19df New Crowdin Translations (automated) (#3224) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 18:52:05 +02:00
github-actions[bot]
3f2ee09827 New Crowdin Translations (automated) (#36420) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-10 09:06:57 +00:00
Emelia Smith
8898f120dc Improve display of content warnings in Admin UI (#35935) 2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb Add support for displaying link previews for Admin UI (#35958) 2025-10-10 08:43:48 +00:00
Echo
8a50fb02ce [Glitch] Fixes handled link formatting 
Port c858fc77ef to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 18:03:39 +02:00
Echo
3c3a812a9c [Glitch] Fix: Embed author handle using wrong DisplayName 
Port 258869278e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 18:03:15 +02:00
Echo
48bb64cde3 [Glitch] Emoji: Fixes issue with handled link not correctly showing remote users 
Port 5bc7c4b7e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 17:59:59 +02:00
Claire
490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
Echo
c858fc77ef Fixes handled link formatting (#36410) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-09 14:31:13 +00:00
Echo
258869278e Fix: Embed author handle using wrong DisplayName (#36413) 2025-10-09 14:08:36 +00:00
github-actions[bot]
a459ccf616 New Crowdin Translations (automated) (#36406) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-09 09:12:27 +00:00
Echo
5bc7c4b7e8 Emoji: Fixes issue with handled link not correctly showing remote users (#36403) 2025-10-08 17:17:03 +00:00
Echo
62fc92dfd8 [Glitch] Emoji: Announcements 
Port babb7b2b9d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-08 18:51:03 +02:00