summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-15openapi: add application/x-www-form-urlencoded to body typesrinpatch
Closes #1683
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-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-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-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-10Merge branch 'develop' into support/update_obanMaksim Pechnikov
2020-04-10Merge branch 'fix-otp-version-file-in-docker' into 'develop'Haelwenn
Create OTP_VERSION file by `mix release` See merge request pleroma/pleroma!2362
2020-04-09Rename functionkPherox
2020-04-09CHANGELOG.md: update 2.0.2 release daterinpatch
2020-04-09CHANGELOG.md: add 2.0.2 update notesrinpatch
2020-04-09CHANGELOG.md: add entries for funkwhale-related changesrinpatch
2020-04-09CHANGELOG.md: Add 2.0.2 entryrinpatch
2020-04-09CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-04-09changelog.md: add 2.0.1 entryrinpatch
2020-04-09Merge branch 'update-changelog' into 'develop'rinpatch
Update CHANGELOG See merge request pleroma/pleroma!2363
2020-04-09Update CHANGELOGEgor Kislitsyn
2020-04-09Merge branch 'notifications-dismiss-api' into 'develop'feld
Add `/api/v1/notifications/:id/dismiss` endpoint Closes #1673 See merge request pleroma/pleroma!2360
2020-04-10Create OTP_VERSION file by `mix release`kPherox
2020-04-09Merge branch 'fix-otp-version-file-in-docker' into 'develop'lain
Add OTP_VERSION file to docker Closes #1662 See merge request pleroma/pleroma!2361
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
2020-04-09Fix OTP_VERSION file in dockerkPherox
2020-04-09Merge branch 'fix/1658-invite-send' into 'develop'lain
Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344
2020-04-09typo fixAlexander Strizhakov
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
2020-04-09Apply suggestion to test/web/admin_api/admin_api_controller_test.exsAlexander Strizhakov
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 21:58:20 +0000