aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2019-05-16Merge branch 'fix/domain-unblocked-reblogs' into 'develop'feld
Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157
2019-05-16Merge branch 'develop' into conversations-importMark Felder
2019-05-16Merge branch 'feature/sql-thread-sat' into 'develop'lambda
SQL thread visibility solver See merge request pleroma/pleroma!971
2019-05-16Feature/896 toggling confirmationAlexander Strizhakov
2019-05-16try thisAlex S
2019-05-16add report uri and report toAlex S
2019-05-16Restrict reblogs of activities from blocked domainsAaron Tinio
2019-05-16Add test for blocked domainsAaron Tinio
2019-05-15Handle incoming Question objectsrinpatch
2019-05-15chase test failuresWilliam Pitcock
2019-05-15test: update obsolete testWilliam Pitcock
2019-05-15Merge remote-tracking branch 'origin/develop' into conversations-importlain
2019-05-15Merge branch 'fix/public-option-not-working' into 'develop'kaniini
Fix public option not working Closes #873 See merge request pleroma/pleroma!1143
2019-05-15Merge branch 'chore/extricate-http-signatures' into 'develop'lambda
switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155
2019-05-15tests: fixupWilliam Pitcock
2019-05-15CommonAPI: Refactor visibility, forbid public to private replies.lain
2019-05-15remove deprecated PleromaFE configurationSachin Joshi
2019-05-15Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlugAaron Tinio
2019-05-15Implement Pleroma.Plugs.EnsurePublicOrAuthenticatedAaron Tinio
2019-05-14switch to pleroma/http_signatures libraryWilliam Pitcock
2019-05-14Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'kaniini
Fix Pleroma.Config.get!/1 raising an error when value is false See merge request pleroma/pleroma!1148
2019-05-14Refactoring oauth response.Maksim
2019-05-14Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-14Fix Pleroma.Config.get!/1 raising an error when value is falseAaron Tinio
2019-05-13Merge branch 'feature/federator-behaviours' into 'develop'lambda
federator modularization (outgoing) See merge request pleroma/pleroma!1140
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-14Make irreversible field default to false in filtersSachin Joshi
2019-05-13Add a test to ensure create_or_bump_for does not normalize objects before ↵rinpatch
checking the activity type
2019-05-12tests: fix AP test failuresWilliam Pitcock
2019-05-12tests: fix salmon testsWilliam Pitcock
2019-05-12tests: chase federator publish_single_foo removalsWilliam Pitcock
2019-05-11Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' ↵kaniini
into 'develop' Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-09Use "repeated" instead of "retweeted" for repeated statuses in Twitter APIFrancis Dinh
This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09Fix get_in_reply_to in OStatus' activity representer depending on embedded ↵rinpatch
objects
2019-05-09Conversations: Import order, import as read.lain
2019-05-08Visibility: Make it more resilient.lain
2019-05-08Conversations: Add a function to 'import' old DMs.lain
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-07Remove `bookmarks` assoc and add a fake `bookmark` assoc insteadrinpatch
2019-05-07- Actually use preloaded bookmarks in viewsrinpatch
- Preload bookmarks in bookmark timeline - Rework bookmark preload tests
2019-05-07Preload bookmarks wherever the object is preloadedrinpatch
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-04BBS: Credo fixes.lain
2019-05-04BBS: Fix tests.lain
2019-05-04BBS: small fixes.lain