aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-09-24Merge branch 'smol-test' into 'develop'lain
CommonAPI test: Add test for polls See merge request pleroma/pleroma!3028
2020-09-24CommonAPI test: Add test for pollslain
2020-09-24don't run in async modeAlexander Strizhakov
2020-09-24fix for test on macAlexander Strizhakov
2020-09-24fixAlexander Strizhakov
2020-09-24fixes after rebaseAlexander Strizhakov
2020-09-24pack routes changeAlexander Strizhakov
2020-09-24pagination for remote emoji packsAlexander Strizhakov
2020-09-24support for special chars in pack nameAlexander Strizhakov
2020-09-23Merge branch 'develop' into feature/bulk-confirmationMark Felder
2020-09-23Merge branch 'issue/2115' into 'develop'lain
[#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981
2020-09-23Merge branch 'user-query/filter-out-internal' into 'develop'lain
Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024
2020-09-23Merge branch 'develop' into 'issue/2115'lain
# Conflicts: # CHANGELOG.md
2020-09-23transmogrifier: Drop incoming create early if it already existsHaelwenn (lanodan) Monnier
2020-09-23Merge branch 'develop' into 'issue/1975'lain
# Conflicts: # CHANGELOG.md
2020-09-22finland-emojis.zip -> emojis.zipMaksim Pechnikov
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Add test for check_activity_expiration_config/0Mark Felder
2020-09-22Add deprecation warning test for check_hellthread_threshold/0Mark Felder
2020-09-22Add test for welcome message formatMark Felder
2020-09-22Fix gun_pool_options deprecation warning messageMark Felder
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain
2020-09-22Filter out internal users by defaultEgor Kislitsyn
2020-09-22ActivityPub: Return Announces when filtering by `following`.lain
2020-09-21Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> ↵Alex Gleason
empty_json_response()
2020-09-21Pass hackney tls config into email tests, #2101Alex Gleason
2020-09-21Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'lain
[#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013
2020-09-21Merge branch 'issue/2099' into 'develop'lain
[#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965
2020-09-21ActivityPub: Don't block-filter your own postslain
We are filtering out replies to people you block, but that should not include your own posts.
2020-09-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-18Merge branch 'media-preview-proxy-nostream' into 'develop'feld
Media preview proxy See merge request pleroma/pleroma!3001
2020-09-18Merge branch 'feature/2118-web-push-encryption-http' into 'develop'lain
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008
2020-09-18Federate data through persistent websocket connectionsSteven Fuchs
2020-09-18Merge branch 'develop' into issue/2099Maksim Pechnikov
2020-09-17Make WebPushEncryption use Pleroma.HTTP as an HTTP adapterSergey Suprunenko
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
media-preview-proxy-nostream # Conflicts: # CHANGELOG.md
2020-09-17Fix MRF reject for ChatMessageHaelwenn (lanodan) Monnier
2020-09-17Create MRF.filter_pipeline to inject :object_data when presentHaelwenn (lanodan) Monnier
2020-09-17Merge branch 'omit-nondiscoverable-from-search' into 'develop'Haelwenn
User search should respect discoverable flag See merge request pleroma/pleroma!2997
2020-09-17Merge branch 'instance-docs' into 'develop'feld
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982
2020-09-17Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'Haelwenn
Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992
2020-09-17Merge branch 'reply-visibility-user-guard' into 'develop'lain
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999
2020-09-17Merge branch 'bugfix/mrf-ingestion' into 'develop'rinpatch
Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15
2020-09-17adapt to new user factory behaviorstwf
2020-09-17add test and changelog entrystwf
2020-09-17User search respect discoverable flagstwf
2020-09-17Merge branch 'feat/rich-media-head' into 'develop'rinpatch
RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995