summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-17Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'Haelwenn
Remove `:auth, :enforce_oauth_admin_scope_usage` See merge request pleroma/pleroma!3327
2021-02-17OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope ↵rinpatch
definitions Transforming scopes is no longer necessary since we are dropping support for accessing admin api without `admin:` prefix in scopes.
2021-02-17OpenAPI: Add `admin:` scope prefix to admin operationsrinpatch
Also splits "Emoji packs" to two categories: "Emoji pack administration" and "Emoji packs"
2021-02-17Remove `:auth, :enforce_oauth_admin_scope_usage`rinpatch
`admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.
2021-02-17Merge branch 'test-docker-images' into 'develop'rinpatch
Generate custom docker images for testing See merge request pleroma/pleroma!3326
2021-02-17Do not want these interfering with develop buildsMark Felder
2021-02-17Make it possible to generate custom docker images by prefixing the branch ↵Mark Felder
name with "build-docker"
2021-02-17Merge branch 'chore/documentation-relicensing' into 'develop'Haelwenn
Relicense documentation under CC-BY-4.0 See merge request pleroma/pleroma!3322
2021-02-17Merge branch 'feat/chat-list-pagination' into 'develop'Haelwenn
Chats: Introduce /api/v2/pleroma/chats which implements pagination Closes #2140 See merge request pleroma/pleroma!3325
2021-02-17Merge branch 'remove-conversation-api' into 'develop'rinpatch
Add API endpoint to remove a conversation Closes #2488 See merge request pleroma/pleroma!3321
2021-02-17Merge branch '2510-oauth-app-tokens-further-support' into 'develop'rinpatch
[#2510] Improved support for app-bound OAuth tokens Closes #2510 See merge request pleroma/pleroma!3316
2021-02-17Chats: Introduce /api/v2/pleroma/chats which implements paginationrinpatch
Also removes incorrect claim that /api/v1/pleroma/chats supports pagination and deprecates it. Closes #2140
2021-02-17Merge branch 'update-default-avatar' into 'develop'rinpatch
Update the default avatar to look nicer See merge request pleroma/pleroma!3320
2021-02-16Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'rinpatch
[#2053] `Notification.for_user_query/2` timeout fix Closes #2053 See merge request pleroma/pleroma!3318
2021-02-16Relicense documentation under CC-BY-4.0rinpatch
All contributors whose contributions were still being used at the moment of relicensing have agreed to it. See https://git.pleroma.social/pleroma/pleroma/-/issues/2146 .
2021-02-15Add API endpoint to remove a conversationEgor Kislitsyn
2021-02-15update changelog to mention change of avatarShpuld Shpuldson
2021-02-15replace avi.pngShpuld Shpuldson
2021-02-15Merge branch 'chore/mailmap' into 'develop'rinpatch
Add myself to .mailmap See merge request pleroma/pleroma!3319
2021-02-15Add myself to .mailmaprinpatch
I changed my email to rin@patch.cx
2021-02-15[#2053] Changed `Notification/for_user_query/2` to use join to filter out ↵Ivan Tashkinov
inactive actors instead of subselect of _all_ inactive AP ids from `users`.
2021-02-12Merge branch 'not-used-mock' into 'develop'rinpatch
Not used mock See merge request pleroma/pleroma!3313
2021-02-12Merge branch 'bugfix/answer-outbox' into 'develop'rinpatch
Add test for Answer presence into an authenticated /outbox See merge request pleroma/pleroma!3269
2021-02-11[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.Ivan Tashkinov
2021-02-10not used mockAlexander Strizhakov
2021-02-10Merge branch 'fix/no-version-api-pleroma-social' into 'develop'Haelwenn
Fix no version number on api.pleroma.social See merge request pleroma/pleroma!3310
2021-02-09Merge branch 'features/ap_id-c2s-authentication' into 'develop'rinpatch
activity_pub_controller: Add authentication to object & activity endpoints See merge request pleroma/pleroma!3295
2021-02-09OpenAPI spec: Do not show build enviroment in the spec versionrinpatch
2021-02-09OpenAPI spec task: Load pleroma application to get version inforinpatch
For whatever reason it seems to pick up the version without loading the app on my machine, but not on the CI.
2021-02-08Merge branch 'new-user-emails' into 'develop'feld
Basic new user registration email, various improvements See merge request pleroma/pleroma!3304
2021-02-08LintMark Felder
2021-02-08Revert "Add plaintext support for all emails except the digest"Mark Felder
This reverts commit 5df9f68392f65a5688867b9bad4bda766e492923.
2021-02-08Merge branch 'develop' into 'new-user-emails'feld
2021-02-08Merge branch 'feat/mrf-noemptypolicy' into 'develop'Haelwenn
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. See merge request pleroma/pleroma!3309
2021-02-08MRF NoEmptyPolicy: Deny posts from local users if there is no content or ↵Mark Felder
only mentions. Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08Merge branch 'fix/rss-link' into 'develop'rinpatch
RSS: Make sure post URL is the first `<link>` element See merge request pleroma/pleroma!3308
2021-02-08RSS: Make sure post URL is the first `<link>` elementrinpatch
Otherwise some RSS readers (tested in Miniflux) might pick the context URL as the external link. Related to #2425.
2021-02-08Merge branch 'chore/descriptions-improvements' into 'develop'rinpatch
More descriptions improvements See merge request pleroma/pleroma!3307
2021-02-08activity_pub_controller: Add authentication to object & activity endpointsHaelwenn (lanodan) Monnier
2021-02-08Improve various descriptions and labelsMark Felder
2021-02-08Make the suggestion match the default valueMark Felder
2021-02-08Merge branch 'docs/improve-mailer-settings-desc' into 'develop'feld
Improve Mailer descriptions for AdminFE See merge request pleroma/pleroma!3306
2021-02-08Merge branch 'develop' into 'docs/improve-mailer-settings-desc'feld
# Conflicts: # CHANGELOG.md
2021-02-08Improved Mailer descriptionsMark Felder
2021-02-08Merge branch 'fix/reports-from-admins' into 'develop'rinpatch
Suppress report notification for admin actors See merge request pleroma/pleroma!3301
2021-02-06Alpha-sort adaptersMark Felder
Add various labels, descriptions and suggestions for all adapter settings and try to use the same terminology by the service provider.
2021-02-06Move Enabled to top as it's the master control of all email. Description not ↵Mark Felder
really needed.
2021-02-06More description improvementsMark Felder
2021-02-06Update SMTP error description and default valueMark Felder
2021-02-06Update Swoosh docs URL, lintMark Felder
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-27 23:13:24 +0000