8,204 commits

Author	SHA1	Message	Date
Essem	2f50bcafc8	Merge remote-tracking branch 'upstream/main'	2024-07-24 23:04:49 -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 '06f070d86d' 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 'cd0ca4b994' 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
Claire	a8330be93e	Widen the clickable area for statuses in grouped notifications (#31111)	2024-07-23 12:11:08 +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 '55705d8191' 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 '80d9bff6df' 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	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 '0397df9bef' 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
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
Essem	a6e87ab288	Add notification grouping for reactions	2024-07-18 21:01:46 -05:00
Essem	63f5f98eb8	Merge remote-tracking branch 'upstream/main'	2024-07-18 16:21:00 -05: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 '82344342c1' 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
Essem	db66504d03	Update to mastomodern 2.0.1	2024-07-17 17:19:46 -05:00
Claire	5e7720d11b	Merge commit 'aa4d8987a0' into glitch-soc/merge-upstream	2024-07-17 22:20:12 +02:00
Essem	dd4980342f	Merge remote-tracking branch 'upstream/main'	2024-07-17 14:46:24 -05: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 '66430cb25c' 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
David Roetzel	70969ac64c	[Glitch] Move filtered notifications bar in scrollable area ... Port 9d0bce4072 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-07-15 18:57:38 +02:00
Claire	64b2c712d4	Merge commit '9d0bce4072' 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
Essem	99b9fb96ac	Update to mastomodern 2.0.0	2024-07-14 16:39:49 -05:00
Essem	0af75afe70	Merge remote-tracking branch 'upstream/main'	2024-07-12 10:49:46 -05:00
Claire	8d2a93b0cb	[Glitch] Add setting to disable hover cards ... Port ad52b04a1c to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-07-12 13:50:42 +02:00
Claire	55cf5e0188	Merge commit 'c929b4cace' 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