aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-07-02Merge branch 'develop' into activation-metaMark Felder
2020-07-02Merge branch 'fetcher-fixes' into 'develop'rinpatch
Don't fail fetching when the user in a replied-to message can't be fetched. See merge request pleroma/pleroma!2711
2020-07-02Streamer: Align announce streaming with polling.lain
2020-07-02SideEffects: Refactor.lain
2020-07-01Merge branch '1716-handle-nickname-clashes' into 'develop'rinpatch
ActivityPub: Handle clashing nicknames for the same ap id Closes #1716 See merge request pleroma/pleroma!2712
2020-07-01ActivityPub: Handle clashing nicknames for the same ap idlain
If we get a new user (identified by ap_id) that would have the same nickname as an existing user, give the existing user a nickname that is prepended with the user id, as this will never clash. This can happen when a user switches server software and that soft- ware generates ap ids in a different way.
2020-07-01Fetcher: Work when we can't get the OP.lain
2020-07-01Fixtures: Pretty print.lain
2020-07-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
This reverts merge request !2701
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30[#1892] Excluded bot actors (applications, services) from search results.Ivan Tashkinov
2020-06-30Rename user.settings columnMark Felder
This is used exclusively by MastoFE/GlitchFE now
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-29Merge branch 'fix-notification-filtering' into 'develop'rinpatch
Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705
2020-06-29Notification: Remove TODO.lain
2020-06-29Notifications: Never return `nil` in the notification list.lain
2020-06-29Test default "content-type" for CastAndValidateEgor Kislitsyn
2020-06-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
2020-06-29Merge branch 'avatar-removing' into 'develop'lain
UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701
2020-06-29UpdateCredentialsTest: Add test for removing profile images.lain
2020-06-29Preloaders: Use strings as keys.lain
2020-06-29User preloader: Put user info at correct keylain
2020-06-29Merge branch '1031-parent-visible' into 'develop'lain
Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679
2020-06-26LintMark Felder
2020-06-26MastoAPI: Show source field when deletingHaelwenn (lanodan) Monnier
2020-06-26Rename notification "privacy_option" settingMark Felder
2020-06-26Merge branch 'block-handling' into 'develop'Haelwenn
Handle blocks with the pipeline See merge request pleroma/pleroma!2685
2020-06-26Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn
AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request pleroma/pleroma!2686
2020-06-26Simplify notification filtering settings furtherMark Felder
2020-06-26Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-26StaticFE: Prioritize json in requests.lain
2020-06-26AccountController: Return scope in proper format.lain
2020-06-26Preloading: Fix nodeinfo url.lain
2020-06-26Preloading: Return correct data for statusnet stuff.lain
2020-06-26Nodeinfo: Add chat information back in.lain
2020-06-26User: Don't unfollow on block when the relevant setting is set.lain
2020-06-26BlockValidator: Restore old behavior for incoming blocks.lain
2020-06-26activity_draft: Add source fieldHaelwenn (lanodan) Monnier
2020-06-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-25Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-25AntiSpamLinkPolicy: Exempt local users.lain
2020-06-25Merge branch 'issue/1872-ex_aws' into 'develop'lain
[#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683
2020-06-25Blocking: Don't federate if the options is set.lain
2020-06-25ActivityPub: Remove `block`.lain
2020-06-25Transmogrifier: Switch to pipeline for Blocks.lain
2020-06-25ObjectValidator: Basic `Block` support.lain
2020-06-25Transmogrifier Test: Extract block handling.lain
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 06:30:55 +0000