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

9276 Commits

Author SHA1 Message Date
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
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
diondiondion
94ad088482
Fix broken custom radio buttons & checkboxes in modals (#35891) 2025-08-25 09:12:46 +00:00
github-actions[bot]
b771fc0880
New Crowdin Translations (automated) (#35878) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-25 06:54:53 +00:00
Echo
3cc6f8813a [Glitch] Visibility Modal fixes 
Port 4df50b9c7e547ce1d99a43eeccdd92d88406eca2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:12:02 +02:00
diondiondion
f7cd193390 [Glitch] Improve feed item focus outlines 
Port a1c7b853ec14b1c2b98b80f49bf47673637f4679 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:11:22 +02:00
diondiondion
e9c1ffeb9a [Glitch] Improvements for keyboard navigation in feeds 
Port 118c30fbc71bcccf1e0e99a7512c8af7d612b930 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:08:56 +02:00
diondiondion
bae04bd303 [Glitch] Fix layout shift caused by "Who to follow" widget 
Port 511e10df3449d93616828db471ce6b562a075c0a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:03:39 +02:00
Emelia Smith
b52b744e6d [Glitch] Refactor to reuse the one status partial across moderation tools 
Port 4f494781c14140dfd94315e2071bec3407cee7b8 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 f85f0eee1bb79322f40694101dbd4b9bf2b601eb 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 45ec4c93c0c74318694f033f8cecd384d2793dfb 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 8268323d7f9b76beb381ba0418dc79231ff7849e 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 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
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 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
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 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