Ivan Tashkinov
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Maksim Pechnikov
c4e7ed660c
fix logger message
2020-04-14 08:43:47 +03:00
Mark Felder
f3725b8fc4
Fix spelling
2020-04-13 17:04:43 -05:00
rinpatch
e3db1c471e
Merge branch 'openapi/domain-blocks' into 'develop'
...
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
2020-04-13 20:04:49 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
2020-04-13 21:21:04 +04:00
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
rinpatch
ef37774403
Merge branch 'output-of-relationships-in-statuses' into 'develop'
...
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
2020-04-13 13:05:40 +00:00
Ivan Tashkinov
5c76afb06c
[ #2342 ] Removed description.exs entry for temporary configuration option.
2020-04-13 15:38:50 +03:00
Ivan Tashkinov
99b0bc1989
[ #1364 ] Resolved merge conflicts with develop. Refactoring.
2020-04-13 13:24:31 +03:00
Ivan Tashkinov
f00ff20768
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/following_relationship.ex
2020-04-13 09:23:50 +03:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
Ivan Tashkinov
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
2020-04-13 09:16:35 +03:00
Alexander Strizhakov
de34c4ee6b
changelog entry
2020-04-13 08:59:06 +03:00
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
Maksim Pechnikov
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs
2020-04-12 18:46:47 -05:00
Ivan Tashkinov
c556efb761
[ #1364 ] Enabled notifications on followed domain-blocked users' activities.
2020-04-12 21:53:03 +03:00
rinpatch
7ee35eb9a6
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
...
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
2020-04-12 16:00:15 +00:00
rinpatch
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
2020-04-12 18:49:31 +03:00
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
rinpatch
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
Ivan Tashkinov
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
rinpatch
c682563b92
Merge branch 'support/update_oban' into 'develop'
...
[#1555 ] updated the Oban package
See merge request pleroma/pleroma!2346
2020-04-11 10:04:02 +00:00
Maksim Pechnikov
ad92cef844
fix Oban migration
2020-04-10 21:27:50 +03:00
Maksim Pechnikov
c255c2e4f5
Merge branch 'develop' into support/update_oban
2020-04-10 21:27:41 +03:00
feld
aae22ab691
Merge branch 'chore/changelog-organization' into 'develop'
...
Add a section for changelog entries that pertain to the next patch release.
See merge request pleroma/pleroma!2366
2020-04-10 16:56:41 +00:00
Mark Felder
6ff8812ea3
Add a section for changelog entries that pertain to the next patch release.
...
This will make it easier to keep changelogs synced between develop and stable branches.
2020-04-10 11:37:02 -05:00
Haelwenn
fc4f92c5de
Merge branch 'fix/support-conversations-pagination' into 'develop'
...
Support pagination in conversations
See merge request pleroma/pleroma!2329
2020-04-10 12:12:49 +00:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
Haelwenn
ce089615e1
Merge branch 'chore/fix-changelog' into 'develop'
...
Chore/fix changelog
See merge request pleroma/pleroma!2364
2020-04-10 05:15:11 +00:00
Haelwenn
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
2020-04-10 04:31:13 +00:00
