1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
Commit Graph

4058 Commits

Author SHA1 Message Date
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Christian Schmidt
c40ab43dc7
Remove redundant title attribute (#32258) 2024-10-04 16:23:05 +00:00
Claire
51769e0670
Fix media gallery items having incorrect borders when hidden (#32257) 2024-10-04 14:55:44 +00:00
Claire
1f720366e9
Fix notification push notifications not including the author's username (#32254) 2024-10-04 14:29:23 +00:00
Claire
77f5b127fa
Fix unsupported grouped notifications from streaming causing duplicate IDs (#32243) 2024-10-04 12:23:30 +00:00
github-actions[bot]
1b247a1dc2
New Crowdin Translations (automated) (#32249)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-04 07:29:53 +00:00
github-actions[bot]
fe3f5375e3
New Crowdin Translations (automated) (#32233)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-03 09:15:31 +00:00
Claire
f768a6eb16
Hide badges in media gallery when media are hidden (#32224) 2024-10-02 15:51:05 +00:00
Claire
f760899b04
Fix editing description of media uploads with custom thumbnails (#32221) 2024-10-02 13:29:23 +00:00
Claire
4a737a948a
Fix incorrect 'navigator' check (#32219) 2024-10-02 10:03:04 +00:00
github-actions[bot]
ea72d5ec3a
New Crowdin Translations (automated) (#32214)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-02 09:05:57 +00:00
Nick Schonning
f91f077985
Enable ESLlint no-case-declarations (#30768) 2024-10-01 16:26:30 +00:00
Renaud Chaput
1be55ce244
Fix follow notifications from streaming being grouped (#32179) 2024-10-01 08:22:14 +00:00
github-actions[bot]
5839ee434b
New Crowdin Translations (automated) (#32195)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-01 08:21:17 +00:00
Claire
9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
github-actions[bot]
f477dc399e
New Crowdin Translations (automated) (#32140)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-30 08:53:29 +00:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Eugen Rochko
11a12e56b3
Change media reordering design in the compose form in web UI (#32093) 2024-09-27 15:09:39 +00:00
github-actions[bot]
c9b0699964
New Crowdin Translations (automated) (#32121)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-27 07:34:46 +00:00
Eugen Rochko
a04433f995
Add ability to view alt text by clicking the ALT badge in web UI (#32058) 2024-09-26 13:26:49 +00:00
Claire
7a62d57427
Add fallback to domain block confirmation modal (#32105) 2024-09-26 12:47:56 +00:00
Eugen Rochko
89df27a06c
Change design of media tab on profiles in web UI (#31967) 2024-09-26 12:31:32 +00:00
github-actions[bot]
278a075b22
New Crowdin Translations (automated) (#32103)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-26 08:47:38 +00:00
Eugen Rochko
3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Eugen Rochko
28c4eca0af
Change responsive break points on navigation panel in web UI (#32034) 2024-09-25 16:36:19 +00:00
Claire
633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput
739ad0eed2
Keep the status action buttons at their position regardless of the counter size (#32084)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 14:33:58 +00:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications (#32085) 2024-09-25 13:36:19 +00:00
Renaud Chaput
3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
github-actions[bot]
4e6fc3a62f
New Crowdin Translations (automated) (#32083)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-25 07:40:14 +00:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
Eugen Rochko
70988519df
Fix too many requests caused by relationship look-ups in web UI (#32042)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-24 17:02:36 +00:00
Claire
0a6b75b71e
Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
github-actions[bot]
11ac5c8929
New Crowdin Translations (automated) (#32052)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-24 09:42:14 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Claire
b5bdc69f7b
Change mobile breakpoint back to old version and allow main column to shrink (#32033) 2024-09-23 12:53:35 +00:00
github-actions[bot]
ed90d9342e
New Crowdin Translations (automated) (#32011)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-23 08:50:19 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Eugen Rochko
e7fd0985c9
Change zoom icon in web UI (#29683) 2024-09-20 09:42:02 +00:00
github-actions[bot]
162f9a3c90
New Crowdin Translations (automated) (#31993)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-20 08:31:28 +00:00
Renaud Chaput
ae03e4ffc6
Update directory page options to use URL params (#31977) 2024-09-19 15:34:08 +00:00
Claire
57a38f071b
Fix custom history.push and history.replace building bogus location if path is omitted (#31980) 2024-09-19 14:58:33 +00:00
Eugen Rochko
ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
github-actions[bot]
efdc17513d
New Crowdin Translations (automated) (#31974)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-19 10:34:19 +00:00
Matt Jankowski
5d573c976e
Remove unused E2EE-related methods (#31964) 2024-09-19 10:23:58 +00:00
Christian Schmidt
7740f1a6bb
Mute XHR abort errors (#31952) 2024-09-18 08:43:24 +00:00
github-actions[bot]
bd86c692cf
New Crowdin Translations (automated) (#31959)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-18 08:06:44 +00:00
Claire
6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
David Roetzel
d8f9db547a
Merge commit from fork
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-09-17 16:59:29 +02:00
github-actions[bot]
6a233cbfcf
New Crowdin Translations (automated) (#31946)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-17 13:02:53 +00:00