Commit graph

7334 commits

Author SHA1 Message Date
Egor Kislitsyn 75e07ba206
Fix tests 2020-10-07 18:34:28 +04:00
Egor Kislitsyn be42ab70dc
Add backup upload 2020-10-07 18:34:28 +04:00
Egor Kislitsyn c01a818048
Add tests 2020-10-07 18:34:27 +04:00
Egor Kislitsyn 9d564ffc29
Zip exported files 2020-10-07 18:34:27 +04:00
Egor Kislitsyn 257e059e61
Add account export 2020-10-07 18:34:27 +04:00
Mark Felder cddca85c84 Merge branch 'develop' into revert/rich-media-censorship 2020-10-06 14:25:20 -05:00
rinpatch 2698bbc9f6 Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.

See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
Mark Felder 346cc3ac24 Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination 2020-10-05 12:40:53 -05:00
rinpatch 9e96c9ae48 Merge branch 'fix/empty-params-openapi' into 'develop'
OpenAPI CastAndValidate: filter out empty params

Closes #2198

See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
Alexander Strizhakov cbdaabad34
web push http_client fix 2020-10-01 13:32:11 +03:00
rinpatch 2566467782 Merge branch '2201-i-hate-this' into 'develop'
User search: Once again, change uri handling.

Closes #2201

See merge request pleroma/pleroma!3048
2020-09-30 13:37:46 +00:00
lain 90fee49c52 User search: Once again, change uri handling.
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
rinpatch 006b62fd12 OpenAPI CastAndValidate: filter out empty params
Closes #2198
2020-09-29 21:52:16 +03:00
Mark Felder b3a9ba09ec More robust expires_at timestamp processing 2020-09-29 12:27:47 -05:00
lain 2a11068a11 Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
`ffmpeg` / `ImageMagick` handling as optional dependencies

See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
Ivan Tashkinov 7d5c3883ac [#3031] Refactoring: moved system commands checks to ApplicationRequirements. 2020-09-29 16:28:06 +03:00
Mark Felder ba7f9459b4 Revert Rich Media censorship for sensitive statuses
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
Maksim Pechnikov de993b856b added force option to the unfollow operation 2020-09-28 09:16:42 +03:00
Ivan Tashkinov 4e4f771082 Adjusted MediaProxyControllerTest to gracefully fail on missing 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-26 19:32:16 +03:00
Mark Felder dcdf75fbac Merge branch 'develop' into fix/deprecation-warning-welcome-message 2020-09-25 11:45:51 -05:00
feld 1672d8b37c Merge branch 'feature/bulk-confirmation' into 'develop'
Bulk account confirmation actions

Closes #2085

See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
Mark Felder 2bf2c68dee Merge branch 'develop' into fix/deprecation-warning-welcome-message 2020-09-25 10:48:01 -05:00
Mark Felder 8b84ca4901 Simplify the value comparison 2020-09-25 10:37:59 -05:00
rinpatch 5cd71208d9 Merge branch 'search-even-more' into 'develop'
More user search improvements

See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
rinpatch f67c967c4a Merge branch 'features/incoming-create-exists' into 'develop'
transmogrifier: Drop incoming create early if it already exists

See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
lain 05b5241314 Linter fixes 2020-09-25 09:12:48 +02:00
lain a8c17ea25a User Search: Also find user by uri 2020-09-25 08:46:14 +02:00
Mark Felder 81faf540b3 Add some user feedback 2020-09-24 18:35:20 -05:00
Mark Felder e33360fdb9 Cannot use batches with User.try_send_confirmation_email/1 2020-09-24 18:23:47 -05:00
Mark Felder 935ef21b02 Use the import 2020-09-24 16:47:34 -05:00
lain d0078bc404 User Search: Boost resolved results and exact ap_id matches. 2020-09-24 15:54:55 +02:00
Alexander Strizhakov 5d7ec00bed
fixes after rebase 2020-09-24 09:42:30 +03:00
Alexander Strizhakov 8c6ec4c111
pack routes change 2020-09-24 09:16:14 +03:00
Alexander Strizhakov dbbc801667
pagination for remote emoji packs 2020-09-24 09:12:39 +03:00
Alexander Strizhakov 9b6d89ff8c
support for special chars in pack name 2020-09-24 09:12:37 +03:00
Mark Felder 8af8eb5ce7 Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream 2020-09-23 12:32:47 -05:00
Mark Felder f3a1f9c3bb Merge branch 'develop' into feature/bulk-confirmation 2020-09-23 11:56:22 -05:00
lain e02101e15c Merge branch 'issue/2115' into 'develop'
[#2115] added paginate links to headers for  /chats/:id/messages

See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
lain 4dadb7c433 Merge branch 'user-query/filter-out-internal' into 'develop'
Filter out internal users by default

Closes #2147

See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
lain 436d1a3c41 Merge branch 'develop' into 'issue/2115'
# Conflicts:
#   CHANGELOG.md
2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier 5e86a2809e
transmogrifier: Drop incoming create early if it already exists 2020-09-23 13:40:45 +02:00
lain a6c14041c4 Merge branch 'develop' into 'issue/1975'
# Conflicts:
#   CHANGELOG.md
2020-09-23 09:16:00 +00:00
Maksim Pechnikov 72d2b34d3b Merge branch 'develop' into issue/1975 2020-09-22 21:42:10 +03:00
Alex Gleason 3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop 2020-09-22 13:37:02 -05:00
Mark Felder e2dcf039d2 Fix gun_pool_options deprecation warning message 2020-09-22 11:15:40 -05:00
Mark Felder 2fc3b46ee7 Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1. 2020-09-22 11:13:36 -05:00
lain c95859e45b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115 2020-09-22 17:13:46 +02:00
Egor Kislitsyn 0e0ece251a
Filter out internal users by default 2020-09-22 16:56:11 +04:00
lain ee3052a2d8 ActivityPub: Return Announces when filtering by following. 2020-09-22 14:20:19 +02:00
Mark Felder e5927e92a6 Fix deprecation warning for welcome message 2020-09-21 17:08:49 -05:00