aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-04ActivityPub: Change addressing of Undo.lain
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-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-04Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'rinpatch
2019-10-04Remove in-db configuration references from 1.1rinpatch
2019-09-30Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'v1.0.90kaniini
2019-09-30Pleroma 1.0.90 (aka 1.1 RC1).Ariadne Conill
2019-09-30Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'kaniini
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'rinpatch
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
2019-09-30Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'kaniini
2019-09-30update pleroma feAriadne Conill
2019-09-26Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'rinpatch
2019-09-26Lintingrinpatch
2019-09-26Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.exrinpatch
2019-09-26Credo considered harmfulrinpatch
2019-09-26Remove useless with clauserinpatch
2019-09-26Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-26Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
2019-09-26mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
2019-09-19Merge branch 'update/admin-fe-stable' into 'maint/1.1'kaniini
2019-09-18Update AdminFE for 1.1 branchMark Felder
2019-09-17Merge branch 'cherry-pick-764931fc' into 'maint/1.1'rinpatch
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
2019-09-14Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'rinpatch
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
2019-09-14Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'rinpatch
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
2019-09-14Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'rinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
2019-09-13Merge branch 'cleanup-activity' into 'develop'lain
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch