summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-10-04removed legacy api: "/objects/:uuid/likes"Maksim Pechnikov
2019-10-04Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'kaniini
Sync 1.1.0 changelog with develop See merge request pleroma/pleroma!1787
2019-10-04Remove entries from develop that were in the section for some reasonrinpatch
2019-10-04Add back streaming fix entryrinpatch
2019-10-04Sync 1.1.0 changelog with developrinpatch
Mostly !1724 backport, but as a new commit because it was easier this way
2019-10-04Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'kaniini
widen streaming API blocks (for 1.1) See merge request pleroma/pleroma!1785
2019-10-04Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'kaniini
Backport !1777 to 1.1 See merge request pleroma/pleroma!1786
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-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
nickname Closes #1293
2019-10-04tests: add missing ExUnit.CaptureLogAriadne Conill
2019-10-04application: fix up after_supervisor_start removal backportAriadne Conill
2019-10-04update changelogAriadne Conill
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-04tests: streamer: add a test for blocked transitive activitiesAriadne Conill
2019-10-04remove remaining errors from testsSteven Fuchs
2019-10-04Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-10-04Admin API: Allow changing the state of multiple reports at onceMaxim Filippov
2019-10-04Move HTTP verb to the header (admin_api.md)Maxim Filippov
2019-10-04Merge branch 'fix/extended-nickname-format-default-config' into 'develop'kaniini
Add missing extended_nickname_format setting to the default config See merge request pleroma/pleroma!1776
2019-10-04Merge branch 'undo-fixes' into 'develop'kaniini
ActivityPub: Change addressing of Undo. See merge request pleroma/pleroma!1782
2019-10-04update changelogAriadne Conill
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-04tests: streamer: add a test for blocked transitive activitiesAriadne Conill
2019-10-04ActivityPub.Utils: Fix undo test.lain
2019-10-04Transmogrifier: Handle misskey likes with reactions like EmojiReactions.lain
2019-10-04ActivityPub: Change addressing of Undo.lain
2019-10-04Merge branch 'develop' into 'fix/extended-nickname-format-default-config'feld
# Conflicts: # CHANGELOG.md
2019-10-04Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'rinpatch
Remove in-db configuration references from 1.1 See merge request pleroma/pleroma!1781
2019-10-04Remove in-db configuration references from 1.1rinpatch
It's still too unstable to be used.
2019-10-04Merge branch 'featrue/job-monitor' into 'develop'lain
Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721
2019-10-04Update Changelog.lain
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 04:26:04 +0000