aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-03Fix a typo in activity expirationsrinpatch
2019-10-03Remove fe settings from :instance as they no longer do anythingrinpatch
2019-10-03Move bold text in RemoveIp description into a proper warningrinpatch
2019-10-03Add missing language specrinpatch
2019-10-03Cheatsheet: Move the deprecated config warning into a warning blockrinpatch
2019-10-03Oopsrinpatch
2019-10-03Move user tasks docs to a separate filerinpatch
2019-10-03Use consistent command signaturerinpatch
2019-10-03Fix up some headingsrinpatch
2019-10-03Move uploads task docs to a separate filerinpatch
2019-10-03Move relay docs to a separate filerinpatch
2019-10-03Move instance CLI task docs to a text filerinpatch
2019-10-03Improve styling of CLI tasksrinpatch
2019-10-03Move digest email docs to a separate file and improve stylingrinpatch
2019-10-03Move emoji task docs to a separate filerinpatch
2019-10-03Remove a reference to inline docs since everything it describes isrinpatch
described in the cheatsheet already and add A TODO
2019-10-03Fix more linksrinpatch
2019-10-03Fix references to other pagesrinpatch
2019-10-03Remove Small customizations as it's contents have been integrated intorinpatch
static_dir.md
2019-10-02Remove "General tips for customizing Pleroma FE" because it's no longerrinpatch
relevant and we have actual fe docs now
2019-10-02Rename "Configuration" to "Configuration Cheat Sheet" and explain a bitrinpatch
about how Pleroma Configuration works
2019-10-02Rename some directories because MkDocs uses them for categoriesrinpatch
2019-10-02[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-02Pleroma API Readme: Document unreaction endpoint.lain
2019-10-02PleromaAPI: Add unreacting.lain
2019-10-02PleromaAPI: Fix emoji_reactions_bylain
2019-10-02Move `:favourites` and `:bookmarks` actions to StatusControllerEgor Kislitsyn
2019-10-02Move `follows`, `mutes` and `blocks` actions to AccountControllerEgor Kislitsyn
2019-10-02Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'rinpatch
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController See merge request pleroma/pleroma!1772
2019-10-02Fix credo warningEgor Kislitsyn
2019-10-02CommonAPI: Add unreactions.lain
2019-10-02Add MastoFEControllerEgor Kislitsyn
2019-10-02ActivityPub: Add undo for emoji reactions.lain
2019-10-02Add CustomEmojiControllerEgor Kislitsyn
2019-10-02Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-02Merge branch 'split-masto-api/instance' into 'develop'kaniini
Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760
2019-10-02Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769
2019-10-02Merge branch 'get_announce_visibility-name' into 'develop'kaniini
Rename misleading `get_announce_visibility` to `public_announce?` See merge request pleroma/pleroma!1768
2019-10-02Inline object when Announcing a self-owned private objectThibaut Girka
2019-10-02Rename misleading `get_announce_visibility` to `public_announce?`Thibaut Girka
2019-10-02Add tests for Pleroma.JobQueueMonitorEgor Kislitsyn
2019-10-02Update CHANGELOG and pleroma_api.mdEgor Kislitsyn
2019-10-02Remove `:enqueued` counterEgor Kislitsyn
2019-10-02Extract instance actions from `MastodonAPIController` to `InstanceController`Egor Kislitsyn
2019-10-02Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini
Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765
2019-10-02Merge branch 'split-masto-api/auth' into 'develop'kaniini
Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759
2019-10-02Merge branch 'features/private-reblogs' into 'develop'kaniini
Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766
2019-10-02Merge branch 'update/admin-fe-20191001' into 'develop'kaniini
Update AdminFE bundle See merge request pleroma/pleroma!1767
2019-10-01Update AdminFE bundleMark Felder
2019-10-01Merge branch 'feature/expose-attachment-size' into 'develop'feld
Add upload limits to /api/v1/instance See merge request pleroma/pleroma!1614