d9e0108baa
tests: add missing ExUnit.CaptureLog
5 years ago
17fed5ae52
application: fix up after_supervisor_start removal backport
5 years ago
e951c547f7
update changelog
5 years ago
abb967671a
streamer: worker: actually use should_send? consistently
5 years ago
d0e874c7f2
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
51b317a602
streamer: add missing copyright headers
5 years ago
4305ddef0a
tests: streamer: add a test for blocked transitive activities
5 years ago
a2e92a1b8a
remove remaining errors from tests
5 years ago
7d5f20b50f
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
a553ed5427
Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
...
Remove in-db configuration references from 1.1
See merge request pleroma/pleroma!1781
5 years ago
1e6aa10168
Remove in-db configuration references from 1.1
...
It's still too unstable to be used.
5 years ago
70d18a278c
Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'
...
Pleroma 1.0.90 (aka 1.1 RC1).
See merge request pleroma/pleroma!1754
5 years ago
5bfd4006ae
Pleroma 1.0.90 (aka 1.1 RC1).
5 years ago
57101955b6
Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'
...
Transmogrifier: Handle compact objects in undos.
See merge request pleroma/pleroma!1753
5 years ago
565b8d02c8
Transmogrifier: Handle compact objects in undos.
5 years ago
56c91d1323
Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'
...
Backport !1749 to 1.1
See merge request pleroma/pleroma!1751
5 years ago
96e1db1cf1
Merge branch 'ci/build-otp-maint' into 'develop'
...
CI: Enable OTP release building for maint/* branches
See merge request pleroma/pleroma!1749
(cherry picked from commit 7c9b023a9171315800
5 years ago
4f3b8d5399
Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'
...
maint/1.1: update pleroma fe
See merge request pleroma/pleroma!1750
5 years ago
979f66a99c
update pleroma fe
5 years ago
2b98ef832c
Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
...
Backport/1.1 hackney and outbox fixes
See merge request pleroma/pleroma!1718
5 years ago
6d1ca73466
Linting
5 years ago
4c6e5639d3
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
cfd9f73f0d
Credo considered harmful
5 years ago
9d32f38b39
Remove useless with clause
5 years ago
22a16a3e81
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
d4a76b0a6f
Don't embed the first page in inboxes/outboxes and refactor the views to
...
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.
5 years ago
e91f0e2801
mix.lock: Bump hackney to 1.15.2
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
5 years ago
53b4daa514
Merge branch 'update/admin-fe-stable' into 'maint/1.1'
...
Update AdminFE for 1.1 branch
See merge request pleroma/pleroma!1693
5 years ago
fe33084ea8
Update AdminFE for 1.1 branch
...
Latest build of AdminFE with Settings disabled as the feature is not stable yet
5 years ago
2ab7aeb3ab
Merge branch 'cherry-pick-764931fc' into 'maint/1.1'
...
Cherry pick tesla update to 1.1
See merge request pleroma/pleroma!1687
5 years ago
f339ec3939
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
(cherry picked from commit 764931fc9f8d812c28
5 years ago
6c3f5e8ba0
Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
...
Backport a test fix to 1.1
See merge request pleroma/pleroma!1671
5 years ago
c64ab84e6a
Merge branch 'fix-tests' into 'develop'
...
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
(cherry picked from commit 3ae448b592b870ae08
5 years ago
e71d662d3a
Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'
...
Backport config.md readdition to 1.1
See merge request pleroma/pleroma!1670
5 years ago
ea1867f48e
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
(cherry picked from commit 9c64a2571369faec03c625fe6f4da0da9a
5 years ago
90b0bd3984
Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'
...
Backport/fav reblog access control
See merge request pleroma/pleroma!1669
5 years ago
dca545bb0d
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
ae33cca4cf
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
056780fd8e
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
5 years ago
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
7b5c81b391
Add a note about compatibility with Mastodon
5 years ago
25d8216804
Add email change endpoint
5 years ago
5bfbad13ad
Add more tests for Pleroma.Activity
5 years ago
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
5ca643b80d
Merge branch 'fix/admin-api-docs' into 'develop'
...
Fix admin api docs for creating users
See merge request pleroma/pleroma!1660
5 years ago
528a88a686
Fix admin api docs for creating users
5 years ago
51609217c2
Merge branch 'fix/error-log-double-quotes' into 'develop'
...
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
5 years ago
102eb4455c
Fix associated test as well
5 years ago
Ariadne Conill