sadposter [Sun, 1 Nov 2020 12:22:18 +0000 (12:22 +0000)]
fix CSS
sadposter [Fri, 2 Oct 2020 14:09:47 +0000 (15:09 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
lain [Thu, 1 Oct 2020 11:15:13 +0000 (11:15 +0000)]
Merge branch 'web-push-fix' into 'develop'
web push http_client fix
Closes #2202
See merge request pleroma/pleroma!3052
Alexander Strizhakov [Thu, 1 Oct 2020 10:32:11 +0000 (13:32 +0300)]
web push http_client fix
feld [Wed, 30 Sep 2020 18:13:34 +0000 (18:13 +0000)]
Merge branch 'chore/pleroma-vcl' into 'develop'
Make it possible for Varnish logs to contain the true scheme used by clients
See merge request pleroma/pleroma!3051
Mark Felder [Wed, 30 Sep 2020 17:49:51 +0000 (12:49 -0500)]
Syntax error
Mark Felder [Wed, 30 Sep 2020 17:32:54 +0000 (12:32 -0500)]
Make it possible for Varnish logs to contain the true scheme used by clients
instead of always reporting http://
rinpatch [Wed, 30 Sep 2020 13:41:48 +0000 (13:41 +0000)]
Merge branch 'update/oban' into 'develop'
Update Oban to 2.1.0
See merge request pleroma/pleroma!3050
rinpatch [Wed, 30 Sep 2020 13:37:46 +0000 (13:37 +0000)]
Merge branch '2201-i-hate-this' into 'develop'
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
Mark Felder [Wed, 30 Sep 2020 12:53:19 +0000 (07:53 -0500)]
Update Oban to 2.1.0
lain [Wed, 30 Sep 2020 12:17:21 +0000 (14:17 +0200)]
Migrations: Nullify old unique index on users.uri
lain [Wed, 30 Sep 2020 12:14:41 +0000 (14:14 +0200)]
User search: Once again, change uri handling.
They can indeed be non-unique.
Haelwenn [Tue, 29 Sep 2020 17:42:08 +0000 (17:42 +0000)]
Merge branch 'fix/2189-unpin-activity' into 'develop'
#2189 More robust expires_at timestamp processing
See merge request pleroma/pleroma!3046
Mark Felder [Tue, 29 Sep 2020 17:16:15 +0000 (12:16 -0500)]
More robust expires_at timestamp processing
lain [Tue, 29 Sep 2020 14:48:30 +0000 (14:48 +0000)]
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
lain [Tue, 29 Sep 2020 14:37:49 +0000 (14:37 +0000)]
Merge branch 'issue/2170' into 'develop'
[#2170] Can't remove dead relay
See merge request pleroma/pleroma!3041
Ivan Tashkinov [Tue, 29 Sep 2020 14:34:49 +0000 (17:34 +0300)]
[#3031] Adjusted changelog entry.
lain [Tue, 29 Sep 2020 14:30:18 +0000 (14:30 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Tue, 29 Sep 2020 14:24:02 +0000 (16:24 +0200)]
Changelog: Add info about relay unfollowing
Ivan Tashkinov [Tue, 29 Sep 2020 13:28:06 +0000 (16:28 +0300)]
[#3031] Refactoring: moved system commands checks to ApplicationRequirements.
rinpatch [Mon, 28 Sep 2020 15:44:20 +0000 (15:44 +0000)]
Merge branch 'fix/revert-citext-uri' into 'develop'
Revert citext user URI migration
Closes #2188
See merge request pleroma/pleroma!3042
rinpatch [Mon, 28 Sep 2020 15:15:31 +0000 (18:15 +0300)]
Revert citext user URI migration
URI paths are not actually case-insesitive, which caused migration issues
on a number of databases.
Closes #2188
lain [Mon, 28 Sep 2020 12:14:32 +0000 (14:14 +0200)]
CI: Add ffmpeg
Maksim Pechnikov [Mon, 28 Sep 2020 06:16:42 +0000 (09:16 +0300)]
added `force` option to the unfollow operation
Ivan Tashkinov [Sat, 26 Sep 2020 16:32:16 +0000 (19:32 +0300)]
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).
feld [Fri, 25 Sep 2020 18:40:00 +0000 (18:40 +0000)]
Merge branch 'fix/deprecation-warning-welcome-message' into 'develop'
Fix deprecation warnings for old config settings
Closes #2153
See merge request pleroma/pleroma!3021
Mark Felder [Fri, 25 Sep 2020 18:08:33 +0000 (13:08 -0500)]
Merge branch 'develop' into fix/deprecation-warning-welcome-message
feld [Fri, 25 Sep 2020 18:02:59 +0000 (18:02 +0000)]
Merge branch 'fix/noop-policy-describe' into 'develop'
Fix test failures for NoOpPolicy describe/0
See merge request pleroma/pleroma!3035
Mark Felder [Fri, 25 Sep 2020 17:46:49 +0000 (12:46 -0500)]
Fix test failures for NoOpPolicy describe/0
Mark Felder [Fri, 25 Sep 2020 17:20:52 +0000 (12:20 -0500)]
Config settings leak and break configdb migration tests when async
Mark Felder [Fri, 25 Sep 2020 16:45:51 +0000 (11:45 -0500)]
Merge branch 'develop' into fix/deprecation-warning-welcome-message
feld [Fri, 25 Sep 2020 16:15:01 +0000 (16:15 +0000)]
Merge branch 'feature/bulk-confirmation' into 'develop'
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
Mark Felder [Fri, 25 Sep 2020 15:48:01 +0000 (10:48 -0500)]
Merge branch 'develop' into fix/deprecation-warning-welcome-message
Mark Felder [Fri, 25 Sep 2020 15:37:59 +0000 (10:37 -0500)]
Simplify the value comparison
rinpatch [Fri, 25 Sep 2020 12:56:21 +0000 (12:56 +0000)]
Merge branch 'search-even-more' into 'develop'
More user search improvements
See merge request pleroma/pleroma!3032
rinpatch [Fri, 25 Sep 2020 12:44:33 +0000 (12:44 +0000)]
Merge branch 'features/incoming-create-exists' into 'develop'
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
lain [Fri, 25 Sep 2020 07:12:48 +0000 (09:12 +0200)]
Linter fixes
lain [Fri, 25 Sep 2020 06:56:58 +0000 (08:56 +0200)]
User search: Make uri matches case insensitive.
lain [Fri, 25 Sep 2020 06:46:14 +0000 (08:46 +0200)]
User Search: Also find user by uri
Mark Felder [Thu, 24 Sep 2020 23:35:20 +0000 (18:35 -0500)]
Add some user feedback
Mark Felder [Thu, 24 Sep 2020 23:24:44 +0000 (18:24 -0500)]
Validate emails are sent to the appropriate unconfirmed actors
Mark Felder [Thu, 24 Sep 2020 23:23:47 +0000 (18:23 -0500)]
Cannot use batches with User.try_send_confirmation_email/1
Mark Felder [Thu, 24 Sep 2020 21:47:34 +0000 (16:47 -0500)]
Use the import
rinpatch [Thu, 24 Sep 2020 18:27:55 +0000 (18:27 +0000)]
Merge branch '2182-profile-search-improvements' into 'develop'
Resolve "Profile search by URL doesn't work correctly"
Closes #2182
See merge request pleroma/pleroma!3030
Ivan Tashkinov [Thu, 24 Sep 2020 15:02:50 +0000 (18:02 +0300)]
Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.
lain [Thu, 24 Sep 2020 13:56:17 +0000 (15:56 +0200)]
Changelog: Add info about user search.
lain [Thu, 24 Sep 2020 13:54:55 +0000 (15:54 +0200)]
User Search: Boost resolved results and exact ap_id matches.
rinpatch [Thu, 24 Sep 2020 09:50:39 +0000 (09:50 +0000)]
Merge branch 'fix/test-fix' into 'develop'
Fix for test on mac
See merge request pleroma/pleroma!3027
lain [Thu, 24 Sep 2020 09:41:28 +0000 (09:41 +0000)]
Merge branch 'smol-test' into 'develop'
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
lain [Thu, 24 Sep 2020 09:12:03 +0000 (11:12 +0200)]
CommonAPI test: Add test for polls
Alexander Strizhakov [Thu, 24 Sep 2020 09:00:39 +0000 (12:00 +0300)]
don't run in async mode
Alexander Strizhakov [Thu, 24 Sep 2020 07:46:09 +0000 (10:46 +0300)]
fix for test on mac
Mark Felder [Wed, 23 Sep 2020 17:32:47 +0000 (12:32 -0500)]
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
Mark Felder [Wed, 23 Sep 2020 16:56:22 +0000 (11:56 -0500)]
Merge branch 'develop' into feature/bulk-confirmation
lain [Wed, 23 Sep 2020 12:09:38 +0000 (12:09 +0000)]
Merge branch 'issue/2115' into 'develop'
[#2115] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
lain [Wed, 23 Sep 2020 11:51:04 +0000 (11:51 +0000)]
Merge branch 'user-query/filter-out-internal' into 'develop'
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
lain [Wed, 23 Sep 2020 11:49:19 +0000 (11:49 +0000)]
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
Haelwenn (lanodan) Monnier [Wed, 23 Sep 2020 09:45:32 +0000 (11:45 +0200)]
transmogrifier: Drop incoming create early if it already exists
lain [Wed, 23 Sep 2020 10:49:29 +0000 (10:49 +0000)]
Merge branch 'issue/1975' into 'develop'
[#1975] import emoji from a zip archive
Closes admin-fe#130
See merge request pleroma/pleroma!2911
lain [Wed, 23 Sep 2020 09:16:00 +0000 (09:16 +0000)]
Merge branch 'develop' into 'issue/1975'
# Conflicts:
# CHANGELOG.md
lain [Wed, 23 Sep 2020 09:05:52 +0000 (09:05 +0000)]
Merge branch 'email-fix-develop' into 'develop'
Allow emails to be sent again (develop)
Closes #2172
See merge request pleroma/pleroma!3025
lain [Wed, 23 Sep 2020 08:57:53 +0000 (10:57 +0200)]
Changelog: Add info about emoji zip import feature
lain [Wed, 23 Sep 2020 08:54:24 +0000 (10:54 +0200)]
Changelog: Info about email fix.
Maksim Pechnikov [Tue, 22 Sep 2020 18:58:30 +0000 (21:58 +0300)]
finland-emojis.zip -> emojis.zip
Maksim Pechnikov [Tue, 22 Sep 2020 18:42:10 +0000 (21:42 +0300)]
Merge branch 'develop' into issue/1975
Alex Gleason [Tue, 22 Sep 2020 18:37:02 +0000 (13:37 -0500)]
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
Mark Felder [Tue, 22 Sep 2020 16:34:51 +0000 (11:34 -0500)]
Add test for check_activity_expiration_config/0
Mark Felder [Tue, 22 Sep 2020 16:22:15 +0000 (11:22 -0500)]
Add deprecation warning test for check_hellthread_threshold/0
Mark Felder [Tue, 22 Sep 2020 16:19:29 +0000 (11:19 -0500)]
Add test for welcome message format
Mark Felder [Tue, 22 Sep 2020 16:15:40 +0000 (11:15 -0500)]
Fix gun_pool_options deprecation warning message
Mark Felder [Tue, 22 Sep 2020 16:13:36 +0000 (11:13 -0500)]
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
lain [Tue, 22 Sep 2020 15:17:19 +0000 (17:17 +0200)]
Changelog: Add info about chat pagination fix.
lain [Tue, 22 Sep 2020 15:13:46 +0000 (17:13 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
Egor Kislitsyn [Tue, 22 Sep 2020 12:55:40 +0000 (16:55 +0400)]
Filter out internal users by default
feld [Tue, 22 Sep 2020 12:42:03 +0000 (12:42 +0000)]
Merge branch 'chore/missing-link' into 'develop'
Add FreeBSD and alpha sort
See merge request pleroma/pleroma!3023
Mark Felder [Tue, 22 Sep 2020 12:26:31 +0000 (07:26 -0500)]
Add FreeBSD and alpha sort
Mark Felder [Mon, 21 Sep 2020 22:08:49 +0000 (17:08 -0500)]
Fix deprecation warning for welcome message
feld [Mon, 21 Sep 2020 21:52:34 +0000 (21:52 +0000)]
Merge branch 'docs/nginx-config-fedsockets' into 'develop'
Docs/nginx config fedsockets
See merge request pleroma/pleroma!3020
Mark Felder [Mon, 21 Sep 2020 21:19:08 +0000 (16:19 -0500)]
Use an upstream for reverse proxy so future modifications are simplified
feld [Mon, 21 Sep 2020 21:19:02 +0000 (21:19 +0000)]
Merge branch 'chore/autolinker-rename' into 'develop'
Chase the Autolinker rename from !2677
Closes #2155
See merge request pleroma/pleroma!3019
Mark Felder [Mon, 21 Sep 2020 21:13:45 +0000 (16:13 -0500)]
Most proxy settings can be global
Mark Felder [Mon, 21 Sep 2020 21:11:01 +0000 (16:11 -0500)]
Remove duplicate setting
Mark Felder [Mon, 21 Sep 2020 21:10:31 +0000 (16:10 -0500)]
Add FedSockets config
feld [Mon, 21 Sep 2020 21:06:32 +0000 (21:06 +0000)]
Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
Alex Gleason [Mon, 21 Sep 2020 21:03:22 +0000 (16:03 -0500)]
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
Mark Felder [Mon, 21 Sep 2020 21:02:57 +0000 (16:02 -0500)]
Chase the Autolinker rename from !2677
Alex Gleason [Mon, 21 Sep 2020 20:05:46 +0000 (15:05 -0500)]
Pass hackney tls config into email tests, #2101
Alex Gleason [Mon, 21 Sep 2020 18:56:40 +0000 (13:56 -0500)]
Fix #2172 HTTP error on password reset
Alex Gleason [Mon, 21 Sep 2020 18:28:02 +0000 (13:28 -0500)]
Allow emails to be sent again, #2101 #2172
https://github.com/swoosh/swoosh/issues/478#issuecomment-
642393707
lain [Mon, 21 Sep 2020 17:24:14 +0000 (17:24 +0000)]
Merge branch 'bugfix/federator-actor-error' into 'develop'
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
lain [Mon, 21 Sep 2020 17:15:54 +0000 (17:15 +0000)]
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
lain [Mon, 21 Sep 2020 16:25:17 +0000 (16:25 +0000)]
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
Haelwenn [Mon, 21 Sep 2020 15:29:55 +0000 (15:29 +0000)]
Merge branch '2161-block-changes' into 'develop'
ActivityPub: Don't block-filter your own posts
Closes #2161
See merge request pleroma/pleroma!3017
Mark Felder [Mon, 21 Sep 2020 15:13:41 +0000 (10:13 -0500)]
Force HTTP for fedsockets
lain [Mon, 21 Sep 2020 14:08:38 +0000 (16:08 +0200)]
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.
lain [Sun, 20 Sep 2020 15:23:15 +0000 (15:23 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3014
Kana [Sun, 20 Sep 2020 13:19:21 +0000 (13:19 +0000)]
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/
Kana [Sun, 20 Sep 2020 13:18:26 +0000 (13:18 +0000)]
Added translation using Weblate (Chinese (Simplified))
rinpatch [Sun, 20 Sep 2020 11:15:20 +0000 (11:15 +0000)]
Merge branch 'fix/openapi-errors' into 'develop'
OpenAPI: fix various errors pointed out by editor.swagger.io
See merge request pleroma/pleroma!3011
Ivan Tashkinov [Sat, 19 Sep 2020 16:16:55 +0000 (19:16 +0300)]
[#2074] OAuth scope checking in Streaming API.
projects / akkoma / log