summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge branch 'update-activity-fixes' into 'develop'kaniini
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-05CommonAPI: Create profile updates as public.lain
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-05Add test for handling Announces with inlined object from different originThibaut Girka
2019-10-05Make credo happyThibaut Girka
2019-10-05Import object from self-Announce whenever possibleThibaut Girka
2019-10-05Merge branch 'revert-5c04e817' into 'develop'kaniini
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
2019-10-05Transmogrifier: Extend misskey like compatibility.lain
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-04Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'kaniini
2019-10-04update changelogAriadne Conill
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
2019-10-04Merge branch 'backport/hex-flake-id' into 'maint/1.1'kaniini
2019-10-04Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'kaniini
2019-10-04changelogAriadne Conill
2019-10-04Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-10-04Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-04Merge branch 'backport/issue-1296' into 'maint/1.1'kaniini
2019-10-04update changelogAriadne Conill
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'backport/undo-fixes' into 'maint/1.1'kaniini
2019-10-04update changelogAriadne Conill
2019-10-04ActivityPub.Utils: Fix undo test.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'issue/1296' into 'develop'kaniini
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'kaniini
2019-10-04Remove entries from develop that were in the section for some reasonrinpatch
2019-10-04Add back streaming fix entryrinpatch
2019-10-04Sync 1.1.0 changelog with developrinpatch
2019-10-04Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'kaniini
2019-10-04Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'kaniini
2019-10-04Merge branch 'bugfix/widen-streamer-blocks' into 'develop'kaniini
2019-10-04Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
2019-10-04tests: add missing ExUnit.CaptureLogAriadne Conill
2019-10-04application: fix up after_supervisor_start removal backportAriadne Conill
2019-10-04update changelogAriadne Conill
2019-10-04streamer: worker: actually use should_send? consistentlyAriadne Conill
2019-10-04streamer: worker: check for lack of intersectionality between a user's blockl...Ariadne Conill
2019-10-04streamer: add missing copyright headersAriadne Conill
2019-10-04tests: streamer: add a test for blocked transitive activitiesAriadne Conill
2019-10-04remove remaining errors from testsSteven Fuchs
2019-10-04Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
2019-10-04Admin API: Allow changing the state of multiple reports at onceMaxim Filippov