aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-04Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'kaniini
backport MR 1779 to maint/1.1 See merge request pleroma/pleroma!1791
2019-10-04update changelogAriadne Conill
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04Merge branch 'backport/hex-flake-id' into 'maint/1.1'kaniini
backport: hex `flake_id` support See merge request pleroma/pleroma!1793
2019-10-04Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'kaniini
backport: Track failed proxy urls and don't request them again See merge request pleroma/pleroma!1792
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
backport 1296 fix to maint/1.1 See merge request pleroma/pleroma!1790
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
backport: undo fixes See merge request pleroma/pleroma!1789
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 'chore/1.1-changelog-fixup' into 'maint/1.1'kaniini
Sync 1.1.0 changelog with develop See merge request pleroma/pleroma!1787
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
Mostly !1724 backport, but as a new commit because it was easier this way
2019-10-04Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'kaniini
widen streaming API blocks (for 1.1) See merge request pleroma/pleroma!1785
2019-10-04Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'kaniini
Backport !1777 to 1.1 See merge request pleroma/pleroma!1786
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
nickname Closes #1293
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 ↵Ariadne Conill
blocklist and an activity's recipientlist
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
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-10-04Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'rinpatch
Remove in-db configuration references from 1.1 See merge request pleroma/pleroma!1781
2019-10-04Remove in-db configuration references from 1.1rinpatch
It's still too unstable to be used.
2019-09-30Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'v1.0.90kaniini
Pleroma 1.0.90 (aka 1.1 RC1). See merge request pleroma/pleroma!1754
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
Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1753
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'rinpatch
Backport !1749 to 1.1 See merge request pleroma/pleroma!1751
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749 (cherry picked from commit 7c9b023a918c84b60ae6547289a083c671a3659b) 71315800 CI: Enable OTP release building for maint/* branches
2019-09-30Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'kaniini
maint/1.1: update pleroma fe See merge request pleroma/pleroma!1750
2019-09-30update pleroma feAriadne Conill
2019-09-26Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'rinpatch
Backport/1.1 hackney and outbox fixes See merge request pleroma/pleroma!1718
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
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-26mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-19Merge branch 'update/admin-fe-stable' into 'maint/1.1'kaniini
Update AdminFE for 1.1 branch See merge request pleroma/pleroma!1693
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 03:06:52 +0000