Mark Felder [Fri, 25 Sep 2020 15:48:01 +0000 (10:48 -0500)]
Merge branch 'develop' into fix/deprecation-warning-welcome-message
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
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
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
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.
rinpatch [Fri, 18 Sep 2020 21:50:38 +0000 (00:50 +0300)]
OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
rinpatch [Fri, 18 Sep 2020 21:50:00 +0000 (00:50 +0300)]
OpenAPI: fix various errors pointed out by editor.swagger.io
Mark Felder [Fri, 18 Sep 2020 22:49:15 +0000 (17:49 -0500)]
Add user agent to fedsocket requests
Maksim Pechnikov [Fri, 18 Sep 2020 19:13:05 +0000 (22:13 +0300)]
Merge branch 'develop' into issue/2099
feld [Fri, 18 Sep 2020 18:38:20 +0000 (18:38 +0000)]
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
lain [Fri, 18 Sep 2020 13:30:41 +0000 (13:30 +0000)]
Merge branch 'fix/fedsocket-log-spam' into 'develop'
FedSockets: fix log spam on cached rejects
See merge request pleroma/pleroma!3009
rinpatch [Fri, 18 Sep 2020 13:09:37 +0000 (16:09 +0300)]
FedSockets: fix log spam on cached rejects
lain [Fri, 18 Sep 2020 12:25:10 +0000 (12:25 +0000)]
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
lain [Fri, 18 Sep 2020 11:58:23 +0000 (11:58 +0000)]
Merge branch 'websocket-data-fed' into 'develop'
Federate data through persistent websocket connections
See merge request pleroma/pleroma!2408
Steven Fuchs [Fri, 18 Sep 2020 11:58:22 +0000 (11:58 +0000)]
Federate data through persistent websocket connections
Maksim Pechnikov [Fri, 18 Sep 2020 04:09:53 +0000 (07:09 +0300)]
update changelog
Maksim Pechnikov [Fri, 18 Sep 2020 04:08:37 +0000 (07:08 +0300)]
Merge branch 'develop' into issue/2099
Sergey Suprunenko [Thu, 17 Sep 2020 20:04:47 +0000 (22:04 +0200)]
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
rinpatch [Thu, 17 Sep 2020 19:42:42 +0000 (19:42 +0000)]
Merge branch 'stable-sync/2.1.2' into 'develop'
Sync develop with 2.1.2
Closes #2133, #2131, and #2130
See merge request pleroma/pleroma!3007
Ivan Tashkinov [Thu, 17 Sep 2020 19:22:59 +0000 (22:22 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
rinpatch [Thu, 17 Sep 2020 19:19:49 +0000 (22:19 +0300)]
Merge branch 'stable' into stable-sync/2.1.2
rinpatch [Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)]
Merge branch 'release/2.1.2' into 'stable'
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
Haelwenn (lanodan) Monnier [Mon, 14 Sep 2020 12:07:22 +0000 (14:07 +0200)]
Fix MRF reject for ChatMessage
Haelwenn (lanodan) Monnier [Sat, 12 Sep 2020 10:05:36 +0000 (12:05 +0200)]
Create MRF.filter_pipeline to inject :object_data when present
Haelwenn (lanodan) Monnier [Mon, 14 Sep 2020 11:52:13 +0000 (13:52 +0200)]
KeywordPolicy: Still match when fields are absent
rinpatch [Thu, 17 Sep 2020 18:00:13 +0000 (21:00 +0300)]
rinpatch [Thu, 17 Sep 2020 17:40:52 +0000 (20:40 +0300)]
CHANGELOG.md: Add 2.1.2 entry
Haelwenn [Thu, 17 Sep 2020 17:59:38 +0000 (17:59 +0000)]
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
feld [Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)]
Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
rinpatch [Thu, 17 Sep 2020 16:54:41 +0000 (19:54 +0300)]
mix.exs: bump version to 2.1.2
rinpatch [Thu, 10 Sep 2020 18:38:48 +0000 (18:38 +0000)]
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
[#2130] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
rinpatch [Thu, 10 Sep 2020 18:40:54 +0000 (18:40 +0000)]
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
Haelwenn [Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)]
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
lain [Tue, 15 Sep 2020 12:21:38 +0000 (12:21 +0000)]
Merge branch 'reply-visibility-user-guard' into 'develop'
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
rinpatch [Thu, 17 Sep 2020 12:13:36 +0000 (12:13 +0000)]
Merge branch 'bugfix/mrf-ingestion' into 'develop'
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
stwf [Thu, 17 Sep 2020 16:32:40 +0000 (12:32 -0400)]
adapt to new user factory behavior
stwf [Thu, 17 Sep 2020 14:13:56 +0000 (10:13 -0400)]
add test and changelog entry
stwf [Mon, 14 Sep 2020 15:40:52 +0000 (11:40 -0400)]
User search respect discoverable flag
rinpatch [Mon, 14 Sep 2020 12:48:27 +0000 (12:48 +0000)]
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
rinpatch [Mon, 14 Sep 2020 12:38:00 +0000 (12:38 +0000)]
Merge branch 'feat/rich-media-head' into 'develop'
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
feld [Thu, 17 Sep 2020 14:51:13 +0000 (14:51 +0000)]
Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'
Deny ConfigDB migration when deprecated settings found
Closes #2148
See merge request pleroma/pleroma!3005
Mark Felder [Thu, 17 Sep 2020 14:32:50 +0000 (09:32 -0500)]
Deny ConfigDB migration when deprecated settings found
lain [Thu, 17 Sep 2020 14:20:03 +0000 (14:20 +0000)]
Merge branch 'nondiscoverable-user-metadata' into 'develop'
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
Ivan Tashkinov [Thu, 17 Sep 2020 14:14:20 +0000 (17:14 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
Ivan Tashkinov [Thu, 17 Sep 2020 14:13:40 +0000 (17:13 +0300)]
[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
projects / akkoma / log