aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-10-06Merge branch 'develop' into revert/rich-media-censorshipMark Felder
2020-10-06Merge branch 'filtering-following' into 'develop'rinpatch
ActivityPub: Return Announces when filtering by `following`. See merge request pleroma/pleroma!3022
2020-10-05Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05[#3053] Unauthenticated access control for OStatus-related controllers and ↵Ivan Tashkinov
ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05activity_pub_controller.ex: Remove unused @doc blockHaelwenn (lanodan) Monnier
[ci skip]
2020-10-05Merge branch 'develop' into feature/1893-remote-emoji-packs-paginationMark Felder
2020-10-05Add helper function to convert single IPs into CIDR format if they were not ↵Mark Felder
provided that way
2020-10-03Merge branch 'fix/empty-params-openapi' into 'develop'rinpatch
OpenAPI CastAndValidate: filter out empty params Closes #2198 See merge request pleroma/pleroma!3047
2020-10-02[#3053] No auth check in StaticFEController, even on non-federating ↵Ivan Tashkinov
instances. Adjusted tests.
2020-10-01No auth check in UserController.feed_redirect/2, even on non-federating ↵Ivan Tashkinov
instances.
2020-10-01No auth check in OStatusController, even on non-federating instances.Ivan Tashkinov
2020-10-01web push http_client fixAlexander Strizhakov
2020-09-30Merge branch '2201-i-hate-this' into 'develop'rinpatch
User search: Once again, change uri handling. Closes #2201 See merge request pleroma/pleroma!3048
2020-09-30User search: Once again, change uri handling.lain
They can indeed be non-unique.
2020-09-29OpenAPI CastAndValidate: filter out empty paramsrinpatch
Closes #2198
2020-09-29More robust expires_at timestamp processingMark Felder
2020-09-29Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'lain
`ffmpeg` / `ImageMagick` handling as optional dependencies See merge request pleroma/pleroma!3031
2020-09-29[#3031] Refactoring: moved system commands checks to ApplicationRequirements.Ivan Tashkinov
2020-09-28Revert Rich Media censorship for sensitive statusesMark Felder
The #NSFW hashtag test was broken anyway.
2020-09-28added `force` option to the unfollow operationMaksim Pechnikov
2020-09-26Adjusted MediaProxyControllerTest to gracefully fail on missing ↵Ivan Tashkinov
dependencies. Installation docs update. Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-25Merge branch 'develop' into fix/deprecation-warning-welcome-messageMark Felder
2020-09-25Merge branch 'feature/bulk-confirmation' into 'develop'feld
Bulk account confirmation actions Closes #2085 See merge request pleroma/pleroma!2975
2020-09-25Merge branch 'develop' into fix/deprecation-warning-welcome-messageMark Felder
2020-09-25Simplify the value comparisonMark Felder
2020-09-25Merge branch 'search-even-more' into 'develop'rinpatch
More user search improvements See merge request pleroma/pleroma!3032
2020-09-25Merge branch 'features/incoming-create-exists' into 'develop'rinpatch
transmogrifier: Drop incoming create early if it already exists See merge request pleroma/pleroma!3026
2020-09-25Linter fixeslain
2020-09-25User Search: Also find user by urilain
2020-09-24Add some user feedbackMark Felder
2020-09-24Cannot use batches with User.try_send_confirmation_email/1Mark Felder
2020-09-24Use the importMark Felder
2020-09-24User Search: Boost resolved results and exact ap_id matches.lain
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-23Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_streamMark Felder
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 developRoman Chvanikov
2020-09-23Merge branch 'develop' into 'issue/1975'lain
# Conflicts: # CHANGELOG.md
2020-09-22Merge branch 'develop' into issue/1975Maksim Pechnikov
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-22Fix gun_pool_options deprecation warning messageMark Felder
2020-09-22Remove deprecation warning. We were supposed to remove backwards compat for ↵Mark Felder
this in 2.1.
2020-09-22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115lain