Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,838 Commits 1 Branch 0 Tags 222 MiB
4e4f771082
Commit Graph

4487 Commits

Author SHA1 Message Date
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
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
a6c14041c4 Merge branch 'develop' into 'issue/1975' 
# Conflicts:
#   CHANGELOG.md
 2020-09-23 09:16:00 +00: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
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
Alex Gleason
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response() 2020-09-21 16:03:22 -05:00
Alex Gleason
0b728ccc44
Pass hackney tls config into email tests, #2101 2020-09-21 15:26:10 -05: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
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
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
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
Steven Fuchs
f2ef9735c5 Federate data through persistent websocket connections 2020-09-18 11:58:22 +00: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
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
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
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
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
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
Mark Felder
f7e40f7ef1 Deny ConfigDB migration when deprecated settings found 2020-09-17 09:32:50 -05:00
Ivan Tashkinov
d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. 2020-09-17 17:13:40 +03:00
lain
7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata' 
# Conflicts:
#   CHANGELOG.md
 2020-09-17 14:09:01 +00:00
eugenijm
c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
lain
5e3c70afa5 AdminAPI Chat tests: Remove factory. 
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
 2020-09-17 13:37:25 +02:00
lain
e39ff2616b Admin chat api tests: Small additions. 2020-09-17 13:29:26 +02:00
lain
7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation 2020-09-17 13:26:04 +02:00
Maksim Pechnikov
b867f9d7ae Merge branch 'develop' into issue/2099 2020-09-17 08:41:35 +03:00