bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
5 years ago
13a7105b21
Merge branch 'marker-update-fix' into 'develop'
...
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
5 years ago
5fc6ce30ac
Merge branch 'chore/spelling' into 'develop'
...
Fix spelling in log message
See merge request pleroma/pleroma!2378
5 years ago
d8b12ffd59
Marker update migration: Don't try to update virtual field.
5 years ago
2eae5793cd
Merge branch 'fix/issue_1679' into 'develop'
...
[#1679 ] fixed logs
See merge request pleroma/pleroma!2379
5 years ago
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
c4e7ed660c
fix logger message
5 years ago
f3725b8fc4
Fix spelling
5 years ago
e3db1c471e
Merge branch 'openapi/domain-blocks' into 'develop'
...
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
5 years ago
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
ab185d3ea4
Add spec for AccountController.follows
5 years ago
68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
aa958a6dda
Add spec for AccountController.unfollow
5 years ago
854780c72b
Add spec for AccountController.follow
5 years ago
1b680a98ae
Add spec for AccountController.lists
5 years ago
e105cc12b6
Add spec for AccountController.following
5 years ago
bd6e2b300f
Add spec for AccountController.followers
5 years ago
03124c96cc
Add spec for AccountController.statuses
5 years ago
278b3fa0ad
Add spec for AccountController.show
5 years ago
d7d6a83233
Add spec for AccountController.relationships
5 years ago
ab400b2ddb
Add specs for ActorType and VisibilityScope
5 years ago
260cbddc94
Add spec for AccountController.update_credentials
5 years ago
f80116125f
Add spec for AccountController.verify_credentials
5 years ago
b08ded6c2f
Add spec for AccountController.create
5 years ago
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
5 years ago
5c76afb06c
[ #2342 ] Removed description.exs entry for temporary configuration option.
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
5 years ago
de34c4ee6b
changelog entry
5 years ago
a050f3e015
fix for logger configuration through admin-fe
5 years ago
9a3c74b244
Always accept deletions through SimplePolicy
5 years ago
ed894802d5
Expand MRF SimplePolicy docs
5 years ago
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
5 years ago
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
5 years ago
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
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.
5 years ago
c682563b92
Merge branch 'support/update_oban' into 'develop'
...
[#1555 ] updated the Oban package
See merge request pleroma/pleroma!2346
5 years ago
ad92cef844
fix Oban migration
5 years ago
c255c2e4f5
Merge branch 'develop' into support/update_oban
5 years ago
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
5 years ago
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.
5 years ago
64c78581fe
Chat: Only create them for valid users for now.
5 years ago
fc4f92c5de
Merge branch 'fix/support-conversations-pagination' into 'develop'
...
Support pagination in conversations
See merge request pleroma/pleroma!2329
5 years ago
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
ce089615e1
Merge branch 'chore/fix-changelog' into 'develop'
...
Chore/fix changelog
See merge request pleroma/pleroma!2364
5 years ago
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
5 years ago
feld