Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 19:21:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
27,463 Commits 75 Branches 73 Tags
f65e6a5029b12167a7ca511c98640a2f9120c282
Commit Graph

10048 Commits

Author SHA1 Message Date
Claire
f65e6a5029 Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream 2026-01-14 20:31:42 +01:00
github-actions[bot]
2f91d9755d New Crowdin Translations (automated) (#37482) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-14 10:02:11 +00:00
Echo
aa83f94ac1 [Glitch] Add feature flag detection for profile redesign 
Port 122b1592ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:37 +01:00
diondiondion
beb23500b1 [Glitch] Fix isDarkMode utility 
Port 41639655ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:35:16 +01:00
Heath Dutton🕴️
e14af55640 [Glitch] Fix keyboard navigation in media modal after clicking image 
Port be60c4585e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-13 18:34:48 +01:00
Claire
b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
 2026-01-13 18:30:48 +01:00
Claire
e33a8d5bfb Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.
 2026-01-13 18:01:53 +01:00
Echo
122b1592ed Add feature flag detection for profile redesign (#37472) 2026-01-13 14:17:43 +00:00
diondiondion
41639655ff Fix isDarkMode utility (#37470) 2026-01-13 11:06:54 +00:00
Heath Dutton🕴️
be60c4585e Fix keyboard navigation in media modal after clicking image (#37464) 2026-01-13 10:47:04 +00:00
Claire
5b54cd7f76 Add ability to include inline javascript (#37459) 2026-01-13 10:40:26 +00:00
github-actions[bot]
6cb533311a New Crowdin Translations (automated) (#37466) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-13 09:14:27 +00:00
Claire
478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
github-actions[bot]
8f70cfc8b1 New Crowdin Translations (automated) (#37447) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-12 09:54:19 +00:00
github-actions[bot]
6541d7ed39 New Crowdin translations (#3335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-10 19:47:20 +01:00
Echo
aff69de399 [Glitch] Fix bug with how Emojibase wasn't stripping characters 
Port a4b8b9fe98 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:55 +01:00
diondiondion
18d4606cce [Glitch] Further clean up types for the card object 
Port 973fef4b69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:34 +01:00
Echo
124d6e37eb [Glitch] Emoji: Adds search 
Port 628fc9b95b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:05 +01:00
Echo
c5fd0d47da [Glitch] Remove trailing variation selector code for legacy emojis 
Port f254b47067 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:17:30 +01:00
Joshua Rogers
9d33d43006 [Glitch] Fix modal closeModal ignoreFocus payload type 
Port 25053db22b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:15:12 +01:00
Echo
bb640bd845 [Glitch] Video modals should not be pushed down on mobile 
Port de7b405e55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:14:49 +01:00
Claire
d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +01:00
Claire
3c1bf72e1a Fix custom emojis not being rendered in status prepend (#3342) 2026-01-10 13:11:50 +01:00
Echo
a4b8b9fe98 Fix bug with how Emojibase wasn't stripping characters (#37442) 2026-01-09 18:38:22 +00:00
diondiondion
973fef4b69 Further clean up types for the card object (#37023) 2026-01-09 14:40:27 +00:00
Echo
628fc9b95b Emoji: Adds search (#37418) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-09 10:37:14 +00:00
Joshua Rogers
25053db22b Fix modal closeModal ignoreFocus payload type (#37424) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-08 13:22:31 +00:00
github-actions[bot]
780c6378e0 New Crowdin Translations (automated) (#37407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-08 11:18:50 +00:00
Echo
de7b405e55 Video modals should not be pushed down on mobile (#37421) 2026-01-08 09:44:17 +00:00
Claire
3e4cd799fd Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream 2026-01-06 18:11:26 +01:00
github-actions[bot]
7e634eecbc New Crowdin Translations (automated) (#37394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-06 10:40:22 +00:00
Claire
0aa70234aa [Glitch] Fix custom emojis not being rendered in profile fields 
Port b622f4c698 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:51 +01:00
Claire
550240281e [Glitch] Fix outdated link target for “locked” warning 
Port e8a49bd6ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:29 +01:00
Claire
b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire
b622f4c698 Fix custom emojis not being rendered in profile fields (#37365) 2026-01-05 14:24:59 +00:00
Claire
e8a49bd6ae Fix outdated link target for “locked” warning (#37366) 2026-01-05 10:35:23 +00:00
github-actions[bot]
bdf490e949 New Crowdin Translations (automated) (#37378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-05 09:56:40 +00:00
Chan Nyein Tun
e826e0e281 [Glitch] Hide empty padding box if no status in Wrapstodon highlighted post 
Port 54bc97cfce to glitch-soc

Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:10:04 +01:00
Echo
06a49fa0d0 [Glitch] Prevents swiping when zoomed in 
Port 4bae3da85c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:08:16 +01:00
Claire
2ebf6d60a6 Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.
 2026-01-03 16:05:35 +01:00
diondiondion
cf461c79ca [Glitch] Add dedicated user preferences for theme mode & contrast 
Port a0ce77673c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 15:31:38 +01:00
Claire
c7ad055ff3 Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
 2026-01-03 15:26:58 +01:00
github-actions[bot]
04f7638224 New Crowdin Translations (automated) (#37326) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-02 13:48:08 +00:00
Chan Nyein Tun
54bc97cfce Hide empty padding box if no status in Wrapstodon highlighted post (#37289) 
Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
 2026-01-02 13:20:11 +00:00
Andy Piper
f32bed6809 Update keyboard shortcut description for direct mentions (#37347) 2026-01-02 11:15:24 +00:00
GitHub Actions
aace2679bd New Crowdin translations 2026-01-01 04:56:54 +00:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
Echo
4bae3da85c Prevents swiping when zoomed in (#37323) 2025-12-19 16:18:50 +00:00
diondiondion
a0ce77673c Add dedicated user preferences for theme mode & contrast (#37288) 2025-12-19 15:31:44 +00:00
diondiondion
8d9192835d Add stub story for StatusQuoteManager / Status component (#37321) 2025-12-19 15:18:10 +00:00