Commit graph

6651 commits

Author SHA1 Message Date
Ariadne Conill
abb967671a streamer: worker: actually use should_send? consistently 2019-10-04 16:06:20 +00:00
Ariadne Conill
d0e874c7f2 streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 16:06:14 +00:00
Ariadne Conill
51b317a602 streamer: add missing copyright headers 2019-10-04 16:06:08 +00:00
Ariadne Conill
4305ddef0a tests: streamer: add a test for blocked transitive activities 2019-10-04 16:06:00 +00:00
Steven Fuchs
a2e92a1b8a remove remaining errors from tests 2019-10-04 16:05:22 +00:00
Egor Kislitsyn
7d5f20b50f Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-10-04 16:01:31 +00:00
rinpatch
a553ed5427 Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
Remove in-db configuration references from 1.1

See merge request 
2019-10-04 13:23:01 +00:00
rinpatch
1e6aa10168 Remove in-db configuration references from 1.1
It's still too unstable to be used.
2019-10-04 16:17:27 +03:00
kaniini
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 
2019-09-30 16:40:46 +00:00
Ariadne Conill
5bfd4006ae Pleroma 1.0.90 (aka 1.1 RC1). 2019-09-30 16:39:20 +00:00
kaniini
57101955b6 Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'
Transmogrifier: Handle compact objects in undos.

See merge request 
2019-09-30 16:37:45 +00:00
lain
565b8d02c8 Transmogrifier: Handle compact objects in undos. 2019-09-30 16:25:26 +00:00
rinpatch
56c91d1323 Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'
Backport  to 1.1

See merge request 
2019-09-30 16:16:22 +00:00
kaniini
96e1db1cf1 Merge branch 'ci/build-otp-maint' into 'develop'
CI: Enable OTP release building for maint/* branches

See merge request 

(cherry picked from commit 7c9b023a91)

71315800 CI: Enable OTP release building for maint/* branches
2019-09-30 15:41:10 +00:00
kaniini
4f3b8d5399 Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'
maint/1.1: update pleroma fe

See merge request 
2019-09-30 15:35:47 +00:00
Ariadne Conill
979f66a99c update pleroma fe 2019-09-30 15:34:19 +00:00
rinpatch
2b98ef832c Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
Backport/1.1 hackney and outbox fixes

See merge request 
2019-09-26 06:11:52 +00:00
rinpatch
6d1ca73466 Linting 2019-09-26 09:03:20 +03:00
rinpatch
4c6e5639d3 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 2019-09-26 03:46:33 +03:00
rinpatch
cfd9f73f0d Credo considered harmful 2019-09-26 03:46:26 +03:00
rinpatch
9d32f38b39 Remove useless with clause 2019-09-26 03:46:17 +03:00
rinpatch
22a16a3e81 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-26 03:46:10 +03:00
rinpatch
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.
2019-09-26 03:45:58 +03:00
Haelwenn (lanodan) Monnier
e91f0e2801 mix.lock: Bump hackney to 1.15.2
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-26 03:27:36 +03:00
kaniini
53b4daa514 Merge branch 'update/admin-fe-stable' into 'maint/1.1'
Update AdminFE for 1.1 branch

See merge request 
2019-09-19 19:04:44 +00:00
Mark Felder
fe33084ea8 Update AdminFE for 1.1 branch
Latest build of AdminFE with Settings disabled as the feature is not stable yet
2019-09-18 13:52:11 -05:00
rinpatch
2ab7aeb3ab Merge branch 'cherry-pick-764931fc' into 'maint/1.1'
Cherry pick tesla update to 1.1

See merge request 
2019-09-17 19:49:10 +00:00
f339ec3939 Merge branch 'deps/update-tesla' into 'develop'
Update Tesla to 1.3

Closes 

See merge request 

(cherry picked from commit 764931fc9f)

8d812c28 Update Tesla to 1.3
2019-09-17 19:38:57 +00:00
rinpatch
6c3f5e8ba0 Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
Backport a test fix to 1.1

See merge request 
2019-09-14 18:14:54 +00:00
rinpatch
c64ab84e6a Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test

See merge request 

(cherry picked from commit 3ae448b592)

b870ae08 Fix `Activity.all_by_actor_and_id/2` test
2019-09-14 18:14:39 +00:00
rinpatch
e71d662d3a Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'
Backport config.md readdition to 1.1

See merge request 
2019-09-14 18:14:21 +00:00
rinpatch
ea1867f48e Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md

See merge request 

(cherry picked from commit 9c64a25713)

69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md
2019-09-14 17:27:08 +00:00
rinpatch
90b0bd3984 Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'
Backport/fav reblog access control

See merge request 
2019-09-14 12:34:21 +00:00
rinpatch
dca545bb0d Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 15:25:21 +03:00
rinpatch
ae33cca4cf Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 15:25:10 +03:00
rinpatch
056780fd8e Mastodon API: Respect post privacy in favourited/reblogged endpoints 2019-09-14 15:21:15 +03:00
lain
53a3ad6043 Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests

See merge request 
2019-09-13 14:48:00 +00:00
Haelwenn
0d9609894f Merge branch 'feature/change-email' into 'develop'
Add email change endpoint

Closes 

See merge request 
2019-09-13 12:46:16 +00:00
rinpatch
f884987ace Merge branch 'admin-config-description' into 'develop'
Admin config description

Closes  and 

See merge request 
2019-09-13 12:36:24 +00:00
Egor Kislitsyn
7b5c81b391 Add a note about compatibility with Mastodon 2019-09-13 13:09:37 +07:00
Egor Kislitsyn
25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
Egor Kislitsyn
5bfbad13ad Add more tests for Pleroma.Activity 2019-09-13 12:49:52 +07:00
Egor Kislitsyn
39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils 2019-09-13 12:44:59 +07:00
kaniini
5ca643b80d Merge branch 'fix/admin-api-docs' into 'develop'
Fix admin api docs for creating users

See merge request 
2019-09-13 03:31:16 +00:00
Angelina Filippova
528a88a686 Fix admin api docs for creating users 2019-09-13 03:31:16 +00:00
Haelwenn
51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop'
Fix double quotes in error logs

See merge request 
2019-09-12 20:21:56 +00:00
Mark Felder
102eb4455c Fix associated test as well 2019-09-12 12:29:08 -05:00
Mark Felder
74e4c72c4a Fix double quotes in error logs
Example:

pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
2019-09-11 16:16:09 -05:00
kaniini
50269e9cac Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses

See merge request 
2019-09-11 20:47:25 +00:00
rinpatch
56828abf6d Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))
2019-09-11 23:06:31 +03:00