lain
ec2f70cd23
CI: Add ffmpeg
2020-09-28 14:14:32 +02: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
Ivan Tashkinov
7cd662f18c
Added documentation on installation of ffmpeg and ImageMagick dependencies.
2020-09-24 18:02:50 +03:00
rinpatch
151df9fc17
Merge branch 'fix/test-fix' into 'develop'
...
Fix for test on mac
See merge request pleroma/pleroma!3027
2020-09-24 09:50:39 +00:00
lain
47cd59342f
Merge branch 'smol-test' into 'develop'
...
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
2020-09-24 09:41:28 +00:00
lain
35d62a4a56
CommonAPI test: Add test for polls
2020-09-24 11:12:03 +02:00
Alexander Strizhakov
165961f56d
don't run in async mode
2020-09-24 12:00:39 +03:00
Alexander Strizhakov
aa1f97a5b6
fix for test on mac
2020-09-24 10:46:09 +03: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
lain
a5e1c400e4
Merge branch 'issue/1975' into 'develop'
...
[#1975 ] import emoji from a zip archive
Closes admin-fe#130
See merge request pleroma/pleroma!2911
2020-09-23 10:49:29 +00:00
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
lain
34235bc02a
Merge branch 'email-fix-develop' into 'develop'
...
Allow emails to be sent again (develop)
Closes #2172
See merge request pleroma/pleroma!3025
2020-09-23 09:05:52 +00:00
lain
518c0f2962
Changelog: Add info about emoji zip import feature
2020-09-23 10:57:53 +02:00
lain
9d6415de15
Changelog: Info about email fix.
2020-09-23 10:54:24 +02:00
Maksim Pechnikov
8e4f043ac7
finland-emojis.zip -> emojis.zip
2020-09-22 21:58:30 +03: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
lain
df1eb5cf7e
Changelog: Add info about chat pagination fix.
2020-09-22 17:17:19 +02: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
feld
02f12ec625
Merge branch 'chore/missing-link' into 'develop'
...
Add FreeBSD and alpha sort
See merge request pleroma/pleroma!3023
2020-09-22 12:42:03 +00:00
Mark Felder
3174804f3c
Add FreeBSD and alpha sort
2020-09-22 07:26:31 -05:00
feld
d65e6e152a
Merge branch 'docs/nginx-config-fedsockets' into 'develop'
...
Docs/nginx config fedsockets
See merge request pleroma/pleroma!3020
2020-09-21 21:52:34 +00:00
Mark Felder
8906f30ba1
Use an upstream for reverse proxy so future modifications are simplified
2020-09-21 16:19:08 -05:00
feld
637ce939d9
Merge branch 'chore/autolinker-rename' into 'develop'
...
Chase the Autolinker rename from !2677
Closes #2155
See merge request pleroma/pleroma!3019
2020-09-21 21:19:02 +00:00
Mark Felder
ade7fede71
Most proxy settings can be global
2020-09-21 16:13:45 -05:00
Mark Felder
2b553b8f8e
Remove duplicate setting
2020-09-21 16:11:01 -05:00
Mark Felder
75f6e5e8b7
Add FedSockets config
2020-09-21 16:10:31 -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
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
2020-09-21 16:03:22 -05:00
Mark Felder
7b2bf381e9
Chase the Autolinker rename from !2677
2020-09-21 16:02:57 -05:00
Alex Gleason
0b728ccc44
Pass hackney tls config into email tests, #2101
2020-09-21 15:26:10 -05: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
Haelwenn
994ce250c2
Merge branch '2161-block-changes' into 'develop'
...
ActivityPub: Don't block-filter your own posts
Closes #2161
See merge request pleroma/pleroma!3017
2020-09-21 15:29:55 +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
lain
882c1fc6bd
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3014
2020-09-20 15:23:15 +00:00
Kana
f3c62b246d
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 24.5% (26 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-09-20 14:48:49 +00:00
Kana
d72970a1fc
Added translation using Weblate (Chinese (Simplified))
2020-09-20 13:18:27 +00:00
rinpatch
402acce525
Merge branch 'fix/openapi-errors' into 'develop'
...
OpenAPI: fix various errors pointed out by editor.swagger.io
See merge request pleroma/pleroma!3011
2020-09-20 11:15:20 +00: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
