7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00:00
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
2020-06-02 11:32:03 +00:00
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
2db7a0d6b6
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!2623
2020-06-02 09:15:56 +00:00
81fb45a71b
Translated using Weblate (Dutch)
...
Currently translated at 29.2% (31 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
2020-06-02 08:49:35 +00:00
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
2020-06-02 08:49:24 +00:00
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
d67b8a96c7
Merge branch 'only-creates-in-public-tl' into 'develop'
...
TimelineController: Only return `Create` in public timelines.
Closes #1833 and #1821
See merge request pleroma/pleroma!2618
2020-06-01 20:45:59 +00:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
fa37bfff99
Merge branch 'default-to-hackney-again' into 'develop'
...
Config: Default to Hackney again
See merge request pleroma/pleroma!2619
2020-06-01 13:24:03 +00:00
ac31f687c0
Config: Default to Hackney again
...
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
2020-06-01 13:35:39 +02:00
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
2020-06-01 13:17:56 +02:00
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
2020-05-30 15:51:19 +00:00
beeeed5b58
Merge branch 'test/fix-config-setting-in-user-test' into 'develop'
...
Fix config setting to not affect other tests
See merge request pleroma/pleroma!2615
2020-05-30 14:03:43 +00:00
b973d0b2f0
Fix config setting to not affect other tests
2020-05-30 16:47:09 +03:00
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
2020-05-30 15:36:55 +03:00
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
d23b3701d8
Merge branch 'bugfix/csp-unproxied' into 'develop'
...
http_security_plug.ex: Fix non-proxied media
See merge request pleroma/pleroma!2610
2020-05-29 21:23:49 +00:00
32ba2b7f9f
Merge branch 'media-docs' into 'develop'
...
Docs: Attachement limitations in MastoAPI differences
See merge request pleroma/pleroma!2607
2020-05-29 21:20:36 +00:00
d2a1975e56
mix.lock: update hackney to 1.16.0
...
Closes #1612
2020-05-30 00:18:17 +03:00
109af93227
Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
2020-05-29 21:15:07 +00:00
f361264e1a
Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'
...
fix unused var warning in streamer test
See merge request pleroma/pleroma!2612
2020-05-29 20:31:07 +00:00
0a83af330b
fix unused var warning
2020-05-29 23:05:03 +03:00
660d49227b
Merge branch 'connect-src' into 'develop'
...
Add blob: to connect-src CSP, fixes #1827
Closes #1827
See merge request pleroma/pleroma!2608
2020-05-29 19:26:54 +00:00
d38f28870e
Add blob: to connect-src CSP
2020-05-29 11:08:17 -05:00
219d2b3146
Merge branch 'fix-streaming' into 'develop'
...
Fix argument error in streamer
See merge request pleroma/pleroma!2609
2020-05-29 15:42:43 +00:00
81db758e8e
Merge branch 'mix/database-vacuum-options' into 'develop'
...
Database vacuum mix task
See merge request pleroma/pleroma!2599
2020-05-29 15:33:35 +00:00
9ca978494f
Add test for stream boosts of mastodon user
2020-05-30 00:31:20 +09:00
de0e262839
Fix argument error in streamer
...
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
2020-05-30 00:31:18 +09:00
da1e31fae3
http_security_plug.ex: Fix non-proxied media
2020-05-29 17:20:09 +02:00
1b586ff3ae
Document new database vacuum tasks
2020-05-29 10:17:06 -05:00
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
2020-05-29 10:42:49 +00:00
228ff3760e
Use `User.is_internal_user?` instead
2020-05-29 19:07:05 +09:00
9df5b1e6ae
Don't make relay announce notification
2020-05-29 19:06:38 +09:00
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
2020-05-29 09:46:31 +00:00
27180611df
HTTP Security plug: make starting csp string generation more readable
2020-05-29 12:32:48 +03:00
394258d548
Docs: Attachement limitations in MastoAPI differences
2020-05-28 16:11:33 -05:00
1d30608e20
Merge branch 'fix/1557-gets-local-pack' into 'develop'
...
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
2020-05-28 17:08:30 +00:00
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
2020-05-28 16:58:28 +00:00
d4a18d44fe
Update default instance description
2020-05-28 11:56:30 -05:00
ddbf7084e2
Merge branch 'update-install-guides' into 'develop'
...
Update installation guides
See merge request pleroma/pleroma!2603
2020-05-28 16:54:09 +00:00
Egor Kislitsyn
lain
rinpatch
Fristi
Alexander Strizhakov
Haelwenn
Roman Chvanikov
Steven Fuchs
Alex Gleason
feld
kPherox
Haelwenn (lanodan) Monnier
Mark Felder