Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,531 Commits 1 Branch 0 Tags 222 MiB
685e5c8509
Commit Graph

12531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Roman Chvanikov
b0bd81ef71 Update CHANGELOG 2020-09-20 20:58:32 +03:00
Roman Chvanikov
28d0986f83 Refactor mutes removing in CommonAPI and User 2020-09-20 20:58:17 +03:00
Roman Chvanikov
4987ee6256 Merge branch 'develop' into feature/expire-mutes 2020-09-20 19:27:27 +03: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
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
lain
91ddd47e51 Merge branch 'fix/fedsocket-log-spam' into 'develop' 
FedSockets: fix log spam on cached rejects

See merge request pleroma/pleroma!3009
 2020-09-18 13:30:41 +00:00
rinpatch
26c571df33 FedSockets: fix log spam on cached rejects 2020-09-18 16:09:37 +03:00
lain
7e02f4ed3b 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
 2020-09-18 12:25:10 +00:00
lain
875b6654ec Merge branch 'websocket-data-fed' into 'develop' 
Federate data through persistent websocket connections

See merge request pleroma/pleroma!2408
 2020-09-18 11:58:23 +00:00
Steven Fuchs
f2ef9735c5 Federate data through persistent websocket connections 2020-09-18 11:58:22 +00:00
Maksim Pechnikov
2159daa9af update changelog 2020-09-18 07:09:53 +03:00
Maksim Pechnikov
2ec0dcf001 Merge branch 'develop' into issue/2099 2020-09-18 07:08:37 +03:00
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter 2020-09-17 22:10:55 +02:00
rinpatch
49584a9928 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
 2020-09-17 19:42:42 +00:00
Ivan Tashkinov
a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 
# Conflicts:
#	CHANGELOG.md
 2020-09-17 22:22:59 +03:00
rinpatch
065a4dddfd Merge branch 'stable' into stable-sync/2.1.2 2020-09-17 22:19:49 +03:00
rinpatch
a0f5e8b27e Merge branch 'release/2.1.2' into 'stable' 
Release/2.1.2

See merge request pleroma/secteam/pleroma!17
 2020-09-17 19:09:10 +00:00
Haelwenn (lanodan) Monnier
7bf269fe83 Fix MRF reject for ChatMessage 2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present 2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
3a0f99ed35 KeywordPolicy: Still match when fields are absent 2020-09-17 22:07:54 +03:00
rinpatch
34afc2b074 pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d 2020-09-17 21:22:06 +03:00
rinpatch
b751c5babc CHANGELOG.md: Add 2.1.2 entry 2020-09-17 21:22:03 +03:00
Haelwenn
beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop' 
User search should respect discoverable flag

See merge request pleroma/pleroma!2997
 2020-09-17 17:59:38 +00:00
feld
608824b97e 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
 2020-09-17 16:54:53 +00:00
rinpatch
a5d6c9aa8e mix.exs: bump version to 2.1.2 2020-09-17 19:54:41 +03:00
rinpatch
6bbd65fb09 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
 2020-09-17 19:51:54 +03:00
rinpatch
608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop' 
Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982
 2020-09-17 19:50:51 +03:00
Haelwenn
0465bdbd49 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
 2020-09-17 19:50:23 +03:00
lain
bb70b231d0 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
 2020-09-17 19:49:08 +03:00
rinpatch
22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop' 
Bugfix: MRF and Pipeline Ingestion

See merge request pleroma/secteam/pleroma!15
 2020-09-17 19:48:33 +03:00
stwf
9d77f4abf8 adapt to new user factory behavior 2020-09-17 12:32:40 -04:00
stwf
dfc621a529 add test and changelog entry 2020-09-17 12:18:07 -04:00
stwf
41939e3175 User search respect discoverable flag 2020-09-17 12:15:50 -04:00
rinpatch
eff7f9892d Merge branch 'hotfix/rich-media-compile-error' into 'develop' 
RichMedia: fix a compilation error due to nonexistent variable

See merge request pleroma/pleroma!2996
 2020-09-17 19:06:10 +03:00
rinpatch
dee4639dbb Merge branch 'feat/rich-media-head' into 'develop' 
RichMedia: Do a HEAD request to check content type/length

See merge request pleroma/pleroma!2995
 2020-09-17 19:04:50 +03:00
feld
6b9bfc9e86 Merge branch 'fix/configdb-migration-with-deprecated' into 'develop' 
Deny ConfigDB migration when deprecated settings found

Closes #2148

See merge request pleroma/pleroma!3005
 2020-09-17 14:51:13 +00:00
Mark Felder
f7e40f7ef1 Deny ConfigDB migration when deprecated settings found 2020-09-17 09:32:50 -05:00
lain
2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop' 
search indexing metadata should respect discoverable flag

See merge request pleroma/pleroma!2998
 2020-09-17 14:20:03 +00:00