summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-18Merge branch 'bugfix/filter-boosted-blocks' into 'develop'Haelwenn
activitypub: fix filtering of boosts from blocked users See merge request pleroma/pleroma!1074
2019-04-18Merge branch 'fix/mastoapi-search-unauth' into 'develop'kaniini
Do not require authentication for user search in MastoAPI See merge request pleroma/pleroma!1075
2019-04-18Do not require authentication for user search in MastoAPIMark Felder
2019-04-18Fix my incorrect search test fixrinpatch
2019-04-18Add a migration to remove embeded objectsrinpatch
2019-04-18Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-18Fix search in TwitterAPIrinpatch
2019-04-18Fix object search depending on embeded objectrinpatch
2019-04-18Fix media timeline depending on embeded object and add some guardsrinpatch
2019-04-18Use the preloaded object in tag queriesrinpatch
2019-04-17activitypub: fix filtering of boosts from blocked usersWilliam Pitcock
2019-04-17Merge branch 'feature/improve-block-filtering' into 'develop'kaniini
activitypub: properly filter out transitive activities concerning blocked users See merge request pleroma/pleroma!1072
2019-04-17activitypub: properly filter out transitive activities concerning blocked usersWilliam Pitcock
2019-04-17Remove containment tests from transmogrifier and fix thread visibility solverrinpatch
2019-04-17Refactor tests that used ActivityPub.fetch_object_from_idrinpatch
2019-04-17Fix delete-by_ap_id to expect not only embeded objectsrinpatch
2019-04-17Remove updating reply count for embeded objectsrinpatch
2019-04-17Refactor all tests that acessed the embeded objectrinpatch
2019-04-17If it's an object struct it is already normalizedrinpatch
2019-04-17Fix note count testrinpatch
2019-04-17oofrinpatch
2019-04-17Make credo happyrinpatch
2019-04-17Fix unbookmarkingrinpatch
2019-04-17Update functions in object fetcher for tesla and set up a proper mock for testsrinpatch
2019-04-17Added some more normalization calls all in mastodon api controllerrinpatch
2019-04-17Fix pinned posts relying on embded objectsrinpatch
2019-04-17Fix warnings in object testsrinpatch
2019-04-17Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-17Merge branch '788-notify-email-changelog' into 'develop'rinpatch
changelog info See merge request pleroma/pleroma!1070
2019-04-17[#923] Minor semantic adjustment.Ivan Tashkinov
2019-04-17changesAlex S
2019-04-17changelog infoAlex S
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
2019-04-16Merge branch 'fix/remote-follow-auth' into 'develop'kaniini
Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069
2019-04-16Merge branch 'patch-2' into 'develop'kaniini
Add supervisord configuration See merge request pleroma/pleroma!1066
2019-04-16Merge branch 'fix/follow-imports' into 'develop'kaniini
Handle new-style mastodon follow lists Closes #814 See merge request pleroma/pleroma!1067
2019-04-16Handle new-style mastodon follow listsNormandy
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16activitypub: allow indirect messages from users being followed at a personal ↵William Pitcock
inbox
2019-04-16Add extra_cookie_attrs to changelogHakurei Reimu
2019-04-16make Pleroma.Endpoint use extra_cookie_attrs in configHakurei Reimu
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.
2019-04-16Merge branch 'deps/bump-exdoc' into 'develop'rinpatch
Bump ex_doc to 20.2 See merge request pleroma/pleroma!1068
2019-04-16Bump ex_docrinpatch
2019-04-16Add supervisord configurationDominik V. Salonen
2019-04-15Conversation: Add accounts to output.lain
2019-04-15Conversation: Return full status object, id is a string.lain
2019-04-15Conversation: Also create participations for remote users.lain
Needed to get the participating user list.
2019-04-15Merge branch 'remove-footguns' into 'develop'rinpatch
Remove ambiguous documentation regarding emoji and config.exs See merge request pleroma/pleroma!1064
2019-04-15Custom Emoji docs: Make it clear that config.exs is not for lewd.lain