1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 22:29:07 +09:00
Commit Graph

3974 Commits

Author SHA1 Message Date
Renaud Chaput
32a78e56e0
Add a follow button & follower count on follow notifications (#31433) 2024-08-16 10:00:59 +00:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) (#31440)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-16 09:11:33 +00:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
github-actions[bot]
202f43ccc6
New Crowdin Translations (automated) (#31411)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-14 07:04:01 +00:00
Renaud Chaput
0d85a79f19
Fix notification screen crashing in rare cases where the status no longer exists (#31403) 2024-08-14 06:47:15 +00:00
Claire
12582d095e
Fix styling of notification browser permission denied banner (#31406) 2024-08-13 19:32:27 +00:00
Renaud Chaput
c3e1d86d58
Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +00:00
github-actions[bot]
862e793b45
New Crowdin Translations (automated) (#31394)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-13 07:42:08 +00:00
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies (#31387) 2024-08-13 07:14:41 +00:00
Claire
83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
Claire
a7b718c31a
Fix all streamed notification types being stored without filtering (#31384) 2024-08-12 13:40:29 +00:00
github-actions[bot]
3abb5c0eaa
New Crowdin Translations (automated) (#31382)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-12 07:22:50 +00:00
Essem
2e03dc9fbf
Fix extra slash on notification policy request (#31378) 2024-08-11 21:28:43 +00:00
Claire
f441b280dc Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
github-actions[bot]
85152af95f
New Crowdin Translations (automated) (#31377)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:51:39 +00:00
github-actions[bot]
634ab0bad0
New Crowdin Translations (automated) (#31351)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-11 18:13:10 +00:00
Renaud Chaput
19dbc74d82
Fix typos in localisation from #31342 (#31369) 2024-08-10 18:14:37 +00:00
Claire
f43a4842f7 Merge commit '28411acebb5626acf43b44a7b6c33ac783156f72' into glitch-soc/merge-upstream 2024-08-09 18:51:31 +02:00
Claire
28411acebb
Fix “Accept all”/“Dismiss all” notification requests not working (#31358) 2024-08-09 16:40:15 +00:00
Travis Briggs
bcec8f53a4
Add hint to user that other remote statuses may not be displayed (#26910) 2024-08-09 16:12:51 +00:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire
658addcbf7
Add ability to report, block and mute from notification requests list (#31309)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-09 14:56:39 +00:00
Claire
1701575704
Add option to ignore filtered notifications to the web interface (#31342) 2024-08-09 14:21:55 +00:00
Claire
6ca731e9b6
Change unread notification count to only cover the selected notification type (#31326) 2024-08-08 20:20:52 +00:00
Renaud Chaput
2095d0f2b0
Update notification labels for mentions (#31304) 2024-08-08 20:20:35 +00:00
Claire
dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
Claire
079d681ac6
Fix uninitialized grouped notifications read marker on initial load (#31347) 2024-08-08 17:00:05 +00:00
github-actions[bot]
0e4d3c0403
New Crowdin Translations (automated) (#31337)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-08 13:54:10 +00:00
Claire
2edae5ea28
Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component (#31338) 2024-08-08 10:57:21 +00:00
Claire
ac9040b76b
Add explainer for filtered notifications from limited accounts (#31331) 2024-08-08 09:16:33 +00:00
Claire
f8629367d2
Add unchangeable filtered notification setting for limited accounts (#31324) 2024-08-07 23:09:30 +00:00
Claire
06e034db15 Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream 2024-08-07 19:22:25 +02:00
Claire
6f285bb2a6
Change group notifications unread markers to only be cleared when focusing/navigating again (#31325) 2024-08-07 11:12:42 +00:00
github-actions[bot]
fc964c9bfd
New Crowdin Translations (automated) (#31321)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-07 09:32:16 +00:00
Claire
08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Claire
c8b9e60ec1
Fix mutes and blocks not immediately cleaning up notification requests in Web UI (#31316) 2024-08-06 13:35:15 +00:00
Claire
30430a62e2
Fix broken “mute” button in mutes list (#31315) 2024-08-06 13:34:55 +00:00
Renaud Chaput
57a1f86626
Remove usage of non-public RTK types (#31312) 2024-08-06 12:22:18 +00:00
renovate[bot]
103e544cfa
fix(deps): update dependency @reduxjs/toolkit to v2.2.7 - abandoned (#31173)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-06 07:54:00 +00:00
github-actions[bot]
d15f46a0b8
New Crowdin Translations (automated) (#31307)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-06 07:22:38 +00:00
Renaud Chaput
97b9e8befd
Add account notes to hover cards (#31300) 2024-08-06 06:53:59 +00:00
github-actions[bot]
cb56a6dc7e
New Crowdin Translations (automated) (#31276)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-05 07:43:04 +00:00
Renaud Chaput
19f4aa1147
Fix typo in english message (filtred => filtered) (#31273) 2024-08-02 19:55:13 +00:00
Claire
e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
Claire
ad95c98054
Further de-emphasize filtered notifications banner and add setting to minimize it (#31250) 2024-08-02 14:59:37 +00:00
Renaud Chaput
cc453f2221
Change the filtered notification count to be in the account avatar (#31262) 2024-08-02 13:18:19 +00:00
Claire
bb3941f885
Change DropdownMenu component's items prop type (#31263) 2024-08-02 13:15:18 +00:00
github-actions[bot]
caeae25b55
New Crowdin Translations (automated) (#31261)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-02 07:01:04 +00:00
Claire
afdfeb5856
Fix click event handling when clicking outside of an open dropdown menu (#31251) 2024-08-01 20:50:36 +00:00
github-actions[bot]
584b1524dd
New Crowdin Translations (automated) (#31237)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-01 09:27:24 +00:00
Claire
8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
Claire
a50c8e951f
Fix issue with grouped notifications UI due to recent API change (#31224) 2024-07-31 13:23:08 +00:00
Claire
2c1e75727d
Change filtered notification banner design to take up less space (#31222) 2024-07-31 12:36:08 +00:00
Claire
549ab089ee
Change grouped notifications API shape (take 2) (#31214) 2024-07-31 10:50:13 +00:00
Claire
288961bbb9
Change private mention icon for consistency in grouped notifications (#31223) 2024-07-31 10:26:43 +00:00
github-actions[bot]
520ff04248
New Crowdin Translations (automated) (#31219)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-31 08:09:49 +00:00
Claire
fd1bade135
Fix inconsistent dismiss icon for notification requests (#31220) 2024-07-31 07:52:59 +00:00
Claire
1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
2024-07-30 20:47:34 +02:00
github-actions[bot]
7d11a6c9b0
New Crowdin Translations (automated) (#31206)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-30 08:15:40 +00:00
Claire
654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
github-actions[bot]
ec5a860924
New Crowdin Translations (automated) (#31169)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-29 08:24:15 +00:00
Claire
fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
David Roetzel
dfd43869c9
Decrease count of filtered notifications when notification requests are accepted or dismissed (#31149) 2024-07-26 09:36:54 +00:00
github-actions[bot]
3793c845c9
New Crowdin Translations (automated) (#31154)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-26 07:51:37 +00:00
Eugen Rochko
8818748b90
Change design of confirmation modals in web UI (#30884)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-07-25 17:05:54 +00:00
Claire
c94c5da7b4 Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream 2024-07-25 12:43:25 +02:00
github-actions[bot]
ef0e3e447a
New Crowdin Translations (automated) (#31119)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-25 07:44:00 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Claire
a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Claire
af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire
dcfcfdcb14 Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream 2024-07-22 21:41:31 +02:00
Claire
55705d8191
Fix reblogging after refactor (#31105) 2024-07-22 19:30:06 +00:00
Claire
9cb9427133
Refactor CW handling in an action (#31103) 2024-07-22 16:03:58 +00:00
Claire
03dea64b79
Refactor code for reblogging and favouriting (#31102) 2024-07-22 15:45:07 +00:00
Claire
2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
2024-07-22 17:38:30 +02:00
github-actions[bot]
5a60a3b80c
New Crowdin Translations (automated) (#31087)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-22 08:01:24 +00:00
Claire
f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Claire
e768b23aa9
Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
github-actions[bot]
8e0aed8ac7
New Crowdin Translations (automated) (#31072)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-19 08:21:09 +00:00
Claire
c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Renaud Chaput
f587ff643f
Grouped Notifications UI (#30440)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
github-actions[bot]
7d090b2ab6
New Crowdin Translations (automated) (#31055)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-18 08:00:29 +00:00
Claire
5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
github-actions[bot]
00c110ac7b
New Crowdin Translations (automated) (#31047)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-17 07:23:07 +00:00
Claire
c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
github-actions[bot]
66430cb25c
New Crowdin Translations (automated) (#31038)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-16 15:24:56 +00:00
Adam Niedzielski
a609940ec9
Fix test description in hashtag_bar (#30827) 2024-07-16 13:23:26 +00:00
Claire
64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
2024-07-15 18:51:38 +02:00
David Roetzel
9d0bce4072
Move filtered notifications bar in scrollable area (#30996)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-15 13:42:47 +00:00
github-actions[bot]
17117109ad
New Crowdin Translations (automated) (#31018)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-15 07:44:37 +00:00
Claire
55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
github-actions[bot]
28ad3588e4
New Crowdin Translations (automated) (#31006)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-12 08:25:27 +00:00
Claire
ad52b04a1c
Add setting to disable hover cards (#30931)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-07-11 19:42:58 +00:00
Claire
db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00
github-actions[bot]
c244b70dc2
New Crowdin Translations (automated) (#30993)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-11 10:38:35 +00:00
Claire
52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
github-actions[bot]
9984fca9a0
New Crowdin Translations (automated) (#30983)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-10 10:40:19 +00:00
Claire
388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
github-actions[bot]
249b4117f9
New Crowdin Translations (automated) (#30970)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-07-09 07:36:13 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00