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

5476 Commits

Author SHA1 Message Date
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
diondiondion
c45ce549af
refactor: Prevent leading slashes in API urls (#34680) 2025-05-14 08:59:08 +00:00
github-actions[bot]
8d5b73d70d
New Crowdin Translations (automated) (#34679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-14 07:00:32 +00: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
github-actions[bot]
65baf9b04a
New Crowdin Translations (automated) (#34672) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-13 07:47:56 +00:00
diondiondion
b135a831ea
feat: Add "Followers you know" widget to user profiles (#34652) 2025-05-13 06:38:18 +00:00
github-actions[bot]
3357ae9889
New Crowdin Translations (automated) (#34655) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-12 07:40:14 +00:00
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
github-actions[bot]
7cd7445abe
New Crowdin Translations (automated) (#34649) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-09 07:07:17 +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
Claire
d600aa4694 Merge commit '741f166407a79b666475aae662339c127f182e24' into glitch-soc/merge-upstream 2025-05-08 15:31:15 +02:00
Echo
8c579c5b34
Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
github-actions[bot]
741f166407
New Crowdin Translations (automated) (#34633) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-07 08:45:03 +00:00
Claire
49e9a1fe4e Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 16:30:33 +02:00
Claire
3bbf3e9709
Fix code style issue (#34624) 2025-05-06 13:35:54 +00:00
Claire
79931bf3ae
Merge commit from fork 
* Check scheme in account and post links

* Harden media attachments

* Client-side mitigation

* Client-side mitigation for media attachments
 2025-05-06 15:02:13 +02:00
Claire
8d98d91f33 Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream 2025-05-06 12:06:51 +02:00
Renaud Chaput
df6b808750
fix: do not use the deprecated /api/v1/instance end point (#34613) 2025-05-06 06:08:44 +00:00
Claire
d14d7a5379 Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream 2025-05-05 20:31:48 +02:00
github-actions[bot]
eacf6f2342
New Crowdin Translations (automated) (#34596) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-05 08:23:27 +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
github-actions[bot]
94fa5b7168
New Crowdin Translations (automated) (#34587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-02 06:59:30 +00:00
Patryk Rzucidło
e3f0b955b8
Fix directory scroll position reset (#34560) 2025-04-30 12:27:37 +00:00
github-actions[bot]
64ab9be93f
New Crowdin Translations (automated) (#34580) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-30 07:31:08 +00:00
Eugen Rochko
79013c730d
Add endorsed accounts to profiles in web UI (#34568) 2025-04-29 12:14:22 +00:00
Claire
b81c28e7dc
Fix edit dropdown crashing the web interface on mobile (#34564) 2025-04-29 09:48:54 +00:00
Claire
98e6dfcbcf
Fix context selector trying to mutate immutable state (#34573) 2025-04-29 08:12:05 +00:00
github-actions[bot]
66d9e47178
New Crowdin Translations (automated) (#34572) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-29 07:05:02 +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
github-actions[bot]
a20686f593
New Crowdin Translations (automated) (#34558) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-28 07:33:20 +00:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Eugen Rochko
49b6a49c76
Change "Pin on profile" to "Feature on profile" for posts in web UI (#34492) 2025-04-25 15:11:59 +00:00
github-actions[bot]
b1b949f16c
New Crowdin Translations (automated) (#34546) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-25 06:44:41 +00:00
github-actions[bot]
1fc66c1970
New Crowdin Translations (automated) (#34534) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-24 08:06:10 +00:00
github-actions[bot]
577e407ffc
New Crowdin Translations (automated) (#34522) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-23 08:47:20 +00:00
Claire
5e679f41f9 Merge commit 'e097f0e9eb76514efc405f3d1cef0692ff4cff35' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  glitch-soc-specific dependency too close to a dependency updated upstream.
  Updated dependencies as upstream did.
 2025-04-22 19:55:29 +02:00
github-actions[bot]
b92f42a6bd
New Crowdin Translations (automated) (#34502) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-22 08:33:42 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Claire
ace0a3d61f Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream 2025-04-21 15:22:22 +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
github-actions[bot]
361f528c89
New Crowdin Translations (automated) (#34487) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-18 08:51:50 +00:00
Eugen Rochko
bed614d44e
Add option to remove account from followers in web UI (#34488) 2025-04-18 07:23:34 +00:00