aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-10-06Merge 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/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
[#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-05CommonAPI: Create profile updates as public.lain
This saves us lots of sending out because we can use sharedInbox.
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-05Make credo happyThibaut Girka
2019-10-05Import object from self-Announce whenever possibleThibaut Girka
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-05Transmogrifier: Extend misskey like compatibility.lain
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'bugfix/widen-streamer-blocks' into 'develop'kaniini
widen streaming API block effects See merge request pleroma/pleroma!1784
2019-10-04Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini
Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737
2019-10-04Admin API: Allow changing the state of multiple reports at onceMaxim Filippov
2019-10-04streamer: worker: actually use should_send? consistentlyAriadne Conill
2019-10-04streamer: worker: check for lack of intersectionality between a user's ↵Ariadne Conill
blocklist and an activity's recipientlist
2019-10-04streamer: add missing copyright headersAriadne Conill
2019-10-04Transmogrifier: Handle misskey likes with reactions like EmojiReactions.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'featrue/job-monitor' into 'develop'lain
Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721
2019-10-04Merge branch 'fix/nickname-fail' into 'develop'lain
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
nickname Closes #1293
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 19:08:13 +0000