summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-22Merge branch 'microformats' into 'develop'lain
static_fe: Add microformats2 classes See merge request pleroma/pleroma!2215
2020-04-22static_fe: Add microformats2 classesKarol Kosek
2020-04-22Stats: Ignore internal users for user count.lain
2020-04-22AccountController: Use code 400 for self-follow.lain
2020-04-22Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'lain
Fix migrate to db config Closes #1689 See merge request pleroma/pleroma!2394
2020-04-22StatusController: Ignore nil scheduled_at parameters.lain
2020-04-22Merge branch 'docs/debian-packages' into 'develop'lain
debian_based_*.md: Use erlang-nox metapackage See merge request pleroma/pleroma!2268
2020-04-22Apply suggestion to docs/installation/debian_based_en.mdlain
2020-04-22Polls: Persist and show voters' countlain
2020-04-22Federator: Return proper values for jobslain
2020-04-22WebPush: Return proper values for jobs.lain
2020-04-22Litepub: Add ChatMessage.lain
2020-04-22ChatMessageValidator: Validation changeslain
Don't validate if the recipient is blocking the actor.
2020-04-21Add OpenAPI schema for FlakeIDEgor Kislitsyn
2020-04-21Improve OpenAPI schemaEgor Kislitsyn
- Removes unneeded wrapping in examples - Adds `:format` attributes
2020-04-21ChatControllerTest: Credo fixes.lain
2020-04-21ChatController: Validate parameters.lain
2020-04-21Chats: Add API specs.lain
2020-04-21Automatic checks of authentication / instance publicity. Definition of ↵Ivan Tashkinov
missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-21Merge branch 'openapi/custom-emojis' into 'develop'lain
Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375
2020-04-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-21Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # CHANGELOG.md
2020-04-20Merge branch 'accept-deletes' into 'develop'rinpatch
Always accept deletions through SimplePolicy, add :reject_deletes group See merge request pleroma/pleroma!2371
2020-04-20Merge branch 'router-cleanup' into 'develop'rinpatch
Cleanup and DRY the Router See merge request pleroma/pleroma!2406
2020-04-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-04-20Merge remote-tracking branch 'upstream/develop' into accept-deletesAlex Gleason
2020-04-20Add :reject_deletes option to SimplePolicyAlex Gleason
2020-04-20Add OpenAPI spec for `AccountController.identity_proofs` operationEgor Kislitsyn
2020-04-20Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-20Merge branch 'cleanup-subscription-controller' into 'develop'lain
Cleanup SubscriptionController See merge request pleroma/pleroma!2393
2020-04-20Merge branch 'fix-object_age_policy' into 'develop'lain
Fix ObjectAgePolicy See merge request pleroma/pleroma!2404
2020-04-20Fix ObjectAgePolicyTestIlja
The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests
2020-04-20Merge branch 'mrf-docs-update' into 'develop'lain
Expand MRF SimplePolicy docs See merge request pleroma/pleroma!2370
2020-04-20Cleanup and DRY the RouterEgor Kislitsyn
2020-04-20ChatMessageView: Support emoji.lain
2020-04-20ChatMessage: Support emoji.lain
2020-04-20ChatMessageValidator: Require `published` fieldlain
2020-04-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-20Credo fixes.lain
2020-04-20CommonAPI: Obey local limit for chat messages.lain
2020-04-20ChatMessageValidator: Don't validate messages that are too long.lain
2020-04-19Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
[#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354
2020-04-19Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'rinpatch
mix.exs: Do not bail out when .git doesn’t exists See merge request pleroma/pleroma!2405
2020-04-19mix.exs: Do not bail out when .git doesn’t existsHaelwenn (lanodan) Monnier
2020-04-18Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403
2020-04-17Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exsHaelwenn
2020-04-17Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exHaelwenn
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, ↵Haelwenn (lanodan) Monnier
electric bongaloo
2020-04-17Merge branch '1682-basic-auth-permissions-fix' into 'develop'rinpatch
[#1682] Fixed Basic Auth permissions issue Closes #1682 See merge request pleroma/pleroma!2401