10640 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Christian Winther	d3bbfdb6e0	Merge branch 'staging' of github.com:jippi/pixelfed into jippi-fork	2024-02-13 00:52:18 +00: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
Christian Winther	49a778d128	add CODEOWNERS	2024-02-11 02:00:09 +00:00
Christian Winther	fd62962d20	delete contrib	2024-02-11 01:57:11 +00:00
Christian Winther	e18d6083a2	bump dottie	2024-02-11 01:24:26 +00:00
Christian Winther	143d5703dd	update .env.docker	2024-02-10 23:08:22 +00:00
Christian Winther	bc66b6da18	many small fixes and improvements	2024-02-10 20:03:04 +00:00
Christian Winther	d8e1caec53	Merge branch 'staging' of github.com:pixelfed/pixelfed into jippi-fork	2024-02-10 10:44:02 +00: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
Christian Winther	d9a9507cc8	sync	2024-02-10 00:30:06 +00:00
Christian Winther	5bd93b0f5e	sync	2024-02-10 00:25:18 +00:00
Christian Winther	3d6efd098d	sync	2024-02-10 00:23:53 +00: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
Christian Winther	d374d73ba7	Merge branch 'staging' into jippi-fork	2024-02-08 01:17:25 +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