1
0
Commit Graph

13425 Commits

Author SHA1 Message Date
Essem
12c07b66b3
Add reaction notification column settings
This was in a previous PR. Not quite sure how it didn't carry over.
2024-07-24 22:54:26 -05:00
Essem
5adfa5a30f
More cleanup 2024-07-24 22:54:26 -05:00
Essem
b4926ebf78
Linting fixes 2024-07-24 22:54:25 -05:00
Essem
c4f5611d43
Refactor react services 2024-07-24 22:54:25 -05:00
Essem
42a377fa62
Fix reblog reactions 2024-07-24 22:54:25 -05:00
Essem
f381aabbf1
Add notification emails for reactions 2024-07-24 22:54:25 -05:00
Essem
45e1d4ed74
Add support for emoji reactions
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-07-24 22:54:25 -05:00
Claire
6be21ae8ac
Fix double indent for post attachments and metadata in grouped notifications (#2793) 2024-07-24 22:35:39 +02:00
Michael Stanclift
2919d8b097 [Glitch] Recolor Preferences/Admin UI to better match main design
Port 8b7f93cc7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-24 20:14:13 +02:00
Claire
d999fc52ba Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
Claire
e507d17520 [Glitch] Widen the clickable area for statuses in grouped notifications
Port a8330be93e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-23 20:28:22 +02:00
Nick Schonning
977337f2d2 [Glitch] Update Prettier to 3.3.3
Port 9a015a2a15 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-23 20:28:22 +02:00
Claire
838ea5f9cd [Glitch] Fix keyboard shortcuts and navigation in grouped notifications
Port af06d74574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-23 20:28:22 +02:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Michael Stanclift
8b7f93cc7f
Recolor Preferences/Admin UI to better match main design (#31034) 2024-07-23 15:30:45 +00:00
Adam Niedzielski
cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Claire
a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Emelia Smith
bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Nick Schonning
9a015a2a15
Update Prettier to 3.3.3 (#31106) 2024-07-23 06:46:09 +00:00
Claire
af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire
cbf25634a9 [Glitch] Fix reblogging after refactor
Port 55705d8191 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-22 22:03:10 +02:00
Claire
643b1ef3e9 [Glitch] Refactor CW handling in an action
Port 9cb9427133 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-22 22:03:10 +02:00
Claire
f13a231b39 [Glitch] Refactor code for reblogging and favouriting
Port 03dea64b79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-22 22:03:10 +02: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
Claire
ced5e853c7
Fix duplicate orderedItems in user archive's outbox.json (#31099) 2024-07-22 08:56:05 +00: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
2774980589
Fix syntax error in grouped notifications CTE on some PostgreSQL versions (#31098) 2024-07-22 07:37:27 +00:00
Claire
95984b729a [Glitch] Remove routerHistory parameters from composer actions
Port e768b23aa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-19 18:06:35 +02:00
Michael Stanclift
9f05a06dee [Glitch] Fix double border on column filter on narrow screens
Port 784e088533 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-19 17:46:56 +02:00
Claire
f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Matt Jankowski
0397df9bef
Resolve TODO in api/v1/admin/domain_* controllers (#31067) 2024-07-19 15:32:42 +00:00
Claire
e768b23aa9
Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
Claire
2e63e802b3
Fix inconsistent padding in glitch-soc's grouped notifications (#2784) 2024-07-19 12:13:50 +02:00
Michael Stanclift
784e088533
Fix double border on column filter on narrow screens (#31068) 2024-07-19 08:30:26 +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
Renaud Chaput
7224e24054 [Glitch] Grouped Notifications UI
Port f587ff643f to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 19:55:02 +02:00
Claire
c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Claire
6e47637dd4
Fix grouping across hourly buckets happening in a 12 seconds window instead of 12 hours window (#31062) 2024-07-18 15:23:40 +00: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
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00