summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-16Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
2020-04-16Merge branch 'fix/1691-feed-render' into 'develop'rinpatch
Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395
2020-04-16Merge branch 'features/remove-user-source_data' into 'develop'rinpatch
User: remove source_data Closes #820 See merge request pleroma/pleroma!2339
2020-04-16Merge branch 'develop' into features/remove-user-source_datarinpatch
2020-04-16ChatController: Handle pagination.lain
2020-04-16ChatMessagesHandling: Strip HTML of incoming messages.lain
2020-04-16fix for use of published from different entitiesAlexander Strizhakov
2020-04-16Merge branch 'refactor/remove-upgrade-changeset' into 'develop'rinpatch
Remove User.upgrade_changeset in favor of remote_user_creation See merge request pleroma/pleroma!2368
2020-04-16user: remove blank?rinpatch
2020-04-16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-16AccountView: Return user ap_id.lain
2020-04-16ChatMessages: Better validation.lain
2020-04-16added need_reboot endpoint to admin apiAlexander Strizhakov
2020-04-16CommonAPI: Escape HTML for chat messages.lain
2020-04-16Merge branch 'small-fix-rewrite_policy' into 'develop'lain
small fix in the rewrite_policy example See merge request pleroma/pleroma!2391
2020-04-15Cleanup SubscriptionControllerEgor Kislitsyn
2020-04-15[#2349] Made :skip_plug/2 prevent plug from being executed even if ↵Ivan Tashkinov
explicitly called. Refactoring. Tests.
2020-04-15small fix in the rewrite_policy exampleIlja
2020-04-15Chat: Add views, don't return them in timeline queries.lain
2020-04-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
authenticated-api-oauth-check-enforcement
2020-04-15Merge branch 'fix/1659-rate-limiter' into 'develop'Haelwenn
remote_ip plug adds remote_ip_found flag Closes #1659 See merge request pleroma/pleroma!2390
2020-04-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-15Merge branch 'uploads-csp-changes' into 'develop'rinpatch
Uploads: Sandbox them in the CSP. See merge request pleroma/pleroma!2389
2020-04-15Uploads: Sandbox them in the CSP.lain
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 09:16:26 +0000