Commit Graph

5549 Commits (0e8f6d24b87812664d3bb021d17f120686cf2401)

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
rinpatch 6a28c198af uploaded media plug: do not inject compile-time params on every request
5 years ago
rinpatch 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
rinpatch 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop'
5 years ago
rinpatch 658f30c0b3 Merge branch 'static-accept-missing' into 'develop'
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
Mark Felder c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder 7321429a2e Lint
5 years ago
Mark Felder 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy
5 years ago
Mark Felder 413177c8f0 Set correct Cache-Control header for local media
5 years ago
Mark Felder c62195127d Update comment to reflect what the code is actually doing
5 years ago
Mark Felder ad31d0726a Do not trust remote Cache-Control headers for mediaproxy
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Egor Kislitsyn fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
Alexander Strizhakov 98ed0d1c4b
more clean up
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 1306b92997
clean up
5 years ago
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
rinpatch 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
5 years ago
feld f92c447bbc Merge branch 'relay-list-change' into 'develop'
5 years ago
rinpatch c3b9fbd3a7 Revert "Set better Cache-Control header for static content"
5 years ago
Alexander Strizhakov fce090c1de
using Pleroma.Config instead of ets
5 years ago
Alexander Strizhakov 193d67cde5
compile fix
5 years ago
Alexander Strizhakov 282a93554f
merging release default config on app start
5 years ago
Haelwenn (lanodan) Monnier 863ec33ba2
Add support for funkwhale Audio activity
5 years ago
Ivan Tashkinov 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
Ivan Tashkinov 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Mark Felder 5af798f246 Fix enforcement of character limits
5 years ago
Alexander Strizhakov f39e1b9eff
add verify tls_opts only when we open connection
5 years ago
Alexander Strizhakov 426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun
5 years ago
rinpatch 6cf1958b02 moderation log: fix improperly migrated data
5 years ago
Alexander Strizhakov 474ef512df wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun
5 years ago
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop'
5 years ago
Alexander Strizhakov 5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
5 years ago
Alexander Strizhakov 78282dc983
little polishing
5 years ago
Alexander Strizhakov c93c3096d5
little refactor
5 years ago
Ivan Tashkinov 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Ivan Tashkinov 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
Alexander Strizhakov 058c9b01ac
returning, not needed
5 years ago
Alexander Strizhakov f0753eed0f
removing try block in tesla request
5 years ago
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode
5 years ago
lain 47604907c9 Merge branch 'proper_error_messages' into 'develop'
5 years ago
Haelwenn 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop'
5 years ago
Alexander Strizhakov eb324467d9
removing try block in getting gun info
5 years ago
Mark Felder cdb05633a6 Generate instance stats on startup
5 years ago
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
5 years ago
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Alexander Strizhakov 22d52f5691
same copyright date format
5 years ago
Alexander Strizhakov 6b2fb9160c
otp version
5 years ago
Mark Felder d9c5ae7c09 Update Copyrights for gun related files
5 years ago
Mark Felder 4427161ca3 Merge branch 'develop' into gun
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Ivan Tashkinov b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
Alexander Strizhakov 884d9710b2
refactoring for gun api modules
5 years ago
Alexander Strizhakov f98ee730f0
adapter renaming to adapter_helper
5 years ago
Alexander Strizhakov 8854770fc4
retry and retry_timeout settings default change
5 years ago
Alexander Strizhakov 1ad34bfdba
no try block in checkout connection
5 years ago
Alexander Strizhakov 24bf5c4e89
remove try block from pool request
5 years ago
Alexander Strizhakov aaa879ce75
proxy parsing errors
5 years ago
Alexander Strizhakov 6ebf389d6e
poolboy timeout fix
5 years ago
Alexander Strizhakov 8fc00b7cbf
return error if connection failed to open
5 years ago
Alexander Strizhakov 7d68924e4f
naming
5 years ago
Alexander Strizhakov e605e79df9
simplification of formatting host method
5 years ago
Alexander Strizhakov ee8071f0d5
removing unused method
5 years ago
Alexander Strizhakov 05429730e4
unnecessary with
5 years ago
Alexander Strizhakov d0e4d3ca3b
removing unnecessary with
5 years ago
Alexander Strizhakov 24d1ac125c
hiding raise error logic to otp_version module
5 years ago
Alexander Strizhakov 28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov 151dc4e387 Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
5 years ago
Alexander Strizhakov 7eb6592992 Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov a21a66972f Apply suggestion to lib/pleroma/http/http.ex
5 years ago
Alexander Strizhakov 614e3934f9 Apply suggestion to lib/pleroma/http/http.ex
5 years ago
Alexander Strizhakov d30ff35d94 Apply suggestion to lib/pleroma/http/request_builder.ex
5 years ago
Alexander Strizhakov a3ad028973 Apply suggestion to lib/pleroma/http/adapter.ex
5 years ago
Alexander Strizhakov 2c8d80dc0a Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov 097ad10d02 Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov 4c8569d403
otp_version refactor
5 years ago
Alexander Strizhakov 509c81e4b1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov 99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
eugenijm 7af431c150 Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
Egor Kislitsyn 4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn 764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
5 years ago
Alexander Strizhakov cc98d010ed
relay list shows hosts without accepted follow
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 400fbc7629
wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov 34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov ba87ed7335
fix for compiling
5 years ago
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
Phil Hagelberg 523f73dccd Fix static FE plug to handle missing Accept header.
5 years ago
rinpatch b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
rinpatch ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
rinpatch 4d416343fa rate limiter: Fix a race condition
5 years ago
rinpatch df2173343a pagination: limit the number of elements returned at one time to 40
5 years ago
rinpatch 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
5 years ago
Ivan Tashkinov c747260989 [#2250] Tiny refactoring per merge request review.
5 years ago
Alexander Strizhakov 814b275af7
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier 3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
5 years ago
Ivan Tashkinov 3759b146c4 Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
5 years ago
feld f2216287a7 Merge branch 'admin-status-list' into 'develop'
5 years ago
Ivan Tashkinov 6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
Egor Kislitsyn cb60a9c42f
Do not fail when user has no email
5 years ago
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
eugenijm e2a6a40367 Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
Egor Kislitsyn f446744a6a
Allow account registration without an email
5 years ago
lain fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop'
5 years ago
rinpatch 3bbfebd1c2 instance.gen task: make example instance name less confusing
5 years ago
rinpatch 359faa8645 instance.gen task: remind to transfer the config to the database after
5 years ago
rinpatch cfa28dee32 instance.gen task: make instance name default to the domain
5 years ago
Egor Kislitsyn 22018adae6
Fix Dialyzer warnings
5 years ago
rinpatch 035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop'
5 years ago
rinpatch 5e4fe0e8f7 instance.gen task: fix crash when using custom static directory
5 years ago
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Alexander Strizhakov 8efae966b1
open conn in separate task
5 years ago
lain 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Ivan Tashkinov 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
Ivan Tashkinov 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Alexander Strizhakov d44f9e3b6c
fix for timeout clause
5 years ago
Alexander Strizhakov f604f9e470
hackney pool timeout
5 years ago
Alexander Strizhakov 6806df80dd
don't log info ssl messages
5 years ago
Alexander Strizhakov ad8f26c0a4
more info in Connections.checkin timout errors
5 years ago
Alexander Strizhakov a03c420b84
by default don't use gun retries
5 years ago
Alexander Strizhakov 13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' into 'develop'
5 years ago
lain 3eddd9caa6 Merge branch 'require-signature' into 'develop'
5 years ago
lain c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
5 years ago
Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
5 years ago
Ivan Tashkinov 3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
lain 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
Alexander Strizhakov c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
Mark Felder 7d73e7a09a Spelling
5 years ago