Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 03:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,190 Commits 74 Branches 58 Tags
cd71fdcdfffc081c42eb87b8dbba649bf0bb2c81
Commit Graph

9915 Commits

Author SHA1 Message Date
Emelia Smith
b52b744e6d [Glitch] Refactor to reuse the one status partial across moderation tools 
Port 4f494781c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:00:33 +02:00
Echo
be78b64948 [Glitch] Composer quote improvements 
Port f85f0eee1b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:58:39 +02:00
Claire
5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +02:00
Claire
0a0f57f3ec [Glitch] Fix display of quotes in threads in WebUI 
Port 45ec4c93c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:46:03 +02:00
Echo
4e7b270365 [Glitch] Status quote button 
Port 8268323d7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:45:40 +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
Claire
48a71e6ad2 Change glitch flavor to show approximate reply count by default (#3157) 2025-08-22 22:29:21 +02:00
github-actions[bot]
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
a1c7b853ec Improve feed item focus outlines (#35864) 2025-08-22 12:10:07 +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
Emelia Smith
4f494781c1 Refactor to reuse the one status partial across moderation tools (#35644) 2025-08-21 14:51:11 +00:00
Echo
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]
f696f794cf New Crowdin Translations (automated) (#35844) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-21 07:42:45 +00:00
Claire
45ec4c93c0 Fix display of quotes in threads in WebUI (#35834) 2025-08-20 14:39:58 +00:00
Echo
8268323d7f Status quote button (#35822) 2025-08-20 10:09:57 +00:00
github-actions[bot]
54da7ff12b New Crowdin Translations (automated) (#35829) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-20 08:31:57 +00:00
Echo
72035d5faa [Glitch] Move language and visibility buttons above CW field 
Port f16f8b51b8 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 d4b2e7f771 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
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]
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 95111e88e3 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 c2fcf4183c 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
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
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 651e51a82e 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 49a6e4cbb5 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 7cf53dbf63 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 63d3f28b20 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 bf15b1d65d 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
Echo
651e51a82e Allow editing status quote policy (#35762) 2025-08-14 15:04:32 +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
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
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
Echo
bf15b1d65d Prevent props being added as HTML attributes (#35739) 2025-08-11 12:00:35 +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
Echo
ab0a206d43 [Glitch] Update Redux to handle quote posts 
Port 8ee4b3f906 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