8,223 commits

Author	SHA1	Message	Date
Essem	2637a8cd05	Merge remote-tracking branch 'upstream/main'	2024-07-29 23:46:21 -05:00
Emelia Smith	ceb7972e6e	[Glitch] Implement UI for Admin Search of Hashtags ... Port SCSS changes from c40e481169 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-07-29 19:21:04 +02:00
Michael Stanclift	eae81d3254	[Glitch] Follow up tweaking of admin UI changes ... Port 848a5ca53d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-07-29 19:19:29 +02:00
Claire	654187a995	Merge commit '1229d2907a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
Emelia Smith	c40e481169	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00: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
Michael Stanclift	848a5ca53d	Follow up tweaking of admin UI changes (#31168)	2024-07-29 08:10:23 +00:00
Essem	7a7d637457	Fix i18n/lint	2024-07-27 21:44:11 -05:00
Essem	14eede02f3	Merge remote-tracking branch 'upstream/main'	2024-07-27 18:24:05 -05:00
David Roetzel	0e18e1ba31	[Glitch] Decrease count of filtered notifications when notification requests are accepted or dismissed ... Port dfd43869c9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-07-27 15:16:15 +02:00
Eugen Rochko	14bc73e94c	[Glitch] Change design of confirmation modals in web UI ... Port 8818748b90 to glitch-soc Co-authored-by: Renaud Chaput <renchap@gmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-07-27 15:16:15 +02:00
Claire	fb411b6d0f	Merge commit 'dd53792714' 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
Essem	686007b390	Merge remote-tracking branch 'upstream/main'	2024-07-25 16:14:48 -05: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 '4d374cf730' 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
Essem	8dc10c736d	Fix reactions bar alignment in grouped notifications	2024-07-24 23:10:43 -05:00
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