aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
AgeCommit message (Collapse)Author
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-25Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into ↵feld
'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
Add CLI list users command See merge request pleroma/pleroma!1990
2019-11-21Add CLI list users commandAlex Schroeder
2019-11-20[#1335] Added CHANGELOG.md entry.Ivan Tashkinov
2019-11-20changelog: add 1.1.6 entries from stablerinpatch
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-16Admin API: Error when trying to update reports in the "old" formatMaxim Filippov
2019-11-16Sync the changelogs between develop and stablerinpatch
2019-11-15Apply suggestion to CHANGELOG.mdlain
2019-11-14add changelog entry for MRF ObjectAgePolicyAriadne Conill
2019-11-14Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-14Admin API: list all statuses from a given instanceMaxim Filippov
2019-11-14Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld
Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-14Update CHANGELOG.mdlain
2019-11-12Update CHANGELOGEgor Kislitsyn
2019-11-11Merge branch 'feature/static-fe' into 'develop'kaniini
Static frontend See merge request pleroma/pleroma!1917
2019-11-11Add a changelog entry for !1940rinpatch
2019-11-11Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-11Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" ↵Maxim Filippov
changelog entry
2019-11-11Code style fixesMaxim Filippov
2019-11-11Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-11-10Disable attachment links by defaultrinpatch
Closes #1394
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-09Add changelog entry, cheatsheet docs, and alphabetize.Phil Hagelberg
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-08Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-06Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.Ivan Tashkinov
2019-11-05Merge branch 'develop' into feature/multiple-users-force-password-resetMaxim Filippov
2019-11-05Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-04Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-11-04Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the ↵eugenijm
`conversation` stream event payload.
2019-11-01Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-11-01Force password reset for multiple usersMaxim Filippov
2019-10-31updated docs\changelogMaksim Pechnikov
2019-10-27Merge branch 'develop' into feature/store-statuses-data-inside-flagMaxim Filippov
2019-10-27Strip status data from Flag (when federating or closing/resolving report)Maxim Filippov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex