aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
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
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-03Pleroma.User: remove emojify on parse_bioHaelwenn (lanodan) Monnier
2019-05-03Pleroma.Formatter: width/height to class=emojiHaelwenn (lanodan) Monnier
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-02Merge branch 'iss-849' into 'develop'lambda
Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103
2019-05-02Add oauth plug tests for url and body parametersAkiraFukushima
2019-05-01Fix testsRoman Chvanikov
2019-05-01Merge remote-tracking branch 'origin/develop' into conversations_threelain
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda
fix the web push notification with special char for status created See merge request pleroma/pleroma!1092
2019-05-01test fixesAlex S
2019-05-01Merge branch 'develop' into bugfix/web-notification-special-charSachin Joshi
2019-04-29WebPush: Use Object.normalize, rewrite tests so they test reality.lain
2019-04-29Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch
Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100
2019-04-28Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-27Fix bookmarks depending on embeded object and move checking if therinpatch
status is bookmarked to SQL
2019-04-27Merge branch 'feature/bbcode' into 'develop'kaniini
BBCode support (backend) See merge request pleroma/pleroma!1097
2019-04-26tests: fix up for changed bbcode library output and verify html is properly ↵William Pitcock
escaped