Commit Graph

5552 Commits (19eedb3d0424abb235eec1a51457ed0bf3a0e95d)

Author SHA1 Message Date
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
Mark Felder cf94349287 Merge branch 'develop' into gun
5 years ago
lain cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop'
5 years ago
Ivan Tashkinov 61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain 3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop'
5 years ago
lain c07efd5b42 Merge branch 'need-reboot-flag' into 'develop'
5 years ago
Egor Kislitsyn 2ef70b55f5
Fix `status.expires_at` type
5 years ago
Alexander Strizhakov 514c899275
adding gun adapter
5 years ago
rinpatch 472132215e Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov 269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Haelwenn (lanodan) Monnier 1257331291
MastodonAPI.StatusView: Do not use site_name
5 years ago
Mark Felder 478619782b Standardize @behaviour usage in MRFs
5 years ago
rinpatch 9906c6fb6f Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
5 years ago
rinpatch 23049a077e NodeInfo: Fix federating status not being reported when MRF
5 years ago
feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
5 years ago
Egor Kislitsyn 19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
5 years ago
Egor Kislitsyn 50d9fcbe29
Hotlink logo instead of attachment
5 years ago
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
5 years ago
rinpatch ea1631d7e6 Make Floki use fast_html
5 years ago
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Egor Kislitsyn 6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
rinpatch 94e5ca1105 Merge branch 'issue/1383' into 'develop'
5 years ago
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
5 years ago
rinpatch c55301e760 Fix a compilation error under certain circumstances
5 years ago
Ivan Tashkinov 24e49d14f2 [#1505] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
Ivan Tashkinov 6ea3c06d8d [#1505] Minor refactoring.
5 years ago
Ivan Tashkinov 7c3991f59e [#1505] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
rinpatch 8fda6303ba Fix email mix task on OTP releases
5 years ago
Ivan Tashkinov 4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
lain 964b4d82a0 Merge branch 'fix/upload-limit-otp' into 'develop'
5 years ago
Alexander Strizhakov dad23e3766
need_reboot flag
5 years ago
rinpatch 15ea75cd2a Actually fix upload limit on OTP releases
5 years ago
Haelwenn 1262357ddb Merge branch 'cancel-follow-request' into 'develop'
5 years ago
Lain Soykaf d85bcc8627 Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf 4538a1ee01 EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Egor Kislitsyn bc2e98b200
Add User.get_follow_state/2
5 years ago
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts
5 years ago
feld df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
5 years ago
Egor Kislitsyn 8b9742ecf5 Cancellation of a follow request for a remote user
5 years ago
Alexander Strizhakov c85aa6e87f
removing confusing error
5 years ago
rinpatch 15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop'
5 years ago
rinpatch 72d767998c Merge branch 'removing-admin-api-endpoint' into 'develop'
5 years ago
feld b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop'
5 years ago
Alexander Strizhakov 5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
Egor Kislitsyn 3909b5b7b3
Remove AutoLinker `scheme` option from the config
5 years ago
rinpatch 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
5 years ago
Egor Kislitsyn 8c71f7e11a Add support for cancellation of a follow request
5 years ago
Ivan Tashkinov e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov 2c40c8b4a2 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 50f5a92021 fix not being able to pin polls
5 years ago
rinpatch 983a87175e mastodon API: do not sanitize html in non-html fields
5 years ago
Roman Chvanikov 8057157ee3 Make attachments cleanup optional
5 years ago
rinpatch c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
5 years ago
rinpatch 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain 774cba84f5 Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
5 years ago
lain a0d9d42eaa Emoji Reactions: Actually use the validation.
5 years ago
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
5 years ago
feld df200ea7a4 Merge branch 'http-security-warning' into 'develop'
5 years ago
feld b3e9c87724 Update emoji_api_controller.ex
5 years ago
feld 36becd5573 Update http_security_plug.ex
5 years ago
rinpatch 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop'
5 years ago
rinpatch 889965141a RemoteIp: only trust X-Forwarded-For
5 years ago
Haelwenn 946de2299c Merge branch 'fix-streaming-reblog' into 'develop'
5 years ago
Egor Kislitsyn e07e7888d7
Fix credo warning
5 years ago
Egor Kislitsyn 2bd4d6289b
Make the warning more scarier
5 years ago
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users
5 years ago
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov 1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383
5 years ago
lain cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain 12b6fcdb8c Merge branch 'features/task-test-email' into 'develop'
5 years ago
lain 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop'
5 years ago
Alexander Strizhakov 7bd4c14581
meta tag parser respect first title header
5 years ago
lain d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
Haelwenn 271935953a Merge branch 'whole-db-removal' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 4eb935be78
Create pleroma.email mix task
5 years ago
lain 77f24525ca Streamer: Correctly handle reblog mutes
5 years ago
Egor Kislitsyn 6302b40791
Warn if HTTPSecurityPlug is disabled
5 years ago
feld d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop'
5 years ago
Roman Chvanikov d18a2e4e36 Add test for custom base_url when deleting an attachment
5 years ago
Roman Chvanikov 804a702f97 Fix base_url string trimming
5 years ago
Roman Chvanikov dea968463d Add logging
5 years ago
lain 46915207b6 Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
lain e3fae3380e Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
Roman Chvanikov 7f78bd7e37 Fix __MODULE__ usage
5 years ago
lain 95afcae194 Merge branch 'support/update_ecto' into 'develop'
5 years ago
lain 4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop'
5 years ago
Maksim Pechnikov 02c3dd2e3d update ecto
5 years ago
Roman Chvanikov eb4870e1cd Remove unused var
5 years ago
Roman Chvanikov 52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker
5 years ago
Maksim Pechnikov bcffa662dc Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo dabd535e43 Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383
5 years ago
Roman Chvanikov 86c4b76bf0 Fix typo
5 years ago