aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-10-04Merge branch 'bugfix/notification-nil-actor' into 'develop'lain
notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779
2019-10-04Fix OAuthControllerEgor Kislitsyn
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-03Transmogrifier: Handle incoming Undos for EmojiReactions.lain
2019-10-03Move config task docs to a separate file and mark it as WIPrinpatch
2019-10-03Mix tasks: derive moduledoc from doc filesrinpatch
2019-10-03Move database maintenance tasks docs to a separate filerinpatch
2019-10-03Move user tasks docs to a separate filerinpatch
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-03Move digest email docs to a separate file and improve stylingrinpatch
2019-10-03Move emoji task docs to a separate filerinpatch
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-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-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-02Inline object when Announcing a self-owned private objectThibaut Girka
2019-10-02Rename misleading `get_announce_visibility` to `public_announce?`Thibaut Girka
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-01Revert "Add upload limits to /api/v1/instance"feld
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01Store private announcements in object.data["announcements"], filter them on ↵Thibaut Girka
display
2019-10-01Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-01Fix returned visibility of announces in MastodonAPIThibaut Girka
2019-10-01Allow users to announce privately, including own private notesThibaut Girka
2019-10-01Discard identifier, if emptyMaxim Filippov
2019-10-01Ensure self-announces do not widen the audience of the original postThibaut Girka
2019-10-01Make activity announceable by its author.KokaKiwi
2019-10-01Send an identifier alongside with error message in OAuthControllerMaxim Filippov
2019-10-01Extract auth actions from `MastodonAPIController` to `AuthController`Egor Kislitsyn
2019-10-01Extract apps actions from `MastodonAPIController` to `AppController`Egor Kislitsyn
2019-10-01Extract suggestions actions from `MastodonAPIController` to ↵Egor Kislitsyn
`SuggestionController`
2019-10-01Extract media actions from `MastodonAPIController` to `MediaController`Egor Kislitsyn
2019-10-01Extract poll actions from `MastodonAPIController` to `PollController`Egor Kislitsyn
2019-10-01Merge remote-tracking branch 'upstream/develop' into ↵kPherox
fix-prameter-name-of-accounts-update-credentials
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md