aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-07-09fix testMaksim Pechnikov
2020-07-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880lain
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08fixed delete `Like` activity in remove userMaksim Pechnikov
2020-07-08Merge branch '1918-avatar-background-header-reset-2' into 'develop'Haelwenn
Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729
2020-07-07Merge branch 'remove-twitter-api' into 'develop'lain
Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327
2020-07-07[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance ↵Ivan Tashkinov
setting.
2020-07-07AccountController: Remove unused `update_?` routes.lain
These were not documented and are also not used anymore.
2020-07-07AccountController: Allow removal / reset of user images.lain
2020-07-07Merge branch 'bugfix/peertube-videos' into 'develop'lain
Fix getting videos from peertube See merge request pleroma/pleroma!2728
2020-07-07Merge branch 'feature/1392-support-irreversible-filters' into 'develop'Haelwenn
Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186
2020-07-07Fix getting videos from peertubeHaelwenn (lanodan) Monnier
2020-07-07Merge branch 'description-limits' into 'develop'Haelwenn
Add limits to image descriptions See merge request pleroma/pleroma!2724
2020-07-06Preloaders: Remove status_net preloaderlain
2020-07-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remove-twitter-api
2020-07-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1507-static-fe-prioritize-json
2020-07-06Merge branch '1915-dont-filter-announce-notifications' into 'develop'rinpatch
Streamer: Don't filter out announce notifications. Closes #1915 See merge request pleroma/pleroma!2719
2020-07-06InstanceView: Add chat limit, description limitlain
2020-07-06Upload: Restrict description lengthlain
2020-07-06test fixesAlexander Strizhakov
2020-07-06tests fixesAlexander Strizhakov
2020-07-06renaming back and reject nil on createAlexander Strizhakov
2020-07-06Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-07-06Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-07-06Restrict thread statuses that contain user's irreversible filtersSergey Suprunenko
2020-07-06Skip notifications for statuses that contain an irreversible filtered wordSergey Suprunenko
2020-07-06Restrict statuses that contain user's irreversible filtersSergey Suprunenko
2020-07-06don't save tesla settings into dbAlexander Strizhakov
2020-07-04Streamer: Don't filter out announce notifications.lain
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690
2020-07-03Merge branch '1912-leading-trailing-space-search' into 'develop'lain
SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/mastoapi-2.9.0-status_text
2020-07-03Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain
[#1892] Exclusion of service actors from user search results Closes #1892 See merge request pleroma/pleroma!2708
2020-07-03SearchController: Trim query.lain
2020-07-03[#1892] Excluded internal users (applications) from user search results, ↵Ivan Tashkinov
reinstated service actors in search results.
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