stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,171 Commits 75 Branches 3 Tags
706c8bf1a0d02ad9eea5f04b0dcbae2033e1c109
Commit Graph

2152 Commits

Author SHA1 Message Date
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
Echo
84d03e4e16 Revert React Spring to 9.7.5 and updates Renovate (#34788) 2025-05-23 12:34:41 +00:00
diondiondion
5dda094daa fix: Fix various UI text wrapping and overflow issues (#34774) 2025-05-23 07:07:05 +00:00
Claire
02ac18da51 Change display of quote posts to strip fallback link and preview cards (#34772) 2025-05-23 06:53:04 +00:00
diondiondion
12c8a6498c Add "Followers you know" to hovercard (#34769) 2025-05-22 12:46:14 +00:00
Claire
6ab96ba647 Use more generic locale as fallback for rules (#34756) 2025-05-21 16:22:54 +00:00
diondiondion
97b9e8849d Add rendering of quote posts in web UI (#34738) 2025-05-21 15:50:45 +00:00
Claire
8c51a8ba94 Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
Claire
ef87cd6910 Fix incorrect progress value being passed to react-spring in video player (#34740) 2025-05-20 13:12:08 +00:00
renovate[bot]
feb4e0a007 fix(deps): update dependency @react-spring/web to v10 (#34693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:35:10 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00
Claire
0fda1f0e94 Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream 2025-05-15 18:52:02 +02:00
diondiondion
6c743831aa fix: Hide "Followers you know" widget from your own profile, #34698 (#34699) 2025-05-15 14:40:01 +00:00
diondiondion
3f965d83b0 fix: More "Followers you know" polish & bug fixes (#34697) 2025-05-15 11:33:16 +00:00
diondiondion
ccffa11f2b refactor: Remove duplicated AvatarGroup CSS and familiar followers cleanup (#34681) 2025-05-15 08:07:38 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Echo
545e8fbd0c Fix emoji bundle size (#34677) 2025-05-14 06:39:05 +00:00
diondiondion
865a30ab0d fix: Hide FamiliarFollowers widget when logged out (#34678) 2025-05-13 17:55:16 +00:00
diondiondion
b135a831ea feat: Add "Followers you know" widget to user profiles (#34652) 2025-05-13 06:38:18 +00:00
Claire
5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00
Echo
8c579c5b34 Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
Claire
68bb158c84 Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream 2025-05-03 18:28:25 +02:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
b4394ec129 Change design of audio player in web UI (#34520) 2025-05-02 16:15:00 +00:00
Patryk Rzucidło
e3f0b955b8 Fix directory scroll position reset (#34560) 2025-04-30 12:27:37 +00:00
Eugen Rochko
79013c730d Add endorsed accounts to profiles in web UI (#34568) 2025-04-29 12:14:22 +00:00
Essem
e96044f389 Update to Twemoji 15.1.0 (#34321) 2025-04-28 14:22:14 +00:00
Eugen Rochko
17d8e2b6e3 Refactor context reducer to TypeScript (#34506) 2025-04-28 13:38:40 +00:00
Eugen Rochko
40157e063d Add ability to feature and unfeature hashtags from web UI (#34490) 2025-04-28 11:44:01 +00:00
Eugen Rochko
926c67c648 Refactor <ActionsModal> to TypeScript (#34559) 2025-04-28 11:43:42 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Claire
8cbd99e645 Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream 2025-04-21 14:32:47 +02:00
Eugen Rochko
3159f3b2f6 Fix featured hashtags not showing year for date in web UI (#34491) 2025-04-18 13:54:13 +00:00
Eugen Rochko
bed614d44e Add option to remove account from followers in web UI (#34488) 2025-04-18 07:23:34 +00:00
Echo
64d94f9e57 Update copy for empty featured tabs (#34483) 2025-04-17 10:27:44 +00:00
Eugen Rochko
ee62ac53e1 Add "Mutual" relationship tag to profiles in web UI (#34467) 2025-04-17 08:10:11 +00:00
Eugen Rochko
f47ad7814a Fix "Feature on profile" option on profile dropdown menu in web UI (#34422) 2025-04-14 07:29:44 +00:00
Claire
80f7175379 Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream 2025-04-11 19:14:53 +02:00
Eugen Rochko
a9cfaa6eed Add dropdown menu to hashtag links in web UI (#34393) 2025-04-11 10:50:46 +00:00
Essem
1d7b45093d Fix notification request screen breaking due to dropdown (#34423) 2025-04-11 04:27:12 +00:00
Echo
d43bfa95aa Adds featured tab to web (#34405) 2025-04-10 15:40:30 +00:00
Claire
300e9de24d Merge commit '498372fd06bfb0235b75888629ca5de0336ccd71' into glitch-soc/merge-upstream 2025-04-10 17:02:40 +02:00
Eugen Rochko
22d33244ee Refactor <Dropdown> into TypeScript (#34357) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-04-08 19:22:19 +00:00
Eugen Rochko
b7c3235349 Change alt text modal to use spring animations in web UI (#34345) 2025-04-08 19:22:05 +00:00
Claire
2e16be22bf Merge commit '0e5be63fb327403902076df602ec2dd410ada789' into glitch-soc/merge-upstream 2025-04-08 20:26:30 +02:00
Claire
4b491674b2 Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream 2025-04-08 19:12:28 +02:00
Eugen Rochko
0e5be63fb3 Change unfollow button label from "Mutual" to "Unfollow" in web UI (#34392) 2025-04-08 16:28:14 +00:00