Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,997 Commits 74 Branches 58 Tags
43034790a655bb13868e18ecd62214fb03e2dba1
Commit Graph

9246 Commits

Author SHA1 Message Date
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
github-actions[bot]
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]
39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00
Claire
9da8c9e07c [Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon 
Port 4838085d66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
4b507c0f05 [Glitch] Add UI for revoking quote posts 
Port 55a98580aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
dbb2908eeb [Glitch] Fix quote notification filtering and add settings 
Port a4c05c694f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:34:14 +02:00
Claire
235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire
ac59772dc6 Change icon of quote notification mails (#35701) 2025-08-06 15:20:16 +00:00
Claire
4838085d66 Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire
55a98580aa Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
github-actions[bot]
6f6e7d8d49 New Crowdin Translations (automated) (#35694) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-06 09:06:22 +00:00
Claire
a4c05c694f Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Claire
3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
github-actions[bot]
54fd1c1f9b New Crowdin Translations (automated) (#35674) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 08:19:55 +00:00
Claire
98685f744d [Glitch] Add quote notifications to WebUI 
Port 081d38679f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:33:45 +02:00
Echo
3fc07508ee [Glitch] Performance regression fixes 
Port 570c9d16be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:57 +02:00
Echo
b8f66e1d33 [Glitch] Provides legacy fallback for browser that don't support regex flag v 
Port 28b0e5ee78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:23 +02:00
Claire
a6f0ec160e [Glitch] Fix WebUI crashing for accounts with null URL 
Port 3caa318dfe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:25:46 +02:00