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

10266 Commits

Author SHA1 Message Date
diondiondion
c16cbb98e5 [Glitch] Require following accounts before being able to add them to a collection 
Port 68a7cd404d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-20 21:08:41 +01:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
Claire
3a1e3d7413 Fix formatting issues, remove unused JS script 2026-02-20 20:47:50 +01:00
Claire
d7d102e68f Merge commit 'e24737c612730fd865f62905484dbfa25b82d27e' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream removed it, replaced by `.oxfmtrc.json`.
  We had glitch-specific files in there.
  Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
  Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
  Glitch-soc had extra code in there.
  Reformatted appropriately.
- `eslint.config.mjs`:
  Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
  glitch-soc had slightly different configuration.
  Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
  Upstream changed script definitions textually adjacent to one that we have modified.
  Applied upstream's change, keeping the textually adjacent modified script intact.
 2026-02-20 20:32:58 +01:00
diondiondion
3d33294870 Collection accounts editor: Show info badge on accounts that haven't posted in over a week (#37928) 2026-02-20 14:01:39 +00:00
diondiondion
68a7cd404d Require following accounts before being able to add them to a collection (#37927) 2026-02-20 13:14:36 +00:00
github-actions[bot]
4d2ca8c92a New Crowdin Translations (automated) (#37924) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-20 10:52:57 +00:00
Echo
d7bbe9c451 [Glitch] Remove conditional check for timeline data 
Port 8e7c3973dc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:28 +01:00
diondiondion
5c47ed2d47 [Glitch] Only suggest discoverable accounts in collection account editor 
Port 39ff07bc89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:04:05 +01:00
diondiondion
79fba522e1 [Glitch] Merge collection settings into single editor page 
Port c118ff708f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 22:02:44 +01:00
Echo
3ac5b10dec [Glitch] Profile editing: Name and bio 
Port ed4787c1b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-19 21:53:24 +01:00
Claire
eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
Renaud Chaput
e24737c612 Replace prettier with oxfmt (#37893) 2026-02-19 18:04:25 +00:00
Echo
8e7c3973dc Remove conditional check for timeline data (#37922) 2026-02-19 17:20:33 +00:00
diondiondion
39ff07bc89 Only suggest discoverable accounts in collection account editor (#37920) 2026-02-19 16:43:31 +00:00
github-actions[bot]
7eb4b907eb New Crowdin Translations (automated) (#37918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 14:42:24 +00:00
diondiondion
c118ff708f Merge collection settings into single editor page (#37916) 2026-02-19 14:09:52 +00:00
Echo
ed4787c1b1 Profile editing: Name and bio (#37907) 2026-02-19 13:53:29 +00:00
github-actions[bot]
093528ef17 New Crowdin Translations (automated) (#37915) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 11:11:41 +00:00
github-actions[bot]
b6917961d5 New Crowdin translations (#3407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 20:15:57 +01:00
diondiondion
312c77fdd0 [Glitch] Fix visibility of video overlay controls in light mode 
Port 3df8fb8fe9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:59:21 +01:00
diondiondion
93b7678555 [Glitch] Add collection detail page 
Port 488e0b2617 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:58:57 +01:00
Echo
d67cdcb0b3 [Glitch] Profile redesign: Design fixes 
Port 079f8615fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:55:34 +01:00
Echo
b8b1d3a934 [Glitch] Profile editing: Add initial route 
Port 4b1f66418b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-18 18:53:23 +01:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
diondiondion
3df8fb8fe9 Fix visibility of video overlay controls in light mode (#37906) 2026-02-18 15:28:49 +00:00
diondiondion
488e0b2617 Add collection detail page (#37897) 2026-02-18 13:19:39 +00:00
Echo
079f8615fe Profile redesign: Design fixes (#37892) 2026-02-18 12:05:02 +00:00
github-actions[bot]
b62ba9e29e New Crowdin Translations (automated) (#37896) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 10:33:31 +00:00
Echo
4b1f66418b Profile editing: Add initial route (#37885) 2026-02-17 15:45:24 +00:00
diondiondion
9abfde6189 [Glitch] Allow managing collection accounts 
Port a644a4a762 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-17 12:15:31 +01:00
Claire
f47e2937cf Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream 2026-02-17 12:11:33 +01:00
github-actions[bot]
0a6412faf9 New Crowdin Translations (automated) (#37884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-17 09:21:35 +00:00
diondiondion
a644a4a762 Allow managing collection accounts (#37812) 2026-02-16 18:17:20 +00:00
Echo
df9d9423b9 [Glitch] Profile redesign: Switch to server flag 
Port f7bf804a3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-16 18:27:42 +01:00
Claire
02ad266b81 Merge commit 'cff25c186bb8bb7cdd29de8938949c775dc0ec7f' into glitch-soc/merge-upstream 2026-02-16 18:27:08 +01:00
Echo
f7bf804a3f Profile redesign: Switch to server flag (#37876) 2026-02-16 13:06:49 +00:00
Claire
5769ceb6e3 Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream 2026-02-16 13:35:39 +01:00
github-actions[bot]
6d3eb43500 New Crowdin Translations (automated) (#37863) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-16 09:14:21 +00:00
Claire
114105a788 [Glitch] Fix quote-inline fallback being removed even for legacy quotes (#3402) 
Port 2a9c7d2b9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-15 14:59:38 +01:00
github-actions[bot]
4149067b18 New Crowdin translations (#3382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-14 22:03:41 +01:00
Echo
ce4b913792 [Glitch] Emoji: Cache data by path instead of just Etag 
Port 3d0a6ba831 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:42 +01:00
Echo
66027e4057 [Glitch] Profile redesign: About tab 
Port f5aa5adcf7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:14 +01: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
Echo
f5aa5adcf7 Profile redesign: About tab (#37851) 2026-02-13 13:37:39 +00:00
Claire
00f16a1863 [Glitch] Fix delete & redraft of pending posts 
Port ab9aa25cd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:05:52 +01:00
Echo
c0fe6f8600 [Glitch] Fixes appearing in Following list 
Port 45057d1df2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:04:15 +01:00
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
github-actions[bot]
a3f34137fd New Crowdin Translations (automated) (#37853) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-13 10:45:32 +00:00