10148 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Emelia Smith	9978b2b959	Update .gitattributes to collapse diffs on generated files	2024-02-16 17:56:13 +01:00
daniel	01a86009e6	Merge pull request #4936 from pixelfed/staging ... Update Inbox, cast live filters to lowercase	2024-02-16 06:58:13 -07:00
Daniel Supernault	d835e0adaa	Update Inbox, cast live filters to lowercase	2024-02-16 06:57:04 -07:00
daniel	f45d293707	Merge pull request #4935 from pixelfed/staging ... Bump version to 0.11.12	2024-02-16 03:09:23 -07:00
Daniel Supernault	66f6640072	Bump version to 0.11.12	2024-02-16 03:08:50 -07:00
daniel	25dd2e46fe	Merge pull request #4934 from pixelfed/staging ... Add Software Update banner to admin home feeds	2024-02-16 03:02:36 -07:00
Daniel Supernault	f07843a0f2	Update compiled assets	2024-02-16 03:01:51 -07:00
Daniel Supernault	56b736c325	Update changelog	2024-02-16 03:00:51 -07:00
Daniel Supernault	b0fb198829	Add Software Update banner to admin home feeds	2024-02-16 02:58:27 -07:00
daniel	e1d579b10b	Merge pull request #4933 from pixelfed/staging ... Autospam Live Filters - block remote activities based on comma separated keywords	2024-02-16 02:20:23 -07:00
Daniel Supernault	83eadbb811	Update changelog	2024-02-16 02:20:11 -07:00
Daniel Supernault	40b45b2a11	Update Autospam, add live filters to block remote activities based on comma separated keywords	2024-02-16 02:15:39 -07:00
daniel	ccbba91e70	Merge pull request #4932 from pixelfed/staging ... Update routes	2024-02-15 23:36:51 -07:00
Daniel Supernault	bc4d223714	Update routes	2024-02-15 22:20:40 -07:00
daniel	0032415459	Merge pull request #4931 from pixelfed/staging ... Staging	2024-02-15 21:42:15 -07:00
Daniel Supernault	70fc44dfe5	Update changelog	2024-02-15 21:41:40 -07:00
Daniel Supernault	0f3ca19461	Update status view, fix unlisted/private scope bug	2024-02-15 21:41:18 -07:00
daniel	0dc54e9ac0	Merge pull request #4930 from pixelfed/staging ... Staging	2024-02-15 21:23:29 -07:00
Daniel Supernault	df5e61266c	Update changelog	2024-02-15 21:23:00 -07:00
Daniel Supernault	1232cfc86a	Update ActivityPubFetchService, enforce stricter Content-Type validation	2024-02-15 21:22:41 -07:00
daniel	af935c729b	Merge pull request #4929 from pixelfed/staging ... Staging	2024-02-15 20:59:35 -07:00
Daniel Supernault	4c6ec20e36	Update changelog	2024-02-15 20:59:08 -07:00
Daniel Supernault	fb0bb9a34f	Update Federation, use proper Content-Type headers for following/follower collections	2024-02-15 20:58:43 -07:00
daniel	b10c60584b	Merge pull request #4924 from pixelfed/staging ... Update public/network timelines, fix non-redis response and fix reblo…	2024-02-11 20:26:31 -07:00
Daniel Supernault	221fe43638	Update compiled assets	2024-02-11 20:25:18 -07:00
Daniel Supernault	97c131fdf2	Update AccountImport component	2024-02-11 20:24:27 -07:00
Daniel Supernault	78da12004f	Update changelog	2024-02-11 20:23:19 -07:00
Daniel Supernault	8b4ac5cc0b	Update public/network timelines, fix non-redis response and fix reblogs in home feed	2024-02-11 20:21:46 -07:00
daniel	bbd3688333	Merge pull request #4923 from pixelfed/staging ... Update ApiV1Controller, fix network timeline	2024-02-11 14:30:46 -07:00
Daniel Supernault	7b8977e9cc	Update changelog	2024-02-11 14:27:38 -07:00
Daniel Supernault	0faf59e3b7	Update ApiV1Controller, fix network timeline	2024-02-11 14:26:45 -07:00
daniel	8fa6ae421b	Merge pull request #4915 from pixelfed/staging ... Bump version to v0.11.11	2024-02-09 20:58:43 -07:00
Daniel Supernault	e5bbe9340a	Bump version to v0.11.11	2024-02-09 20:57:45 -07:00
Daniel Supernault	7a7b4bc717	Update AuthServiceProvider	2024-02-09 20:54:17 -07:00
daniel	8ab9951909	Merge pull request #4914 from pixelfed/staging ... Fix api endpoints	2024-02-09 20:52:09 -07:00
Daniel Supernault	62b9eef805	Fix api endpoints	2024-02-09 20:51:37 -07:00
daniel	67167a5b90	Merge pull request #4913 from pixelfed/staging ... Fix api endpoints	2024-02-09 20:45:44 -07:00
Daniel Supernault	fd7f5dbba1	Fix api endpoints	2024-02-09 20:45:10 -07:00
daniel	0649bb4754	Merge pull request #4912 from pixelfed/staging ... Fix api endpoints	2024-02-09 20:41:42 -07:00
Daniel Supernault	e354750808	Fix api endpoints	2024-02-09 20:41:12 -07:00
daniel	0dbbc6a6b4	Merge pull request #4911 from pixelfed/staging ... Staging	2024-02-09 20:06:20 -07:00
Daniel Supernault	607b239c1a	Bump version to v0.11.10	2024-02-09 20:05:22 -07:00
Daniel Supernault	2e6100f275	Update BearerTokenResponse, fix scope bug	2024-02-09 20:04:15 -07:00
daniel	7e47d6dccb	Merge pull request from GHSA-gccq-h3xj-jgvf ... [staging] Implement proper OAuth authorization on API endpoints	2024-02-09 19:44:27 -07:00
Emelia Smith	0f8e45fe75	Implement proper OAuth authorization on API endpoints	2024-02-09 02:28:08 +01:00
Emelia Smith	9330cd02f7	Implement proper OAuth authorization on Admin API endpoints	2024-02-09 02:28:08 +01:00
Emelia Smith	7b0a6060b2	Return access tokens' scopes, not hardcoded list	2024-02-09 02:28:08 +01:00
daniel	73b4dab9a8	Merge pull request #4904 from pixelfed/staging ... Update ApiV2Controller, add vapid key to instance object. Thanks this…	2024-02-07 06:00:20 -07:00
Daniel Supernault	2becd273c4	Update changelog	2024-02-07 06:00:09 -07:00
Daniel Supernault	4d02d6f12e	Update ApiV2Controller, add vapid key to instance object. Thanks thisismissem!	2024-02-07 05:59:12 -07:00