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

726 Commits

Author SHA1 Message Date
Claire
89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Eugen Rochko
1bbe3872f2
Change validation to permit polls and media being combined (#39203) 2026-06-10 15:20:21 +00:00
diondiondion
2994e8543d
[Accessibility] Navigation focus handling polish (#39358) 2026-06-10 14:50:49 +00:00
diondiondion
bcb8553e01
[Accessibility] Manage focus on navigation (#39350) 2026-06-10 12:34:48 +00:00
Echo
9f7e2d0002
Emoji substring search (#39353) 2026-06-10 10:40:48 +00:00
Claire
c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
diondiondion
c08d13a65c
Fix missing null check when importing collections from notifications (#39300) 2026-06-05 10:01:55 +00:00
diondiondion
906ae955fb
Prefetch collection accounts for statuses and notifications (#39291) 2026-06-05 08:34:39 +00:00
diondiondion
fe4613ba32
Display collection in search results when searched by URL (#39289) 2026-06-04 14:28:51 +00:00
Claire
ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
diondiondion
0caf334891
Reduce account overfetching when displaying collection lists (#39220) 2026-05-29 15:27:57 +00:00
Echo
4101f567c5
Collection notification filtering (#39198) 2026-05-28 20:13:56 +00:00
Claire
06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
Echo
c39072ad9d
Emojis: Fix bug with search + improve custom tokenization (#39167) 2026-05-26 14:00:23 +00:00
Eugen Rochko
07d099cbf7
Add new overview landing page setting (#39074) 2026-05-26 12:36:54 +00:00
Eugen Rochko
f6d1795da5
Fix some server-side limits not being respected in web UI (#39163) 2026-05-26 11:51:25 +00:00
Claire
487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
Eugen Rochko
076c8ec51e
Refactor server reducer into TypeScript (#39089) 2026-05-20 14:06:38 +00:00
Claire
aaf06a8186 Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream 2026-05-20 11:31:39 +02:00
Claire
f28715d370
Fix custom emoji selection (#39088) 2026-05-20 07:23:29 +00:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Echo
34c91555ae
Refactor emoji search (#39008) 2026-05-19 10:47:45 +00:00
Claire
8785d3f6fe Merge commit 'dcc26c1b2484848d5b7c3c1a56cfe38b37e83d23' into glitch-soc/merge-upstream 2026-05-08 20:22:32 +02:00
Echo
8d6406f561
Remove legacy emojify function (#38965) 2026-05-08 14:05:31 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
Echo
a47ed31047
Fixes custom emoji not appearing in autocomplete (#38854) 
Co-authored-by: Copilot <copilot@github.com>
 2026-04-29 19:44:42 +00:00
Echo
5d9796afb2
Remove custom emojis from Redux (#38825) 2026-04-28 13:49:10 +00:00
Claire
b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
Echo
e2be688389
Profile redesign: Show full join date (#38687) 2026-04-23 12:47:01 +00:00
Claire
cb62beca08 Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream 2026-04-02 18:20:01 +02:00
Claire
954cc92a6d
Fix being unable to disable sound for quote update notification (#38537) 2026-04-02 13:47:22 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
Echo
6507a61d30
Profile redesign: Profile tab settings (#38309) 2026-03-20 13:38:10 +00:00
Claire
73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Echo
21c27eb3af
Profile editing: Uploading avatar and header images (#38189) 2026-03-16 11:39:52 +00:00
Claire
5f72148834 Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream 2026-02-13 18:26:08 +01:00
Echo
3d0a6ba831
Emoji: Cache data by path instead of just Etag (#37858) 2026-02-13 15:23:22 +00:00
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
Claire
ab9aa25cd3
Fix delete & redraft of pending posts (#37839) 2026-02-13 10:32:16 +00: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
c8db60f8d2 Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream 2026-02-09 21:45:21 +01:00
Echo
b4fb25643a
Fix: Changes to pins update immediately (#37765) 2026-02-09 13:14:24 +00:00
Claire
8f58c42ca3 Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream 2026-02-06 22:45:55 +01:00
Echo
2e30044a37
Profile redesign: Pinned posts (#37761) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-02-06 14:53:34 +00:00
Claire
13499168f8 Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream 2026-02-03 15:44:04 +01:00
Echo
346ca87ee8
Profile redesign: Follow button and menu reorg (#37707) 2026-02-03 11:33:20 +00:00
Claire
0e154b859f Merge commit '6a5578a0db1aed100b6a3ac82b477923d221c350' into glitch-soc/merge-upstream 2026-01-30 12:00:44 +01:00
Echo
0688e64a0b
Fix instance api account merging (#37666) 2026-01-30 09:30:22 +00:00
Claire
36be9bbebf Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream 2026-01-28 19:29:10 +01:00