summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-14Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-14Merge branch 'logger-configuration' into 'develop'feld
Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365
2020-04-14Merge branch 'marker-update-fix' into 'develop'lain
Marker update migration: Don't try to update virtual field. See merge request pleroma/pleroma!2380
2020-04-14Merge branch 'chore/spelling' into 'develop'lain
Fix spelling in log message See merge request pleroma/pleroma!2378
2020-04-14Marker update migration: Don't try to update virtual field.lain
2020-04-14Merge branch 'fix/issue_1679' into 'develop'lain
[#1679] fixed logs See merge request pleroma/pleroma!2379
2020-04-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex
2020-04-14Merge branch 'issue/1276' into 'develop'Haelwenn
[#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877
2020-04-14fix logger messageMaksim Pechnikov
2020-04-13Fix spellingMark Felder
2020-04-13Merge branch 'openapi/domain-blocks' into 'develop'rinpatch
Add OpenAPI spec for DomainBlockController See merge request pleroma/pleroma!2376
2020-04-13Add OpenAPI spec for DomainBlockControllerEgor Kislitsyn
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Add OpenAPI spec for CustomEmojiControllerEgor Kislitsyn
2020-04-13Add specs for AccountController.mutes, AccountController.blocks, ↵Egor Kislitsyn
AccountController.mutes, AccountController.endorsements
2020-04-13Add spec for AccountController.followsEgor Kislitsyn
2020-04-13Add specs for AccountController.block and AccountController.unblockEgor Kislitsyn
2020-04-13Add specs for AccountController.mute and AccountController.unmuteEgor Kislitsyn
2020-04-13Add spec for AccountController.unfollowEgor Kislitsyn
2020-04-13Add spec for AccountController.followEgor Kislitsyn
2020-04-13Add spec for AccountController.listsEgor Kislitsyn
2020-04-13Add spec for AccountController.followingEgor Kislitsyn
2020-04-13Add spec for AccountController.followersEgor Kislitsyn
2020-04-13Add spec for AccountController.statusesEgor Kislitsyn
2020-04-13Add spec for AccountController.showEgor Kislitsyn
2020-04-13Add spec for AccountController.relationshipsEgor Kislitsyn
2020-04-13Add specs for ActorType and VisibilityScopeEgor Kislitsyn
2020-04-13Add spec for AccountController.update_credentialsEgor Kislitsyn
2020-04-13Add spec for AccountController.verify_credentialsEgor Kislitsyn
2020-04-13Add spec for AccountController.createEgor Kislitsyn
2020-04-13Merge branch 'output-of-relationships-in-statuses' into 'develop'rinpatch
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications See merge request pleroma/pleroma!2342
2020-04-13[#2342] Removed description.exs entry for temporary configuration option.Ivan Tashkinov
2020-04-13[#1364] Resolved merge conflicts with `develop`. Refactoring.Ivan Tashkinov
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/following_relationship.ex
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-13[#2342] Removed changelog entry for temporary configuration option.Ivan Tashkinov
2020-04-13changelog entryAlexander Strizhakov
2020-04-13fix for logger configuration through admin-feAlexander Strizhakov
2020-04-12Always accept deletions through SimplePolicyAlex Gleason
2020-04-12Expand MRF SimplePolicy docsAlex Gleason
2020-04-12[#1364] Enabled notifications on followed domain-blocked users' activities.Ivan Tashkinov
2020-04-12Merge branch 'fix/mix-tasks-failing-otp' into 'develop'rinpatch
Fix mix tasks failing on OTP releases Closes #1678 See merge request pleroma/pleroma!2369
2020-04-12Fix mix tasks failing on OTP releasesrinpatch
No idea why this was even added. Closes #1678
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-11Remove User.upgrade_changeset in favor of remote_user_creationrinpatch
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[#1364] Disabled notifications on activities from blocked domains.Ivan Tashkinov
2020-04-11Merge branch 'support/update_oban' into 'develop'rinpatch
[#1555] updated the Oban package See merge request pleroma/pleroma!2346
2020-04-10fix Oban migrationMaksim Pechnikov
2020-04-10Merge branch 'develop' into support/update_obanMaksim Pechnikov
2020-04-10Merge branch 'chore/changelog-organization' into 'develop'feld
Add a section for changelog entries that pertain to the next patch release. See merge request pleroma/pleroma!2366
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 06:07:21 +0000