Commit graph

7319 commits

Author SHA1 Message Date
Mark Felder
35ee759e74 Add helper function to convert single IPs into CIDR format if they were not provided that way 2020-10-05 11:49:56 -05: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
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
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
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
Mark Felder
e5927e92a6 Fix deprecation warning for welcome message 2020-09-21 17:08:49 -05:00
feld
a5c34e3123 Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements

See merge request pleroma/pleroma!3012
2020-09-21 21:06:32 +00:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset 2020-09-21 14:09:26 -05:00
Alex Gleason
8b6ac45f3c
Allow emails to be sent again, #2101 #2172
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21 13:28:02 -05:00
lain
59680f27ff Merge branch 'bugfix/federator-actor-error' into 'develop'
federator: normalize only actor, catch actor error

See merge request pleroma/pleroma!2986
2020-09-21 17:24:14 +00:00
lain
9108e27c2f Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
[#2074] OAuth scope checking in Streaming API

Closes #2074

See merge request pleroma/pleroma!3013
2020-09-21 17:15:54 +00:00
lain
b36b6259d8 Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]

See merge request pleroma/pleroma!2965
2020-09-21 16:25:17 +00:00
Mark Felder
8afdbcdb1c Force HTTP for fedsockets 2020-09-21 10:13:41 -05:00
lain
f2f0a0260f ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
2020-09-21 16:08:38 +02:00
Ivan Tashkinov
60b025b782 [#2074] OAuth scope checking in Streaming API. 2020-09-19 19:16:55 +03:00
rinpatch
4b12e071ac OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
2020-09-19 16:26:15 +03:00
rinpatch
51116b5392 OpenAPI: fix various errors pointed out by editor.swagger.io 2020-09-19 16:26:15 +03:00
Mark Felder
26859c549c Add user agent to fedsocket requests 2020-09-19 07:26:46 -05:00
Maksim Pechnikov
ed3bc53fa1 Merge branch 'develop' into issue/2099 2020-09-18 22:13:05 +03:00
feld
6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy

See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
rinpatch
26c571df33 FedSockets: fix log spam on cached rejects 2020-09-18 16:09:37 +03:00