UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3101 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-12-29 02:10:13 -07:00 committed by GitHub
commit 8c917e8996
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -9,6 +9,9 @@
- Added UI Settings modal and fixed height media previews setting ([f2467e71](https://github.com/pixelfed/pixelfed/commit/f2467e71))
- Set max-width of 1440px for larger screens ([af68872a](https://github.com/pixelfed/pixelfed/commit/af68872a))
### Configuration
- Enable network timeline by default ([b95aec12](https://github.com/pixelfed/pixelfed/commit/b95aec12))
### Added
- Manual email verification requests. ([bc659387](https://github.com/pixelfed/pixelfed/commit/bc659387))
- Added StatusMentionService, fixes #3026. ([e5387d67](https://github.com/pixelfed/pixelfed/commit/e5387d67))

2
config/federation.php
View file

@ -40,6 +40,6 @@ return [
'enabled' => env('WEBFINGER', true)
],
'network_timeline' => env('PF_NETWORK_TIMELINE', false)
'network_timeline' => env('PF_NETWORK_TIMELINE', true)
];

BIN
public/js/spa.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.