2,286 commits

Author	SHA1	Message	Date
Essem	845f95bc5d	Merge remote-tracking branch 'upstream/main'	2024-08-03 18:36:56 -05:00
Claire	e67e07211f	Merge commit 'ad95c98054' 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	2ec1181ee5	Fix contrast between background and form elements on some pages (#31266)	2024-08-02 13:55:31 +00:00
Emelia Smith	f55099fea3	Increase maximum page size for Admin Domain Management APIs (#31253)	2024-08-02 06:54:48 +00:00
Claire	da5b45a573	Add endpoints to accept and dismiss multiple notification requests at once (#31242)	2024-08-01 12:36:54 +00:00
Claire	8dd671a977	Merge commit 'a50c8e951f' into glitch-soc/merge-upstream	2024-07-31 18:16:01 +02:00
Claire	549ab089ee	Change grouped notifications API shape (take 2) (#31214)	2024-07-31 10:50:13 +00:00
Claire	1f796d129d	Merge commit '598ae4f2da' 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
Claire	598ae4f2da	Add endpoints for unread notifications count (#31191)	2024-07-30 08:39:11 +00:00
Essem	2637a8cd05	Merge remote-tracking branch 'upstream/main'	2024-07-29 23:46:21 -05: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
Essem	686007b390	Merge remote-tracking branch 'upstream/main'	2024-07-25 16:14:48 -05:00
Claire	cf5d2c3fe4	Merge commit '887e64efd4' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
Matt Jankowski	5f5373397f	Remove duplicate omniauth_only? helper method (#31066)	2024-07-25 14:59:56 +00:00
Essem	2f50bcafc8	Merge remote-tracking branch 'upstream/main'	2024-07-24 23:04:49 -05:00
Claire	68000956f4	Merge commit 'cd0ca4b994' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
Emelia Smith	bb2e5a4b58	Add audit logs to Admin::InstancesController (#27386)	2024-07-23 08:12:30 +00:00
Claire	f7598b267b	Merge commit '0397df9bef' 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
Essem	63f5f98eb8	Merge remote-tracking branch 'upstream/main'	2024-07-18 16:21:00 -05: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
Essem	dd4980342f	Merge remote-tracking branch 'upstream/main'	2024-07-17 14:46:24 -05:00
Claire	c546757cd1	Merge commit '66430cb25c' into glitch-soc/merge-upstream	2024-07-16 17:54:36 +02:00
Emelia Smith	aa88aca0ad	Add optional OAuth application to reports (#30539)	2024-07-16 13:23:08 +00:00
Essem	d0d49b2540	Merge remote-tracking branch 'upstream/main'	2024-07-14 16:32:10 -05:00
Claire	edec2e9fdf	Merge commit '00cb4a0313' into glitch-soc/merge-upstream	2024-07-14 18:43:35 +02:00
David Roetzel	35a437a03f	Destroy NotificationRequests that are dismissed (#31008)	2024-07-12 12:09:52 +00:00
Essem	4aa2f92bef	Merge remote-tracking branch 'upstream/main'	2024-07-10 09:41:37 -05:00
Claire	388672ff0d	Merge commit '967505ee9b' into glitch-soc/merge-upstream	2024-07-09 20:39:09 +02:00
Daniel M Brasil	3875bd138d	Fix HTTP 500 in /api/v1/polls/:id/votes (#25598)	2024-07-09 12:41:49 +00:00
Essem	6450fb0cf5	Merge remote-tracking branch 'upstream/main'	2024-07-04 10:31:27 -05:00
Claire	e61a7794f8	Merge commit 'df9e26158d' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly.	2024-07-04 17:12:14 +02:00
Claire	502cf75b16	Merge pull request from GHSA-58x8-3qxw-6hm7 ... * Fix insufficient permission checking for public timeline endpoints Note that this changes unauthenticated access failure code from 401 to 422 * Add more tests for public timelines * Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`	2024-07-04 16:26:49 +02:00
Claire	395f17ca17	Merge pull request from GHSA-vp5r-5pgw-jwqx ... * Fix streaming sessions not being closed when revoking access to an app * Add tests for GHSA-7w3c-p9j8-mq3x	2024-07-04 16:11:28 +02:00
Essem	771014fc90	Merge remote-tracking branch 'upstream/main'	2024-06-24 14:01:26 -05:00
Claire	3b4607991d	Merge commit '4743657ba2' into glitch-soc/merge-upstream	2024-06-22 20:59:23 +02:00
Matt Jankowski	929b9fdaff	Remove exclusion for Rails/LexicallyScopedActionFilter cop (#30697)	2024-06-21 15:34:13 +00:00
Essem	37467c0194	Merge remote-tracking branch 'upstream/main'	2024-06-21 10:27:51 -05:00
Claire	fd867adffe	Merge commit 'bb2d77b4a0' into glitch-soc/merge-upstream	2024-06-20 18:36:13 +02:00
Claire	bb2d77b4a0	Change /api/v2_alpha/notifications to only return historical data in pages (#30781)	2024-06-20 15:54:50 +00:00
Essem	167a30b2bf	Merge remote-tracking branch 'upstream/main'	2024-06-19 21:43:32 -05:00
Claire	4daed855e5	Merge commit 'd818ddd687' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Matt Jankowski	978601a0ae	Extract permitted params constant in v1/admin/tags (#30652)	2024-06-11 15:29:41 +00:00
Matt Jankowski	410370eecd	Extract PERMITTED_PARAMS constant from admin/domain_blocks controller (#30380)	2024-06-11 09:40:47 +00:00
Essem	9dcd9ba5b2	Merge remote-tracking branch 'upstream/main'	2024-06-10 16:59:22 -05:00
Claire	30b00ca2b5	Merge commit '5652ca6135' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Eugen Rochko	a2505e8611	Add timeline of public posts about a trending link to REST API (#30381)	2024-06-06 08:43:04 +00:00
Emelia Smith	e02d23b549	Change read:me scope to profile scope (#30357) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-06-06 07:30:10 +00:00