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

10069 Commits

Author SHA1 Message Date
Claire
e9793971b3 Merge commit 'ad77ee7f8ba6aa25ee36e3e21c38d9bbc252b097' into glitch-soc/merge-upstream 2026-01-19 18:01:57 +01:00
github-actions[bot]
e4c6130f77 New Crowdin Translations (automated) (#37532) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-19 09:40:47 +00:00
Echo
40d5c00c3a [Glitch] Profile fields redesign 
Port 047338e684 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:54:33 +01:00
Claire
d5fb44da91 [Glitch] Fix error pages not using the new theming infrastructure 
Port 5727b866b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:54:33 +01:00
diondiondion
4c7bfca967 [Glitch] Add high-contrast styles to common stylesheet 
Port e715bb5075 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 23:24:50 +01:00
Claire
7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.
 2026-01-16 23:22:19 +01:00
Heath Dutton🕴️
edf50bd073 [Glitch] Fix directory showing load more button when no more profiles exist 
Port 93f5ed0fce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-16 22:31:54 +01:00
Claire
b6b6e142ba Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream modified `theme_color_tags` to work on color scheme rather than theme.
  Updated it as well.
- `app/views/layouts/embedded.html.haml`:
  Upstream changed the embed theme from `mastodon-light` to `system`.
  Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
  Accomodate `theme_color_tags` changes.
 2026-01-16 22:28:08 +01:00
Claire
5727b866b1 Fix error pages not using the new theming infrastructure (#37524) 2026-01-16 14:44:58 +00:00
diondiondion
e715bb5075 Add high-contrast styles to common stylesheet (#37523) 2026-01-16 13:57:48 +00:00
Echo
047338e684 Profile fields redesign (#37513) 2026-01-16 12:44:49 +00:00
github-actions[bot]
0d9fcb59a4 New Crowdin Translations (automated) (#37517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-16 09:17:56 +00:00
Echo
d748ed0434 [Glitch] Account header split up 
Port f2fb232e37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 19:14:19 +01:00
diondiondion
73d29e16b5 [Glitch] Enable theming via new HTML element attributes 
Port bc2f8a358f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 18:08:37 +01:00
Echo
4694013f86 [Glitch] MiniCard and MiniCardList components 
Port c09fbeb32f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-15 18:07:28 +01:00
Claire
ba45eb8764 Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how theming works, and in particular changed the set of HTML attributes.
  Adapted upstream's change.
 2026-01-15 18:02:35 +01:00
Heath Dutton🕴️
93f5ed0fce Fix directory showing load more button when no more profiles exist (#37465) 2026-01-15 17:02:17 +00:00
diondiondion
bc2f8a358f Enable theming via new HTML element attributes (#37477) 2026-01-15 16:04:27 +00:00
Echo
c09fbeb32f MiniCard and MiniCardList components (#37479) 2026-01-15 13:53:42 +00:00
Echo
f2fb232e37 Account header split up (#37490) 2026-01-15 13:45:30 +00:00
github-actions[bot]
47557f5b9e New Crowdin Translations (automated) (#37492) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-15 10:41:11 +00:00
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