aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
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
2019-04-26add support for bbcodeWilliam Pitcock
2019-04-26Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda
Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-25Move settings to Source subentityrinpatch
2019-04-25fixes for testsAlex S
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-25bookmarks in separate tableAlex S
2019-04-25activitypub: transmogrifier: send reject follow if following does not succeedWilliam Pitcock
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, ↵rinpatch
and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24fix the status notification with special charSachin Joshi
2019-04-23Merge branch 'security/fix-html-class-scrubbing' into 'develop'kaniini
html: lock down allowed class attributes to only those related to microformats See merge request pleroma/pleroma!1090
2019-04-23html: lock down allowed class attributes to only those related to microformatsWilliam Pitcock
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 19:12:43 +0000