aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-14Merge branch 'fix/openapi-form-mimetype' into 'develop'rinpatch
openapi: add application/x-www-form-urlencoded to body types Closes #1683 See merge request pleroma/pleroma!2387
2020-04-15openapi: add application/x-www-form-urlencoded to body typesrinpatch
Closes #1683
2020-04-14Merge branch 'fix/richmedia-oban-error' into 'develop'feld
Attempt at fixing Oban not receiving :ok from RichMediaHelper job Closes #1684 See merge request pleroma/pleroma!2377
2020-04-14Fix Oban not receiving :ok from RichMediaHelper jobMark Felder
2020-04-14Merge branch 'revert-60cc7d6c' into 'develop'lain
Revert "Merge branch 'issue/1276' into 'develop'" See merge request pleroma/pleroma!2384
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Merge branch 'revert-13a7105b' into 'develop'lain
Revert "Merge branch 'marker-update-fix' into 'develop'" See merge request pleroma/pleroma!2383
2020-04-14Revert "Merge branch 'marker-update-fix' into 'develop'"lain
This reverts merge request !2380
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 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-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-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-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-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
2020-04-10Add a section for changelog entries that pertain to the next patch release.Mark Felder
This will make it easier to keep changelogs synced between develop and stable branches.
2020-04-10Merge branch 'fix/support-conversations-pagination' into 'develop'Haelwenn
Support pagination in conversations See merge request pleroma/pleroma!2329
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'chore/fix-changelog' into 'develop'Haelwenn
Chore/fix changelog See merge request pleroma/pleroma!2364
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316
2020-04-10User: remove source_dataHaelwenn (lanodan) Monnier
2020-04-10Remove User.fields/1Haelwenn (lanodan) Monnier
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-10User: Move inbox & shared_inbox to own fieldsHaelwenn (lanodan) Monnier
2020-04-10formatter: Use user.uri instead of user.source_data.uriHaelwenn (lanodan) Monnier
2020-04-10Types.URI: NewHaelwenn (lanodan) Monnier
2020-04-10User: Move public_key from source_data to own fieldHaelwenn (lanodan) Monnier
2020-04-10User: remove source_data use for follower_address and following_addressHaelwenn (lanodan) Monnier
2020-04-10Merge branch 'develop' into support/update_obanMaksim Pechnikov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 23:38:03 +0000