Alexander Strizhakov
35471205f8
temp fix for :gun.info MatchError
2020-03-16 15:47:25 +03:00
Alexander Strizhakov
3805e09b9c
Merge branch 'develop' into gun
2020-03-16 14:35:27 +03:00
rinpatch
ac5c2b66b9
Merge branch 'fix-warnings-in-tests' into 'develop'
...
Warnings fix
See merge request pleroma/pleroma!2303
2020-03-16 11:27:10 +00:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Alexander Strizhakov
dc2ec84c0f
warnings fix
2020-03-16 14:19:36 +03:00
rinpatch
c2527b8c63
Merge branch 'removing-deprecated' into 'develop'
...
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
2020-03-16 11:08:06 +00:00
Alexander Strizhakov
ba90a6d3e5
removing from descriptions.exs deprecated settings
2020-03-16 14:01:35 +03:00
rinpatch
34fd1c2c9d
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
...
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
2020-03-15 20:04:31 +00:00
rinpatch
df2608ebf8
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-15 19:53:52 +00:00
Haelwenn (lanodan) Monnier
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier
acb016397e
mix.lock: [minor] last hash appended
2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
Haelwenn
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
Haelwenn (lanodan) Monnier
dca21cd1d6
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
...
Wasn't in the test suite otherwise
2020-03-15 17:07:08 +01:00
Haelwenn
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
2020-03-15 14:22:10 +00:00
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
rinpatch
85ac909160
Merge branch 'bugfix/pleroma_conversation_api' into 'develop'
...
pleroma_api_controller.ex: Improve conversations error reporting
See merge request pleroma/pleroma!2264
2020-03-15 12:47:39 +00:00
Haelwenn (lanodan) Monnier
8f7bc07ebc
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 12:35:23 +01:00
Ivan Tashkinov
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
rinpatch
14ebf8f1e5
Merge branch 'update/admin-fe-20200312' into 'develop'
...
Update AdminFE
See merge request pleroma/pleroma!2292
2020-03-14 11:25:17 +00:00
rinpatch
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-14 11:19:42 +00:00
rinpatch
6a28c198af
uploaded media plug: do not inject compile-time params on every request
2020-03-13 22:12:33 +03:00
rinpatch
38f796a5c6
Merge branch 'feature/mastofe-admin-scope' into 'develop'
...
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
2020-03-13 18:58:52 +00:00
rinpatch
4db88242e5
Merge branch 'docs/direct_conversation_id' into 'develop'
...
pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263
2020-03-13 18:58:22 +00:00
Mark Felder
2966377cb9
Update AdminFE
2020-03-13 21:55:08 +03:00
rinpatch
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
2020-03-13 18:50:17 +00:00
rinpatch
658f30c0b3
Merge branch 'static-accept-missing' into 'develop'
...
Fix static FE plug to handle missing Accept header.
See merge request pleroma/pleroma!2260
2020-03-13 18:46:54 +00:00
rinpatch
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-13 21:41:17 +03:00
rinpatch
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
2020-03-13 18:22:55 +00:00
Mark Felder
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
2020-03-13 12:54:06 -05:00
Mark Felder
7321429a2e
Lint
2020-03-13 12:42:06 -05:00
Mark Felder
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
2020-03-13 12:27:50 -05:00
Mark Felder
db36b48180
Remove test verifying we preserve cache-control headers; we don't
2020-03-13 12:23:14 -05:00
Mark Felder
470090471d
Fix test to use new cache-control settings
2020-03-13 12:20:33 -05:00
Mark Felder
413177c8f0
Set correct Cache-Control header for local media
2020-03-13 12:02:58 -05:00
Mark Felder
c62195127d
Update comment to reflect what the code is actually doing
2020-03-13 11:46:40 -05:00
Mark Felder
e04e16bbc0
Do not strip Cache-Control headers from media. Trust the Pleroma backend.
2020-03-13 11:31:55 -05:00
Mark Felder
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
2020-03-13 11:30:27 -05:00
rinpatch
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
2020-03-13 16:25:10 +00:00
Egor Kislitsyn
fffc382f13
Fix hashtags WebSocket streaming
2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
Alexander Strizhakov
98ed0d1c4b
more clean up
2020-03-13 09:37:57 +03:00
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
2020-03-12 20:29:51 +00:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
Alexander Strizhakov
1306b92997
clean up
2020-03-12 18:29:07 +03:00
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
rinpatch
00d1752031
Merge branch 'docs/new_user' into 'develop'
...
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes #1621
See merge request pleroma/pleroma!2286
2020-03-11 20:26:50 +00:00
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
rinpatch
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-11 15:16:18 +00:00
