From: feld <feld@feld.me>
Date: Mon, 25 Nov 2019 13:29:22 +0000 (+0000)
Subject: Merge branch 'fix/update-reports-old-format' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9374b527569d9182773fe52209cdb86193dbf6a2;p=akkoma

Merge branch 'fix/update-reports-old-format' into 'develop'

Admin API: Fix error when trying to update reports in the "old" format

See merge request pleroma/pleroma!1986
---

9374b527569d9182773fe52209cdb86193dbf6a2
diff --cc CHANGELOG.md
index 8db8039b8,740facf04..db6d45c61
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -81,43 -77,9 +81,44 @@@ The format is based on [Keep a Changelo
  
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
  - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
+ - Admin API: Error when trying to update reports in the "old" format
  </details>
  
 +## [1.1.6] - 2019-11-19
 +### Fixed
 +- Not being able to log into to third party apps when the browser is logged into mastofe
 +- Email confirmation not being required even when enabled
 +- Mastodon API: conversations API crashing when one status is malformed
 +
 +### Bundled Pleroma-FE Changes
 +#### Added
 +- About page
 +- Meme arrows
 +
 +#### Fixed
 +- Image modal not closing unless clicked outside of image
 +- Attachment upload spinner not being centered
 +- Showing follow counters being 0 when they are actually hidden
 +
 +## [1.1.5] - 2019-11-09
 +### Fixed
 +- Polls having different numbers in timelines/notifications/poll api endpoints due to cache desyncronization
 +- Pleroma API: OAuth token endpoint not being found when ".json" suffix is appended
 +
 +### Changed
 +- Frontend bundle updated to [044c9ad0](https://git.pleroma.social/pleroma/pleroma-fe/commit/044c9ad0562af059dd961d50961a3880fca9c642)
 +
 +## [1.1.4] - 2019-11-01
 +### Fixed
 +- Added a migration that fills up empty user.info fields to prevent breakage after previous unsafe migrations.
 +- Failure to migrate from pre-1.0.0 versions
 +- Mastodon API: Notification stream not including follow notifications
 +
 +## [1.1.3] - 2019-10-25
 +### Fixed
 +- Blocked users showing up in notifications collapsed as if they were muted
 +- `pleroma_ctl` not working on Debian's default shell
 +
  ## [1.1.2] - 2019-10-18
  ### Fixed
  - `pleroma_ctl` trying to connect to a running instance when generating the config, which of course doesn't exist.