tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,083 Commits 5 Branches 0 Tags
9f710449dbf210744d557ea593a2b402cae41c30
Commit Graph
4690 Commits
Author SHA1 Message Date
Claire 884d7996b1 Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream 2025-08-27 18:13:03 +02:00
Claire 02de05dc27 Add ability to list quotes of one's own posts (#35914) 2025-08-27 15:38:52 +00:00
Claire 9c55b2fbe4 Enable quotes of manually-reviewed quotes with a different label (#35925) 2025-08-27 14:55:39 +00:00
Claire a6a0d982ef Fix streaming and handling of quoted_update notifications (#35924) 2025-08-27 14:53:54 +00:00
Claire 66f5ad42e2 Fix API return types for interaction API helpers (#35915) 2025-08-27 08:13:34 +00:00
github-actions[bot]andGitHub Actions 8dcd195527 New Crowdin Translations (automated) (#35922) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-27 08:13:21 +00:00
Claire 7e25f6b606 Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream 2025-08-26 19:07:52 +02:00
diondiondion 4180f754d0 Fix error alerts for deleted quotes (#35918) 2025-08-26 16:34:14 +00:00
Claire 3c9bde31f7 Fix WebUI fetching deleted quote in an endless loop (#35909) 2025-08-26 10:07:02 +00:00
github-actions[bot]andGitHub Actions 460043a969 New Crowdin Translations (automated) (#35908) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-26 08:40:16 +00:00
Claire e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-08-25 22:15:28 +02:00
Claire f3a932d8a1 Add quoted_update notification type (#35820) 2025-08-25 15:44:18 +00:00
Claire 7a76f71d99 Ensure quote policy is displayed as “Just me” when disabled because of visibility (#35894) 2025-08-25 13:08:37 +00:00
Claire 012450e87d Consolidate labels for quote policy settings (#35893) 2025-08-25 12:30:37 +00:00
Claire d8c07be021 Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option (#35892) 2025-08-25 12:25:35 +00:00
Claire 2560242972 Add quotes_count to statuses stats (#35832) 2025-08-25 12:21:28 +00:00
github-actions[bot]andGitHub Actions b771fc0880 New Crowdin Translations (automated) (#35878) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-25 06:54:53 +00:00
Claire 5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +02:00
Claire 02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
 2025-08-22 22:33:11 +02:00
github-actions[bot]andGitHub Actions abe5413638 New Crowdin Translations (automated) (#35859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-22 14:53:27 +00:00
Echo 4df50b9c7e Visibility Modal fixes (#35865) 2025-08-22 12:34:37 +00:00
diondiondion 118c30fbc7 Improvements for keyboard navigation in feeds (#35853) 2025-08-22 09:57:39 +00:00
diondiondion 511e10df34 Fix layout shift caused by "Who to follow" widget (#35861) 2025-08-22 09:44:10 +00:00
EchoClairediondiondion
 		f85f0eee1b Composer quote improvements (#35835) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-21 14:07:31 +00:00
github-actions[bot]andGitHub Actions f696f794cf New Crowdin Translations (automated) (#35844) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-21 07:42:45 +00:00
Echo 8268323d7f Status quote button (#35822) 2025-08-20 10:09:57 +00:00
github-actions[bot]andGitHub Actions 54da7ff12b New Crowdin Translations (automated) (#35829) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-20 08:31:57 +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
github-actions[bot]andGitHub Actions 10dc66be64 New Crowdin Translations (automated) (#35816) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-19 06:49:37 +00:00
Claire 4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02:00
Echoanddiondiondion d4b2e7f771 Composer Quote UI (#35805) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-18 16:52:28 +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
github-actions[bot]andGitHub Actions a18e6199ef New Crowdin Translations (automated) (#35795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-18 07:03:54 +00: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]andGitHub Actions 25f1a515f8 New Crowdin Translations (automated) (#35788) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-15 07:12:01 +00:00
Echo 651e51a82e Allow editing status quote policy (#35762) 2025-08-14 15:04:32 +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]andGitHub Actions 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
github-actions[bot]andGitHub Actions ca3d67e88d New Crowdin Translations (automated) (#35745) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-12 07:40:37 +00:00
Echo bf15b1d65d Prevent props being added as HTML attributes (#35739) 2025-08-11 12:00:35 +00:00
github-actions[bot]andGitHub Actions 3c6c9d650d New Crowdin Translations (automated) (#35729) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-11 08:08:33 +00: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
github-actions[bot]andGitHub Actions 1fd147bf2b New Crowdin Translations (automated) (#35720) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-08 09:00:51 +00:00
Echo 8ee4b3f906 Update Redux to handle quote posts (#35715) 2025-08-08 08:44:05 +00:00
Claire e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
github-actions[bot]andGitHub Actions 39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00