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

15547 Commits

Author SHA1 Message Date
Claire
48a71e6ad2
Change glitch flavor to show approximate reply count by default (#3157) 2025-08-22 22:29:21 +02:00
Claire
b7c9b881e3 Merge commit '8d3bca3bb8c84e1e3735eb71bdce7acac3779bff' into glitch-soc/merge-upstream 2025-08-19 21:01:33 +02:00
Echo
72035d5faa [Glitch] Move language and visibility buttons above CW field 
Port f16f8b51b863d3fcadd17753004adbf8962ead01 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-19 19:14:23 +02:00
Echo
43034790a6 [Glitch] Composer Quote UI 
Port d4b2e7f77139e27cbde83034fe96dbd189ac56c9 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-19 19:13:58 +02:00
Claire
8d3bca3bb8
Fix serialization of quote policies in nested quotes (#35828) 2025-08-19 17:13:43 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
Echo
f16f8b51b8
Move language and visibility buttons above CW field (#35824) 2025-08-19 15:29:10 +00:00
Claire
831a24ae15
Fix self-destruct scheduler behavior on some Redis setups (#35823) 2025-08-19 14:16:30 +00:00
github-actions[bot]
10dc66be64
New Crowdin Translations (automated) (#35816) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-19 06:49:37 +00:00
Alan
903eefd420 [Glitch] Update color alpha blending to use Sass color functions 
Port 95111e88e3c9d44efdc4a18a80a7b082cf340655 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-18 22:12:05 +02:00
Claire
9871aeed20 [Glitch] Fix “Delete & Redraft” as well as “Edit” unexpectedly reseting quote policy 
Port c2fcf4183ce1c4f78097be032fdee2fc354b66d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-18 22:06:33 +02:00
Claire
4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02:00
Echo
d4b2e7f771
Composer Quote UI (#35805) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-18 16:52:28 +00:00
Claire
255d8f3f8c
Fix e-mail confirmation bypassing username approval (#35806) 2025-08-18 16:37:13 +00:00
Alan
95111e88e3
Update color alpha blending to use Sass color functions (#35787) 2025-08-18 15:55:38 +00:00
Claire
c2fcf4183c
Fix “Delete & Redraft” as well as “Edit” unexpectedly reseting quote policy (#35808) 2025-08-18 14:51:16 +00:00
Claire
8d602df786 Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream 2025-08-18 13:44:06 +02:00
Claire
72bd1ed4b3
Fix updates to quote policy not being federated (#35804) 2025-08-18 08:34:45 +00:00
github-actions[bot]
a18e6199ef
New Crowdin Translations (automated) (#35795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-18 07:03:54 +00:00
Claire
1904d9617d Fix SCSS formatting 2025-08-17 21:17:06 +02:00
Echo
2a593bd89e [Glitch] Allow editing status quote policy 
Port 651e51a82eba542c4d8c3fec5edd16420ea1ff3e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00
Echo
8a7324d114 [Glitch] Move composer buttons to top 
Port 49a6e4cbb5f0a30a52162b65b1046b99d29faccc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00
Echo
6c8a478273 [Glitch] Redirect on success for standalone compose 
Port 7cf53dbf639aeb7c01a4d367226be667ed1dc7a2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00
Claire
80bc5ab5ef [Glitch] Fix reply indicator displaying wrong avatar in rare cases 
Port 63d3f28b2033f5ecef55760505d385fea47ac254 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 20:58:11 +02:00
Echo
fd2420891c [Glitch] Prevent props being added as HTML attributes 
Port bf15b1d65dc9f5391edbd57c1c26c303148cc92d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 20:57:18 +02:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
github-actions[bot]
25f1a515f8
New Crowdin Translations (automated) (#35788) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-15 07:12:01 +00:00
Matt Jankowski
4de21056ff
Update sidekiq to version 8.0.7 (#34824) 2025-08-14 15:25:31 +00:00
Echo
651e51a82e
Allow editing status quote policy (#35762) 2025-08-14 15:04:32 +00:00
Claire
a2cddb9eac
Disallow making private posts quotable (#35780) 2025-08-14 13:58:25 +00:00
Claire
b0ce1ce49d
Fix tootctl admin create not bypassing reserved username checks (#35779) 2025-08-14 13:35:19 +00:00
renovate[bot]
ac0581fd22
Update devDependencies (non-major) (#35660) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-08-14 08:36:38 +00:00
Matt Jankowski
93923a4af2
First pass coverage addition for antispam class (#35771) 2025-08-14 07:57:18 +00:00
Claire
2648bbdc51
Add PUT /api/v1/statuses/:status_id/interaction_policy (#35769) 2025-08-13 15:51:16 +00:00
Echo
49a6e4cbb5
Move composer buttons to top (#35749) 2025-08-13 14:09:45 +00:00
Echo
7cf53dbf63
Redirect on success for standalone compose (#35763) 2025-08-13 13:52:29 +00:00
github-actions[bot]
bce4a572cd
New Crowdin Translations (automated) (#35759) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-13 07:26:03 +00:00
Claire
63d3f28b20
Fix reply indicator displaying wrong avatar in rare cases (#35756) 2025-08-12 16:16:03 +00:00
Claire
258e5c4938
Fix interaction policy changes in implicit updates not being saved (#35751) 2025-08-12 12:19:29 +00:00
Matt Jankowski
5ee83a680b
Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +00:00
github-actions[bot]
ca3d67e88d
New Crowdin Translations (automated) (#35745) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-12 07:40:37 +00:00
Matt Jankowski
61f0ce654f
Update rubocop-rails to version 2.33.0 (#35741) 2025-08-12 07:29:02 +00:00
Echo
bf15b1d65d
Prevent props being added as HTML attributes (#35739) 2025-08-11 12:00:35 +00:00
Claire
0e99d428b2
Change serialization of Delete activities for QuoteAuthorization to inline the latter (#35725) 2025-08-11 08:55:18 +00:00
github-actions[bot]
3c6c9d650d
New Crowdin Translations (automated) (#35729) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-11 08:08:33 +00:00
Matt Jankowski
b827a0a6a8
Allow CustomEmoji to normalize its own domain (#35726) 2025-08-11 07:33:36 +00:00
Echo
ab0a206d43 [Glitch] Update Redux to handle quote posts 
Port 8ee4b3f906c52bad2e2a899e17047235376a8d83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-09 23:10:41 +02:00
Claire
11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
Matt Jankowski
b8982cb881
Use around_action to preserve stored location in auth/sessions#destroy (#35716) 2025-08-08 15:31:50 +00:00
David Roetzel
868c46bc76
Add delivery failure handling to FASP jobs (#35723) 2025-08-08 09:46:09 +00:00