11147 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	ecc6ed6a02	Merge pull request #5441 from pixelfed/staging ... Staging	2025-01-05 17:44:32 -07:00
daniel	e469038402	Merge pull request #5439 from LiohMoeller/dev ... Use DOCKER_PROXY_VERSION from .env file	2025-01-05 17:43:46 -07:00
daniel	c15f3d36bd	Merge pull request #5440 from pixelfed/staging ... Update Data Export, refactor following/follower and statuses exports to allow accounts of any size	2025-01-05 16:26:02 -07:00
Daniel Supernault	9c0fb07c6d	Update changelog	2025-01-05 16:24:47 -07:00
Daniel Supernault	0d25917c29	Update Data Export, refactor following/follower and statuses exports to allow accounts of any size with api entity instead of ap	2025-01-05 16:24:23 -07:00
Lioh Moeller	10f23905eb	Update docker-compose.yml ... use DOCKER_PROXY_VERSION env var instead	2025-01-05 23:36:36 +01:00
Lioh Moeller	03c97e6872	Update .env.docker ... Updated DOCKER_PROXY_VERSION in .env	2025-01-05 23:35:13 +01:00
daniel	dcd14aa50c	Merge pull request #5438 from pixelfed/staging ... Staging	2025-01-05 15:28:10 -07:00
Daniel Supernault	6a20c34de1	Update changelog	2025-01-05 15:26:34 -07:00
Daniel Supernault	83cc932fe9	Update AP Status Transformer, fix inReplyTo. Fixes #5409	2025-01-05 15:24:10 -07:00
daniel	a034905b23	Merge pull request #5437 from pixelfed/staging ... Staging	2025-01-05 15:15:34 -07:00
Daniel Supernault	138b07598d	Update compiled assets	2025-01-05 15:11:25 -07:00
Daniel Supernault	0a73094d82	Refactor Hashtag component from #5427	2025-01-05 14:55:16 -07:00
daniel	6ea108b67c	Merge pull request #5427 from witten/staging ... Fix missing video thumbnails on hashtag page (#5394).	2025-01-05 14:48:06 -07:00
daniel	fff15b416f	Merge pull request #5389 from nesges/dev ... internationalization of site/*, settings/*	2025-01-05 14:40:11 -07:00
daniel	3dd515006c	Merge branch 'staging' into dev	2025-01-05 14:39:20 -07:00
daniel	6c47147219	Merge pull request #5436 from pixelfed/staging ... Staging	2025-01-05 14:32:48 -07:00
daniel	0a05f5dba8	Merge pull request #5430 from pixelfed/l10n_staging ... New Crowdin updates	2025-01-05 14:32:05 -07:00
daniel	fd437db1da	Merge pull request #5435 from LiohMoeller/dev ... Update docker-compose.yml	2025-01-05 14:31:40 -07:00
Lioh Moeller	c72dc47452	Update docker-compose.yml ... Expecting: TRUSTED CERTIFICATE) while SSL handshaking fixes: https://github.com/nginx-proxy/nginx-proxy/issues/2287	2025-01-05 22:29:03 +01:00
daniel	81968fd47c	Merge pull request #5434 from pixelfed/staging ... Fix typo	2025-01-05 13:49:46 -07:00
Daniel Supernault	fc8709bc4b	Fix typo	2025-01-05 13:49:13 -07:00
daniel	defce561a5	Merge pull request #5433 from pixelfed/staging ... Staging	2025-01-05 13:46:31 -07:00
Daniel Supernault	bbe447244d	Update changelog	2025-01-05 13:45:41 -07:00
Daniel Supernault	d8f5c3027c	Update BearerTokenResponse, return scopes in oauth/token endpoint. Fixes #5286	2025-01-05 13:45:05 -07:00
daniel	b321185a0b	New translations web.php (Serbian (Latin)) ... [ci skip]	2025-01-05 12:27:04 -07:00
daniel	edafdc6837	New translations web.php (Chinese Traditional) ... [ci skip]	2025-01-05 12:26:57 -07:00
daniel	229d670405	New translations web.php (Chinese Simplified) ... [ci skip]	2025-01-05 12:26:56 -07:00
daniel	ef3c9495d4	New translations web.php (Serbian (Cyrillic)) ... [ci skip]	2025-01-05 12:26:55 -07:00
daniel	384c014547	New translations web.php (Portuguese) ... [ci skip]	2025-01-05 12:26:53 -07:00
daniel	528312951e	New translations web.php (Portuguese, Brazilian) ... [ci skip]	2025-01-05 12:26:43 -07:00
daniel	4e3d379d4f	Merge pull request #5432 from pixelfed/staging ... Staging	2025-01-05 11:33:13 -07:00
Daniel Supernault	d6cf5a622a	Update changelog. Fixes #5431	2025-01-05 11:32:46 -07:00
Daniel Supernault	aa44835434	Update AdminSettingsController, increase max photo size limit from 50MB to 1GB	2025-01-05 11:31:44 -07:00
daniel	28cfe90dd7	New translations web.php (Serbian (Latin)) ... [ci skip]	2025-01-04 21:01:27 -07:00
daniel	40cc09cab1	New translations web.php (Chinese Traditional) ... [ci skip]	2025-01-04 21:01:21 -07:00
daniel	51986bcff1	New translations web.php (Chinese Simplified) ... [ci skip]	2025-01-04 21:01:20 -07:00
daniel	e3737721ac	New translations web.php (Serbian (Cyrillic)) ... [ci skip]	2025-01-04 21:01:18 -07:00
daniel	b5cee84164	New translations web.php (Portuguese) ... [ci skip]	2025-01-04 21:01:16 -07:00
daniel	7c6175d0fb	New translations web.php (Portuguese, Brazilian) ... [ci skip]	2025-01-04 21:01:05 -07:00
daniel	18c95136fd	Merge pull request #5429 from pixelfed/staging ... Fix oauth endpoint	2025-01-04 16:40:44 -07:00
Daniel Supernault	57ede29175	Fix oauth endpoint	2025-01-04 16:39:19 -07:00
daniel	bf0a82f884	Merge pull request #5428 from pixelfed/staging ... Update VerifyCsrfToken middleware, add oauth token. Fixes #5426	2025-01-04 14:50:53 -07:00
Daniel Supernault	79ebbc2d9f	Update VerifyCsrfToken middleware, add oauth token. Fixes #5426	2025-01-04 14:50:00 -07:00
Dan Helfman	bfc8ca9e6e	Fix missing video thumbnails on hashtag page (#5394).	2025-01-04 10:32:26 -08:00
daniel	59f908f5c5	Merge pull request #5425 from pixelfed/staging ... Staging	2025-01-04 04:48:39 -07:00
Daniel Supernault	27f1cdb6e4	Update changelog	2025-01-04 04:47:57 -07:00
Daniel Supernault	56f17b9957	Update ApiV1Dot1Controller, fix in-app registration	2025-01-04 04:47:04 -07:00
Daniel Supernault	4e1dd59992	Update CollectionController, fix showCollection signature	2025-01-04 04:42:59 -07:00
root (Deneir)	6baafa4079	resolve merge conflicts	2025-01-04 10:29:06 +01:00