tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,536 Commits 5 Branches 0 Tags
Commit Graph

5107 Commits

Author SHA1 Message Date
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
github-actions[bot]
1468f94509
New Crowdin Translations (automated) (#37555) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-21 13:08:16 +00:00
Echo
e79d51ce19
Profile redesign: verified badges (#37538) 2026-01-21 13:08:08 +00:00
Echo
22ec368574
Profile redesign: Badges (#37550) 2026-01-20 15:15:49 +00:00
Claire
5d04c56c48 Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream 2026-01-20 16:14:14 +01:00
Echo
a1c17fef3a
Profile redesign: Account name (#37527) 2026-01-20 11:10:46 +00:00
diondiondion
fa9b905fdf
Improve apiRequest helper types (#37544) 2026-01-20 11:04:06 +00:00
github-actions[bot]
8ff7662918
New Crowdin Translations (automated) (#37545) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-20 08:31:49 +00:00
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
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
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
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
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
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
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
Claire
d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +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
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
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
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
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
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
8d9192835d
Add stub story for StatusQuoteManager / Status component (#37321) 2025-12-19 15:18:10 +00:00
Echo
f254b47067
Remove trailing variation selector code for legacy emojis (#37320) 2025-12-19 13:43:27 +00:00