aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-09-18Update AdminFE for 1.1 branchMark Felder
Latest build of AdminFE with Settings disabled as the feature is not stable yet
2019-09-17Merge branch 'cherry-pick-764931fc' into 'maint/1.1'rinpatch
Cherry pick tesla update to 1.1 See merge request pleroma/pleroma!1687
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
Update Tesla to 1.3 Closes #1262 See merge request pleroma/pleroma!1684 (cherry picked from commit 764931fc9f5eecc30c1ccb3b5bacf6338fcdf706) 8d812c28 Update Tesla to 1.3
2019-09-14Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'rinpatch
Backport a test fix to 1.1 See merge request pleroma/pleroma!1671
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668 (cherry picked from commit 3ae448b592214b43af1d079c997c6f6b91d31aeb) b870ae08 Fix `Activity.all_by_actor_and_id/2` test
2019-09-14Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'rinpatch
Backport config.md readdition to 1.1 See merge request pleroma/pleroma!1670
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666 (cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073) 69faec03 markdown generation to the new file c625fe6f config.md back 4da0da9a don't track generated_config.md
2019-09-14Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'rinpatch
Backport/fav reblog access control See merge request pleroma/pleroma!1669
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
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
2019-09-13Add a note about compatibility with MastodonEgor Kislitsyn
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-13Add more tests for Pleroma.ActivityEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 09:06:57 +0000