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

5414 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire
081d38679f
Add quote notifications to WebUI (#35653) 2025-08-04 18:12:37 +00:00
Echo
570c9d16be
Performance regression fixes (#35664) 2025-08-04 17:16:12 +00:00
Echo
28b0e5ee78
Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
github-actions[bot]
f68bd21600
New Crowdin Translations (automated) (#35634) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-04 09:20:50 +00:00
Claire
3caa318dfe
Fix WebUI crashing for accounts with null URL (#35651) 2025-08-04 07:49:12 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
github-actions[bot]
d09f866daa
New Crowdin Translations (automated) (#35622) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-01 07:57:38 +00:00
Echo
6bca52453a
Emoji Rendering Efficiency (#35568) 2025-07-31 17:30:14 +00:00
Echo
b81670776f
Modern Emoji: Use local storage to opt-in (#35605) 2025-07-31 13:33:34 +00:00
github-actions[bot]
2131d1ff23
New Crowdin Translations (automated) (#35611) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-31 07:26:24 +00:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Eugen Rochko
b80e95b2aa
Change new replies to be loaded automatically if thread previously empty (#35603) 2025-07-30 16:18:58 +00:00
Eugen Rochko
92bf55afd0
Change design of quote posts in web UI (#35584) 2025-07-30 15:53:42 +00:00
github-actions[bot]
1c89309db0
New Crowdin Translations (automated) (#35592) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-30 08:37:33 +00:00
Eugen Rochko
d121007927
Change "new replies available" notice to be above replies in web UI (#35575) 2025-07-29 09:00:27 +00:00
github-actions[bot]
d299b0d576
New Crowdin Translations (automated) (#35574) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-29 08:59:00 +00:00
Colin Dean
b5cebf45ea
Swap order of translation restoration and service credit on post card (#33619) 2025-07-28 11:33:11 +00:00
github-actions[bot]
a57a9505d4
New Crowdin Translations (automated) (#35537) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-28 08:14:11 +00:00