8270 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
daniel	66ab7491a3	Merge pull request #3506 from pixelfed/staging ... Revert composer.lock removal	2022-05-21 00:22:58 -06:00
Daniel Supernault	1301ab42c6	Revert composer.lock removal	2022-05-21 00:21:58 -06:00
daniel	a87bd46e89	Merge pull request #3505 from pixelfed/staging ... Remove composer.lock	2022-05-21 00:18:28 -06:00
Daniel Supernault	8f4555046a	Remove composer.lock	2022-05-21 00:18:05 -06:00
Shlee	142caebe91	Update about.blade.php	2022-05-21 15:44:44 +09:30
daniel	74c85e4e11	Merge pull request #3503 from pixelfed/staging ... Update gitignore	2022-05-21 00:14:10 -06:00
Daniel Supernault	51c38f8a34	Update gitignore	2022-05-21 00:13:27 -06:00
daniel	b3e363d287	Merge pull request #3502 from pixelfed/staging ... Staging	2022-05-21 00:00:19 -06:00
Daniel Supernault	ba77c150fe	Update composer deps based on php 7.4	2022-05-20 23:53:26 -06:00
Daniel Supernault	f1591897e7	Update composer deps	2022-05-20 23:49:51 -06:00
Daniel Supernault	d613696b72	Update npm deps	2022-05-20 23:48:52 -06:00
daniel	d341d0557c	Merge pull request #3498 from shleeable/patch-12 ... Update .env.example - SESSION_DRIVER=database	2022-05-20 23:40:49 -06:00
daniel	413475aa44	Merge pull request #3494 from shleeable/patch-28 ... Delete self-diagnosis.php	2022-05-20 23:39:28 -06:00
daniel	ecffbd294e	Merge pull request #3490 from shleeable/patch-25 ... Update LabsSettings.php - CookieJar::make() expects string, true given.	2022-05-20 23:38:40 -06:00
daniel	8d49ca18fd	Merge pull request #3486 from shleeable/patch-21 ... Update InstallController.php - function version_compare expects string, float given.	2022-05-20 23:35:20 -06:00
daniel	ccc219bf55	Merge pull request #3485 from shleeable/patch-20 ... Update MediaDraftTransformer.php	2022-05-20 23:33:22 -06:00
daniel	c516174376	Merge pull request #3484 from shleeable/patch-19 ... Update ResultsTransformer.php	2022-05-20 23:32:02 -06:00
daniel	9784e261ea	Merge pull request #3483 from shleeable/patch-18 ... Update SpaController.php	2022-05-20 23:29:21 -06:00
daniel	0b16a79fcc	Merge pull request #3501 from pixelfed/staging ... Staging	2022-05-20 23:21:39 -06:00
Daniel Supernault	20e0371c19	Update AP helpers, remove unused variable	2022-05-20 23:19:45 -06:00
Daniel Supernault	c989b2a548	Update changelog	2022-05-20 23:11:53 -06:00
Daniel Supernault	505261dab1	Refactor AP profileFetch logic to fix race conditions and improve updating fields and avatars	2022-05-20 23:09:25 -06:00
Daniel Supernault	108e380394	Add ffmpeg config, disable logging by default	2022-05-20 21:17:54 -06:00
Daniel Supernault	9174d83b64	Update migration, fixes #3497	2022-05-20 20:36:35 -06:00
daniel	0641ed26f1	Merge pull request #3500 from pixelfed/staging ... Staging	2022-05-20 20:26:16 -06:00
Daniel Supernault	7937686af1	Update changelog	2022-05-20 20:25:50 -06:00
daniel	21d3a0f8b6	Merge pull request #3499 from fedibird/fix-mastodon-api-compatibility ... Fix mastodon api compatibility	2022-05-20 19:42:23 -06:00
noellabo	2093d1b33b	Change ISO-8601 to RFC 3339 EXTENDED	2022-05-21 05:14:22 +09:00
noellabo	1bdfa7a4a2	Fix instance API	2022-05-21 05:13:03 +09:00
Shlee	6218c40af7	Update .env.example	2022-05-20 11:57:58 +09:30
Daniel Supernault	d48e6c5d67	Merge branch 'staging' into dev	2022-05-18 03:15:24 -06:00
Daniel Supernault	03326459f8	Merge branch 'dev' into staging	2022-05-18 03:14:48 -06:00
Daniel Supernault	1c441f5549	Update compiled assets	2022-05-18 03:11:39 -06:00
Daniel Supernault	4b31573300	Update changelog	2022-05-18 03:01:26 -06:00
Daniel Supernault	10a676f4b5	Update compiled assets	2022-05-18 03:01:15 -06:00
Daniel Supernault	d48642132b	Add custom content warnings/spoiler text	2022-05-18 02:58:49 -06:00
daniel	50dc231b86	Merge pull request #3479 from shleeable/patch-17 ... Diagnostics view	2022-05-18 00:05:12 -06:00
Shlee	36f4ab7897	Update home.blade.php	2022-05-18 15:32:35 +09:30
Shlee	7925b7023e	Update home.blade.php	2022-05-18 15:30:37 +09:30
Shlee	077ce341f3	Update home.blade.php	2022-05-18 15:28:46 +09:30
daniel	7d26f4ef2e	Merge pull request #3453 from shleeable/staging-unwanted-semicolons ... unwanted semicolons	2022-05-17 23:43:23 -06:00
Daniel Supernault	657c66c1f1	Update AP Helpers, fix getSensitive and getScope missing parameters	2022-05-17 23:25:15 -06:00
Shlee	ef78b73e7f	Delete self-diagnosis.php	2022-05-18 14:26:39 +09:30
daniel	2e0ee6a5ce	Merge pull request #3492 from pixelfed/staging ... Update compiled assets	2022-05-17 22:10:36 -06:00
Daniel Supernault	4e99e40752	Update compiled assets	2022-05-17 22:10:11 -06:00
daniel	948b131aaf	Merge pull request #3491 from pixelfed/staging ... Update compiled assets	2022-05-17 22:00:48 -06:00
Daniel Supernault	8c4ad083ec	Update compiled assets	2022-05-17 22:00:13 -06:00
Shlee	7447209236	Update SettingsController.php	2022-05-18 11:51:21 +09:30
Shlee	9b792e8e98	Update LabsSettings.php	2022-05-18 11:48:16 +09:30
Shlee	a54d9c4f71	Update InstallController.php	2022-05-17 20:37:38 +09:30