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

15495 Commits

Author SHA1 Message Date
Claire
a315934314
Fix styling of external log-in button (#35320) 2025-07-10 06:56:40 +00:00
Claire
55914c6434 [Glitch] Fix replying from media modal or pop-in-player tagging user @undefined 
Port e7c5c25dce81bd4e32a4bf599c759303420c47e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-10 01:22:14 +02:00
Echo
c2d76e8994 [Glitch] Emoji Indexing and Search 
Port a1e88135225753544197d8f1dd57fbb58cead43f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-10 01:21:51 +02:00
Claire
e2a867507c Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream 2025-07-10 01:10:32 +02:00
Claire
e7c5c25de8
Fix replying from media modal or pop-in-player tagging user @undefined (#35317) 2025-07-09 12:13:51 +00:00
Echo
a1e8813522
Emoji Indexing and Search (#35253) 2025-07-09 09:55:41 +00:00
github-actions[bot]
76c1446416
New Crowdin Translations (automated) (#35310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-09 09:10:55 +00:00
Matt Jankowski
fb6c22f5c2
Use touch to record viewing annual report (#35296) 2025-07-09 08:04:00 +00:00
Matt Jankowski
f7259f625f
Prefer on: :update in Tag validation declaration (#35297) 2025-07-09 08:03:39 +00:00
Claire
f7d1d73073 Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a new user setting, directly next to a glitch-soc-only one.
  The upstream setting would actually replace the glitch-soc one but it is not
  fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Ditto.
- `docker-compose.yml`:
  Conflict due to different registry names. Updated the version while keeping
  glitch-soc's registry.
 2025-07-08 17:27:19 +02:00
diondiondion
615896c8ea [Glitch] fix: Fix can't skip search field by tabbing 
Port b5eebd4d2ba22fe5ae763fd6cc0fe24649d282a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:44:19 +02:00
diondiondion
d9380857db [Glitch] fix: Remove focus highlight when status is clicked in light mode 
Port 3c0767f543dfdbb2fbb6a35f43f8ac5f7b545e2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:43:56 +02:00
Echo
1c89eb2250 [Glitch] Import Emojibase data 
Port 52bc2f64f44ebf8ef938b37abc9cbfe53eaa9220 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-08 16:43:23 +02:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Echo
ef66d8379c
Add option to set emoji preferences behind feature flag (#35282) 2025-07-08 10:51:11 +00:00
David Roetzel
8ee6cee36e
Better error response to malformed headers (#35278) 2025-07-08 09:31:04 +00:00
github-actions[bot]
71b2120e5c
New Crowdin Translations (automated) (#35286) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-08 09:22:38 +00:00
diondiondion
b5eebd4d2b
fix: Fix can't skip search field by tabbing (#35281) 2025-07-07 15:10:51 +00:00
github-actions[bot]
f6b2609353
New Crowdin Translations (automated) (#35269) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-07 08:21:51 +00:00
Matt Jankowski
bdffdcb12f
Remove unused scopes in Account model (#35276) 2025-07-07 08:07:01 +00:00
github-actions[bot]
83660ee381
New Crowdin Translations (automated) (#35261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 07:34:54 +00:00
David Roetzel
1fa72d6c44
Raise better exception on FASP error responses (#35262) 2025-07-04 07:25:42 +00:00
Matt Jankowski
2af17adc34
Use ActiveModel::Attributes in admin/status_batch_action (#35255) 2025-07-03 14:43:36 +00:00
Claire
e97f43399b
Fix error handling for blank actions in account moderation action form (#35246) 2025-07-03 14:42:48 +00:00
github-actions[bot]
c66c5fd73d
New Crowdin Translations (automated) (#35250) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-03 09:47:57 +00:00
diondiondion
3c0767f543
fix: Remove focus highlight when status is clicked in light mode (#35251) 2025-07-03 07:51:12 +00:00
Matt Jankowski
6e39b5ef04
Use ActiveModel::Attributes for admin/account_action boolean values (#35247) 2025-07-03 07:28:07 +00:00
Matt Jankowski
49db8a9662
Use Account#targeted_reports association where needed (#35249) 2025-07-03 07:28:03 +00:00
github-actions[bot]
6f1135d763
New Crowdin Translations (automated) (#35238) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-02 09:17:03 +00:00
Echo
52bc2f64f4
Import Emojibase data (#35229) 2025-07-02 08:58:39 +00:00
Claire
68b05e994f
Fix error on log-in from old users requiring ToS interstitial when said ToS has been removed (#35233) 2025-07-01 17:43:59 +00:00
diondiondion
605df74f06 [Glitch] fix: Fix column header overlapping mobile menu on old Safari 
Port e6e89747854e34765b5291fe19fd76bc2d97b26d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-01 18:48:16 +02:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
github-actions[bot]
dd064aaa36
New Crowdin Translations (automated) (#35224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-01 09:02:26 +00:00
diondiondion
e6e8974785
fix: Fix column header overlapping mobile menu on old Safari (#35225) 2025-07-01 08:53:43 +00:00
diondiondion
0bb2dc9d26 [Glitch] fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers 
Port e8a603b18f80a44a68087e4f9a959de1ec773d3b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-30 17:56:29 +02:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings (#35203) 2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c
Persist follow recommendations from FASP (#35218) 2025-06-30 13:39:36 +00:00
diondiondion
e8a603b18f
fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers (#35220) 2025-06-30 12:16:54 +00:00
Matt Jankowski
964916c71b
Add coverage for TermsOfService scopes/validations (#35204) 2025-06-30 10:28:14 +00:00
github-actions[bot]
8782e860b6
New Crowdin Translations (automated) (#35208) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-30 09:33:15 +00:00
David Roetzel
ac4b735c67
Add FASP account search support (#34033) 2025-06-30 07:42:34 +00:00
github-actions[bot]
6d017dbf10
New Crowdin Translations (automated) (#35202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-27 08:37:39 +00:00
diondiondion
f21c92bb45 [Glitch] fix: Fix outdated icon in notifications permissions banner 
Port 9576434d47ba372e00deec0d602b470b4a15ab6a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:07:16 +02:00
diondiondion
7b98298f85 [Glitch] refactor: Tweak wording of "discard draft?" confirmation dialogs 
Port b804ed0cbadc3d63813f0614fdde39eb78b311c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:06:55 +02:00
diondiondion
1f8378c12d [Glitch] fix: Prevent scrolling behind menus and modals in Safari iOS 
Port c1ef1f62d549dc27eaff2756a92c8b38febc3b45 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:06:16 +02:00
Claire
f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
 2025-06-26 18:04:37 +02:00
Eugen Rochko
1804a87193
Change terms of service generator to not be displayed (#35127) 2025-06-26 13:26:41 +00:00
diondiondion
9576434d47
fix: Fix outdated icon in notifications permissions banner (#35193) 2025-06-26 13:25:12 +00:00