Commit Graph

5862 Commits (30590cf46b88d0008c9a7163b8339aa9376f2378)

Author SHA1 Message Date
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
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 28701c08ad Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 6f9839c73c Merge branch 'develop' into issue/1276
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
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 58574ef156 Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 3830cb538b removed a comments
5 years ago
Maksim Pechnikov cd040691bd maked `unread_count` as virtual field
5 years ago
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276
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 ba5e8a6444 Merge branch 'develop' into issue/1276
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 e442ea5722 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383
5 years ago
Roman Chvanikov 86c4b76bf0 Fix typo
5 years ago
feld 36838b516f Merge branch 'fix/runtime-config' into 'develop'
5 years ago
Mark Felder d770cffce0 Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov 86e4d23acb [#1505] Background fetching of incoming activities' `replies` collections.
5 years ago
Alexander Strizhakov de4102b247
can be changed in runtime
5 years ago
Alexander Strizhakov 6252e82f85
respect settings from database in mix tasks
5 years ago
Maksim Pechnikov 99c0a11c58 added atom feed
5 years ago
Maksim Pechnikov 055edd3d72 Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch 8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
5 years ago
rinpatch 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
Alexander Strizhakov 6a0f0ac4a2
fix for non existing atom
5 years ago
Maksim Pechnikov 293281fcbd Merge branch 'develop' into feature/tag_feed
5 years ago
Alexander Strizhakov 6cd2e851d9
parsing Swoosh modules
5 years ago
Alexander Strizhakov e8e57e398f
restart config id after truncate
5 years ago
Alexander Strizhakov 4344c5d5b9
truncate config table on migrate to db task
5 years ago
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity
5 years ago
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov ce7c887a27 removed try/rescue
5 years ago
Maksim 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
5 years ago
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop'
5 years ago
Mark Felder e151dea276 Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Mark Felder ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
Ivan Tashkinov cf96c40057 [#1505] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
rinpatch 6e6f1ead31 Merge branch 'no-error-404' into 'develop'
5 years ago
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383
5 years ago
minibikini 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
Egor Kislitsyn 5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
feld be27777156 Merge branch 'admin-be' into 'develop'
5 years ago
Egor Kislitsyn b6f5b326e7
Fix credo warnings
5 years ago
Egor Kislitsyn aa0f0d4edd
Disable NewUsersDigestEmail by default
5 years ago
Egor Kislitsyn df0b8f1d08
Add new users digest email
5 years ago
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop'
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup
5 years ago
Haelwenn (lanodan) Monnier 7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
5 years ago
Alexander Strizhakov f01ab6cd29
some refactor and tests
5 years ago
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop'
5 years ago
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov dcae5914d1
fix for db key
5 years ago
Maksim Pechnikov 41e2332007 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop'
5 years ago
Alexander Strizhakov 8023fa48db
merge fix
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
5 years ago
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
5 years ago
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
5 years ago
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats
5 years ago
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
5 years ago
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
rinpatch 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop'
5 years ago
rinpatch dc0498ab2b Check for unapplied migrations on startup
5 years ago
Roman Chvanikov cde828ff7d Fix credo warning
5 years ago
Roman Chvanikov d6a532bf0f Delete attachments asynchronously
5 years ago
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
Alexander Strizhakov efb8ef5abe
releases support
5 years ago
Alexander Strizhakov e699861690
full update for some subkeys
5 years ago
Roman Chvanikov 81133702d4 Delete attachments after object and cache cleanup
5 years ago
Alexander Strizhakov 89e93fb33f
return db key on update requests
5 years ago
Alexander Strizhakov 7676ed8239
some clean up
5 years ago
Alexander Strizhakov ce027fd0ef
revert non needable
5 years ago
Alexander Strizhakov 9e10b90b5b
configure only console backend
5 years ago
Maksim Pechnikov 108a39c876 updated error messages for authentication process
5 years ago
Alexander Strizhakov b310feeccb
compile fix
5 years ago
Alexander Strizhakov 58e8963824
fix for config loader
5 years ago
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Maksim Pechnikov a5db044e57 Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed'
5 years ago
Alexander Strizhakov 59ba5c80b9
little cleanup
5 years ago
Alexander Strizhakov 66de2b159b
don't migrate Pleroma.Web.EndPoint settings
5 years ago
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
lain 167e9c45ec Benchmarks: Move to correct folder
5 years ago
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements.
5 years ago
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov 0709757e47 Check if object->data is array when looking up attachment objects to delete
5 years ago
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383
5 years ago
Roman Chvanikov 88f0eed0f2 Delete attachments when status is deleted
5 years ago
feld 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop'
5 years ago
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354
5 years ago
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
Hakaba Hitoyo 0c9c62509d Remove MDII uploader
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov 3453b27015
don't migrate prometheus settings
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov eadb674c41
don't migrate configurable_from_database setting
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update
5 years ago
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
5 years ago
Alexander Strizhakov 88a16bb9fc
deep merge in config update
5 years ago
Alexander c841174de8
flag for delete fix
5 years ago
Alexander 0b02040327
little fixes and typos fix
5 years ago
Alexander 9c1f3bfeff
fixes for logger backends
5 years ago
Alexander cda2c1fc63
fix for subgroup tuple
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander a71393dd29
fix for endpoints after env update
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alexander 0656816c77
tests for setttings without an explicit key
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov 70410dfafd fix create service actor
5 years ago
eugenijm 0b6d1292d2 Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
5 years ago
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov bdd71669da update test
5 years ago
Maksim 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
Maksim c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383
5 years ago
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop'
5 years ago
Maxim Filippov e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
5 years ago
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard
5 years ago
feld a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop'
5 years ago
Maksim Pechnikov 7bd0bca2ab fixed remote follow
5 years ago
Maxim Filippov 5fc84552d3 Fix all count
5 years ago
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn 775212121c
Verify HTTP signatures only when request accepts "activity+json" type
5 years ago
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maxim Filippov 404a9ccb9a Stats: return status counts by scope
5 years ago
Maksim Pechnikov b53573a837 add tag feeds
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Maxim Filippov 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov a879c396bb Merge branch 'develop' into feature/tag_feed
5 years ago
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn a12b6454bb
Add an option to require fetches to be signed
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Phil Hagelberg 02c3031e99 Don't log when users or objects are deleted.
5 years ago
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
5 years ago
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
Egor Kislitsyn e536796984 Add native captcha and enable it by default.
5 years ago
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses
5 years ago
Egor Kislitsyn ee6805850c Set log level to debug for not important messages
5 years ago
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
5 years ago
Sadposter 1ad96d667a remove single-step pipe
5 years ago
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop'
5 years ago
Ivan Tashkinov 3920244be5 [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex
5 years ago
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 25f774f7c1 format activity_pub.ex
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route
5 years ago
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Egor Kislitsyn a37bd5c255 Change log level
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
Egor Kislitsyn b7a57d8e38 Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
5 years ago
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Maksim Pechnikov 2b821036c4 Merge branch 'develop' into issue/1383
5 years ago
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
lain f3c2363f4a Merge branch 'fix/user-list-task' into 'develop'
5 years ago
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
5 years ago
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time'
5 years ago
Egor Kislitsyn 78299ab182 Set Plug.Logger to log at `:debug` level
5 years ago
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod
5 years ago
Egor Kislitsyn 84f891ea3e Add Pleroma.Utils.compile_dir/1
5 years ago
lain d4bafabfd1 Beginnings of the create validator
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
rinpatch 3c45ed4f47 OTP: Fix runtime upload limit config being ignored
5 years ago
rinpatch d6c89068f3 HTML: Compile Scrubbers on boot
5 years ago
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
rinpatch bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
5 years ago
rinpatch a21340caa1 Fix never matching clause
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
Ivan Tashkinov 93a80ee915 [#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago