tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
17500 Commits
Author SHA1 Message Date
github-actions[bot]andGitHub Actions 6d3eb43500 New Crowdin Translations (automated) (#37863) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-16 09:14:21 +00:00
Jeong ArmandCursor 5b106a3453 [Fix undefined current_flavour in controllers (/settings/flavours page) (#3400) 
* [Glitch] Fix undefined `current_flavour` in controllers

After the theming infrastructure migration (#37612, #37807),
`ThemingConcern` was removed and theme-related methods were moved
to `ThemeHelper`. However, controllers like `Settings::FlavoursController`
call `current_flavour` directly in their actions, which is not accessible
from a view helper module.

Include `ThemeHelper` in `ApplicationController` to restore access to
`current_flavour`, `current_skin`, `current_theme`, and other theme
methods in all controllers.

Co-authored-by: Cursor <cursoragent@cursor.com>

* Include ThemeHelper in Settings::FlavoursController instead of ApplicationController

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-16 09:20:51 +01:00
Claire 114105a788 [Glitch] Fix quote-inline fallback being removed even for legacy quotes (#3402) 
Port 2a9c7d2b9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-15 14:59:38 +01:00
github-actions[bot]andGitHub Actions 4149067b18 New Crowdin translations (#3382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-14 22:03:41 +01:00
Echo ce4b913792 [Glitch] Emoji: Cache data by path instead of just Etag 
Port 3d0a6ba831 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:42 +01:00
Echo 66027e4057 [Glitch] Profile redesign: About tab 
Port f5aa5adcf7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:14 +01:00
Claire 5f72148834 Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream 2026-02-13 18:26:08 +01:00
Matt Jankowski 56ecdde152 Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856) 2026-02-13 15:54:41 +00:00
Echo 3d0a6ba831 Emoji: Cache data by path instead of just Etag (#37858) 2026-02-13 15:23:22 +00:00
Echo f5aa5adcf7 Profile redesign: About tab (#37851) 2026-02-13 13:37:39 +00:00
Claire 00f16a1863 [Glitch] Fix delete & redraft of pending posts 
Port ab9aa25cd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:05:52 +01:00
Echo c0fe6f8600 [Glitch] Fixes appearing in Following list 
Port 45057d1df2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:04:15 +01:00
Claire ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
David Roetzel 6c3bd944f8 Allow reporting (local) Collections (#37848) 2026-02-13 11:11:44 +00:00
github-actions[bot]andGitHub Actions a3f34137fd New Crowdin Translations (automated) (#37853) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-13 10:45:32 +00:00
Claire ab9aa25cd3 Fix delete & redraft of pending posts (#37839) 2026-02-13 10:32:16 +00:00
Echo 45057d1df2 Fixes appearing in Following list (#37854) 2026-02-13 10:03:57 +00:00
diondiondion f40f529905 [Glitch] Implement Collection list item design 
Port c44cc1f5c3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:04:00 +01:00
diondiondion 629bb4989d [Glitch] Fix bad visibility of scroll buttons on follow-suggestions carousel 
Port 46fd341685 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:03:28 +01:00
diondiondion f16bef3f7d [Glitch] Theme tokens sync 
Port e4bb347f72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:02:22 +01:00
Claire e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
diondiondion c44cc1f5c3 Implement Collection list item design (#37850) 2026-02-12 16:30:10 +00:00
David Roetzel f57167c61a Add ID/URI to collection items (#37842) 2026-02-12 15:31:45 +00:00
Matt Jankowski db64ae368f Use implicit class_names in 2FA partials (#37846) 2026-02-12 15:19:43 +00:00
diondiondion 46fd341685 Fix bad visibility of scroll buttons on follow-suggestions carousel (#37843) 2026-02-12 15:10:53 +00:00
diondiondion e4bb347f72 Theme tokens sync (#37841) 2026-02-12 11:33:28 +00:00
David Roetzel 37d859db29 Federate deletion of collection item (#37837) 2026-02-12 10:39:13 +00:00
github-actions[bot]andGitHub Actions 6e8df21233 New Crowdin Translations (automated) (#37836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-12 08:59:31 +00:00
Echo f90670683a [Glitch] Make pinning and unpinning directly modify state 
Port ca9966ce2f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 20:58:55 +01:00
diondiondion f842ce2206 [Glitch] Add useStorageState hook 
Port f99c60a8f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 20:58:54 +01:00
Echo 02a7f74976 [Glitch] Profile redesign: Show yourself in follower list 
Port bbd88d356d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 20:58:54 +01:00
Nicholas La Roux 5272a18855 [Glitch] Update various eslint packages and correct offences 
Port 062d0b454b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 20:29:09 +01:00
diondiondion d3e972465d [Glitch] Add Cmd/Ctrl+Enter to submit when Textarea is focused 
Port 8c2c94fa6c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 20:28:32 +01:00
Claire 2373c5a132 Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream 2026-02-11 20:26:56 +01:00
Echo ca9966ce2f Make pinning and unpinning directly modify state (#37831) 2026-02-11 16:58:00 +00:00
Claire 9129f98776 Process actor public keys when they are in a separate document without the ActivityStreams context (#37826) 2026-02-11 15:47:24 +00:00
Claire dfe44bcaef Add ability to require 2FA for specific roles (including Everybody) (#37701) 2026-02-11 14:34:09 +00:00
David Roetzel 3e1127d27b Federate Add when item is added to Collection (#37823) 2026-02-11 13:52:29 +00:00
diondiondion f99c60a8f3 Add useStorageState hook (#37825) 2026-02-11 13:30:53 +00:00
Echo bbd88d356d Profile redesign: Show yourself in follower list (#37813) 2026-02-11 13:19:18 +00:00
Claire 2f8ecb894e Fix generation of static error pages in glitch-soc 2026-02-11 14:12:46 +01:00
Claire 01b576efed Add skin migrations for glitch-soc 2026-02-11 13:49:27 +01:00
Echo c7b08d8f19 [Glitch] Profile redesign: Account filter fixes 
Port 0279a52216 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-11 13:37:19 +01:00
Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Nicholas La Roux 062d0b454b Update various eslint packages and correct offences (#37814) 2026-02-11 11:24:22 +00:00
diondiondion 8c2c94fa6c Add Cmd/Ctrl+Enter to submit when Textarea is focused (#37821) 2026-02-11 10:44:20 +00:00
github-actions[bot]andGitHub Actions cc75188a76 New Crowdin Translations (automated) (#37817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-11 09:11:56 +00:00
Echo 0279a52216 Profile redesign: Account filter fixes (#37811) 2026-02-10 17:20:02 +00:00
Echo b7d5607dd1 [Glitch] Profile redesign: Quality pass 
Port fb89198460 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-10 18:09:26 +01:00
Claire d89db37e93 Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream 2026-02-10 18:02:15 +01:00