UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1713 from pixelfed/staging

Browse source 
v0.10.5
This commit is contained in:
daniel 2019-09-24 12:07:45 -06:00 committed by GitHub
commit f8441580e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CHANGELOG.md
View file

@ -1,6 +1,17 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.3...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.4...dev)
### Added
- Added ```software``` back to AccountTransformer [93c687c7](https://github.com/pixelfed/pixelfed/commit/93c687c7)
### Fixed
- Fixed cache bug in privacy and terms pages [#1712](https://github.com/pixelfed/pixelfed/commit/fe522da8db7a8b0d7c18d405abcb885f8678f35c)
### Changed
## [v0.10.4 (2019-09-24)](https://github.com/pixelfed/pixelfed/compare/v0.10.3...v0.10.4)
### Added ### Added
- Added Welsh translations [#1706](https://github.com/pixelfed/pixelfed/pull/1706) - Added Welsh translations [#1706](https://github.com/pixelfed/pixelfed/pull/1706)

1
app/Transformer/Api/AccountTransformer.php
View file

@ -40,6 +40,7 @@ class AccountTransformer extends Fractal\TransformerAbstract
'fields' => [], 'fields' => [],
'bot' => false, 'bot' => false,
'website' => $profile->website, 'website' => $profile->website,
'software' => 'pixelfed',
'is_admin' => (bool) $is_admin, 'is_admin' => (bool) $is_admin,
]; ];
} }

2
config/pixelfed.php
View file

@ -23,7 +23,7 @@ return [
| This value is the version of your Pixelfed instance. | This value is the version of your Pixelfed instance.
| |
*/ */
'version' => '0.10.3', 'version' => '0.10.5',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------