aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-06Capture log in object refetch testsrinpatch
2019-10-06Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
Move local keys out of `user.info` See merge request pleroma/pleroma!1799
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Merge branch 'fix/report-email' into 'develop'feld
Fix/report email Closes #1300 See merge request pleroma/pleroma!1800
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06[#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-06Move local keys out of `user.info`rinpatch
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 'backport/update-activity-fixes' into 'maint/1.1'kaniini
backport update activity fixes to maint/1.1 See merge request pleroma/pleroma!1797
2019-10-05update changelogAriadne Conill
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-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 branch 'update-activity-fixes' into 'develop'kaniini
Update activity fixes Closes #1298 See merge request pleroma/pleroma!1795
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-05Add test for handling Announces with inlined object from different originThibaut Girka
2019-10-05Make credo happyThibaut Girka
2019-10-05Import object from self-Announce whenever possibleThibaut Girka
2019-10-05Merge branch 'revert-5c04e817' into 'develop'kaniini
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" See merge request pleroma/pleroma!1794
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-04Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'kaniini
backport MR 1779 to maint/1.1 See merge request pleroma/pleroma!1791
2019-10-04update changelogAriadne Conill
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04Merge branch 'backport/hex-flake-id' into 'maint/1.1'kaniini
backport: hex `flake_id` support See merge request pleroma/pleroma!1793
2019-10-04Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'kaniini
backport: Track failed proxy urls and don't request them again See merge request pleroma/pleroma!1792
2019-10-04changelogAriadne Conill
2019-10-04Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-10-04Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-04Merge branch 'backport/issue-1296' into 'maint/1.1'kaniini
backport 1296 fix to maint/1.1 See merge request pleroma/pleroma!1790
2019-10-04update changelogAriadne Conill
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'backport/undo-fixes' into 'maint/1.1'kaniini
backport: undo fixes See merge request pleroma/pleroma!1789
2019-10-04update changelogAriadne Conill
2019-10-04ActivityPub.Utils: Fix undo test.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'issue/1296' into 'develop'kaniini
[#1296] removed legacy api: "/objects/:uuid/likes" See merge request pleroma/pleroma!1788
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-12 18:34:00 +0000