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

16796 Commits

Author SHA1 Message Date
David Roetzel
ae30c40335
Auto accept account added to collection (#37805) 2026-02-10 12:48:28 +00:00
Claire
1b00b92772 Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream 2026-02-10 12:03:53 +01:00
Claire
75ba314e6b
Migrate to new theming infrastructure (#37612) 2026-02-10 10:59:47 +00:00
Echo
fb89198460
Profile redesign: Quality pass (#37766) 2026-02-10 10:56:03 +00:00
github-actions[bot]
662df23793
New Crowdin Translations (automated) (#37797) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-10 10:16:57 +00:00
David Roetzel
03f73377d9
Federate updates to collections (#37790) 2026-02-10 10:08:55 +00:00
Echo
455fa54106 [Glitch] Fix: Changes to pins update immediately 
Port b4fb25643a12e13b909f5681ce747074c341cd7c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-09 21:46:08 +01:00
Claire
c8db60f8d2 Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream 2026-02-09 21:45:21 +01:00
Jonny Saunders
e17bbed88f
Change: Consolidate collection handling in jsonld helper (#34595) 2026-02-09 15:19:36 +00:00
Echo
b4fb25643a
Fix: Changes to pins update immediately (#37765) 2026-02-09 13:14:24 +00:00
Claire
47b0e7897c Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-soc/merge-upstream 2026-02-09 13:11:17 +01:00
Claire
d3cef82401
Refactor store_current_location before_action in OAuth::AuthorizationsController (#37779) 2026-02-09 11:05:32 +00:00
github-actions[bot]
6ec4bd5927
New Crowdin Translations (automated) (#37767) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-09 09:04:32 +00:00
Echo
69f0c52bb5 [Glitch] Profile redesign: Pinned posts 
Port 2e30044a374811bc94fd62a8159cb2c9ffe18a4d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-06 23:39:00 +01:00
diondiondion
8caaffe435 [Glitch] Move account search into hook 
Port 7e27ba990e905fd07b1469edeeda8eb0217b3b93 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-06 22:54:15 +01:00
diondiondion
9eb718836e [Glitch] Add new components Combobox and EmptyState 
Port 2768ab77e50e8be0ad828d2efad31f028a50ac8b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-06 22:52:24 +01:00
Itoh Shimon
425d411c9a [Glitch] Enable coexistence of horizontal and vertical posts 
Port 96de28dd6fcb127b462b56d510c804cddeebe992 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-06 22:50:49 +01:00
Echo
351b8a719f [Glitch] Show mute end date in badge 
Port 7a4945c0d3ed3550e1a22e53c03c6de646d62aec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-06 22:47:24 +01: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
Echo
1310628a60
Bust relationship cache key (#37760) 2026-02-06 14:36:12 +00:00
diondiondion
7e27ba990e
Move account search into hook (#37762) 2026-02-06 13:08:29 +00:00
diondiondion
2768ab77e5
Add new components Combobox and EmptyState (#37748) 2026-02-06 12:51:27 +00:00
Claire
5b24f4097d
Fix processing of object updates with duplicate hashtags (#37756) 2026-02-06 10:09:42 +00:00
github-actions[bot]
b1d4459267
New Crowdin Translations (automated) (#37755) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-06 09:52:28 +00:00
Itoh Shimon
96de28dd6f
Enable coexistence of horizontal and vertical posts (#37204) 2026-02-06 09:51:22 +00:00
Echo
7a4945c0d3
Show mute end date in badge (#37747) 2026-02-05 20:01:28 +00:00
Echo
09206c7369 [Glitch] Cancel quote button appearing in all statuses 
Port d2dca826dd06c78e562a9eaf96c9993d6bbe2e08 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-05 18:00:37 +01:00
Claire
55cd5e1ab1 Merge commit 'acdd0b33a3183569a2cdb50befdbba58f1e74ae9' into glitch-soc/merge-upstream 2026-02-05 17:57:46 +01:00
Shlee
ecdc7ff3f9
Add defensive check to AfterUnallowDomainService (#37744) 
Co-authored-by: Your Name <you@example.com>
 2026-02-05 14:13:56 +00:00
Echo
d2dca826dd
Cancel quote button appearing in all statuses (#37742) 2026-02-05 12:58:00 +00:00
Claire
59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.
 2026-02-05 12:43:12 +01:00
Matt Jankowski
f652c54c33
Update devise to version 5.0 (#37419) 2026-02-05 11:05:32 +00:00
David Roetzel
9cd94168b3
Federate Remove when collection is deleted (#37741) 2026-02-05 10:33:39 +00:00
github-actions[bot]
ed649fbdb7
New Crowdin Translations (automated) (#37740) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-05 10:08:56 +00:00
David Roetzel
73206856c5
Refactor activity serialization (#37678) 2026-02-05 09:39:27 +00:00
Echo
84cc0dcac4 [Glitch] Refactors header from Status component 
Port 7f53a77fa3585a36a054f058105e0fe170d2bc0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-04 20:01:33 +01:00
diondiondion
072c30681e [Glitch] Split collection editor into dedicated routes 
Port 8ebe2e673e2fd175140df7275eb362c8eecfec31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-04 19:34:34 +01:00
diondiondion
41dee6383f [Glitch] Add components TextInput, TextArea, and FormStack 
Port 218ca366533bb5b8c4d3eb163b6f2d4d1cc6f755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-04 19:27:34 +01:00
Claire
3bbc8ecf92 Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream 2026-02-04 19:23:24 +01:00
Claire
33dc4a6091 Merge commit '4f99b48e8e8c9818f85be1b2ac9abad75f538585' into glitch-soc/merge-upstream 2026-02-04 18:51:17 +01:00
diondiondion
8ebe2e673e
Split collection editor into dedicated routes (#37731) 2026-02-04 17:45:41 +00:00
github-actions[bot]
015d88b4c6
New Crowdin Translations (automated) (#37733) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-04 17:03:08 +00:00
Echo
7f53a77fa3
Refactors header from Status component (#37732) 2026-02-04 13:12:21 +00:00
Valtteri Laitinen
ee631bf826
Make “Following” correctly translatable (#37671) 2026-02-04 10:56:33 +00:00
github-actions[bot]
1cb3b49537
New Crowdin Translations (automated) (#37729) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-04 08:48:44 +00:00
Echo
b7443c4b9e [Glitch] Profile redesign: Fields iteration 
Port 0923e2cb26d179f197680c978495593c8b205a80 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-03 16:04:00 +01:00
Echo
82f7cdcb48 [Glitch] Profile redesign: Follow button and menu reorg 
Port 346ca87ee890f0a10e9914124d35878fd5608516 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-03 15:57:49 +01:00
diondiondion
3c2a06dc24 [Glitch] Add Select component 
Port 218ca366533bb5b8c4d3eb163b6f2d4d1cc6f755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-03 15:54:12 +01:00
diondiondion
dacbd20081 [Glitch] Implement CSS theme tokens behind feature flag 
Port 284b46fee7ad682b52c99d0455a1134e1d4e3fc3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-03 15:53:50 +01:00