829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
5 years ago
371d39e160
Merge develop
5 years ago
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
5 years ago
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
5 years ago
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
4e6e5d8042
reverse proxy tests
5 years ago
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
5 years ago
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
5 years ago
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
5 years ago
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
5 years ago
31a59d6f23
Merge branch 'develop' into proxy-error
5 years ago
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
5 years ago
23d4781e73
change for local user search
5 years ago
abe2e8881f
Testing: Don't federate in testing.
5 years ago
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
5 years ago
44b2e1fdad
Formatting
5 years ago
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
5 years ago
7f609ee8f4
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
5 years ago
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
5 years ago
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
5 years ago
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
5 years ago
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
6c50fbcd14
Admin API: Allow querying user by ID
5 years ago
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
15eb1235ed
Expose `skip_thread_containment` in nodeinfo
5 years ago
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
5 years ago
4f42093220
Remove Uploaders.Swift
5 years ago
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
5 years ago
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
5 years ago
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
5 years ago
034986e1fd
MRF: add mediaproxy warming policy
5 years ago
657277ffc0
Resolve conflicts
5 years ago
452ca5250d
Merge admin and mastodon user views for reports
5 years ago
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
5 years ago
c6705144a2
don't delete config settings on admin update
5 years ago
889a9c3a3f
Polish IdempotencyPlug
5 years ago
159630b21c
Fix credo warning
5 years ago
0b8aeac0f3
Remove previous idempotency implementation from `post_status`
5 years ago
74132e3715
Enable IdempotencyPlug for the all API
5 years ago
825077a5b0
Add Idempotency plug
5 years ago
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
5 years ago
24bcc209f9
Merge branch 'refactoring/fix_render_view' into 'develop'
...
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
5 years ago
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
5c0f646cef
fix validate_page_url
5 years ago
a7a54068f9
Fix Controller.render/4 deprecation
5 years ago
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
0276cf5a02
fix validate_url for private ip
5 years ago
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
2c63c67512
Rework user deletion
5 years ago
f2c03425b0
Broadcast conversation update when DM is deleted
5 years ago
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
5 years ago
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
982cad0268
support for config groups
5 years ago
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
410add1c30
support for tuples with more than 2 values
5 years ago
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
5 years ago
53c73cd1a3
Merge branch 'fix/ecto-tasks-release' into 'develop'
...
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
5 years ago
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
5 years ago
f0fccb7578
fix for int and modules
5 years ago
19f16e829d
Load the application before executing the create task
5 years ago
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
5 years ago
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
5 years ago
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
5 years ago
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
5 years ago
f8c64dd4c0
Release Tasks: Ensure the application is loaded before getting the
...
modules
Needed for non-rpc tasks to work
5 years ago
21dacd4b15
unbreak polls
5 years ago
736d8ad6be
implement anti link spam MRF
5 years ago
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
5 years ago
df2dab69a7
Merge branch 'begone-the-dot-hack' into 'develop'
...
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
5 years ago
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
5 years ago
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
5 years ago
966317e052
Merge branch 'deps/update-auto-linker' into 'develop'
...
Deps: Update auto_linker
See merge request pleroma/pleroma!1300
5 years ago
64bc7ac619
Minor edit (comment).
5 years ago
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
f30a3241d2
Deps: Update auto_linker
5 years ago
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
5 years ago
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
5 years ago
dce27de733
Mastodon API: Remove the dot hack
5 years ago
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
5 years ago
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
5 years ago
0f59265a50
salmon fix
...
removed some ownership sandbox error
5 years ago
a04bf131e0
[ #570 ] add user:notification stream
5 years ago
bf6aa6f1a8
Fix report content stopping to be nullable
5 years ago
7a4228be5a
fix for new instances
5 years ago
44de34d170
Credo fixes
5 years ago
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
5 years ago
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
5 years ago
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
5 years ago
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
5 years ago
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
5 years ago
a440cf856d
Mastodon API: Return the token needed for the chat.
5 years ago
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
5 years ago
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
5 years ago
58a094b605
Add copyright info to containment.ex
5 years ago
eac298083f
MastodonAPI: Add a way to update the background image.
5 years ago
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
5 years ago
315f090f59
Prometheus: Remove flaky process collection NIF.
5 years ago
5965efb216
AccountView: Add user background.
5 years ago
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
5 years ago
30e54fd7e2
Handle HTTP 404 response
5 years ago
afae3ada22
Handle HTTP "410 Gone" response
5 years ago
a12f8e13c8
Improve <title> fallback; Add a test
5 years ago
7363a0ea8a
Revert "Only run Floki if title is missing from the map"
...
This reverts commit 97d2b1a45a
5 years ago
97d2b1a45a
Only run Floki if title is missing from the map
5 years ago
097fdf6a5d
Attempt to use <title> from HTML as a fallback
5 years ago
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
5 years ago
f46c628e6b
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
5 years ago
817c66bc3e
Remove search result order for non-RUM indexes
5 years ago
bf22ed5fbd
Update `auto_linker` dependency
5 years ago
6f29865d43
Add option to restrict all users to local content
5 years ago
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
bc8f059367
Add rate limiting for search endpoints
5 years ago
2e5affce61
Add RateLimiter
5 years ago
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
5 years ago
3ecfe2a6d4
Merge branch 'develop' into feature/releases
5 years ago
2a659b35f1
Add migrate/rollback to release tasks
5 years ago
d7ec0898e5
Make mix tasks work in a release
5 years ago
1e0fa899b6
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
...
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
5 years ago
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
970f71e222
Conversations: Fetch users in one query.
5 years ago
cb3258c863
Emoji: Use full path to check if a file is a directory.
5 years ago
01fe5abad1
Resolve conflicts
5 years ago
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
5 years ago
62cdf701f4
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
...
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
5 years ago
cb2bcee842
User Search: Boost friends more strongly.
5 years ago
9ae8f012a5
Switch to manual Supervisor child specifications instead of Supervisor.Spec
...
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
5 years ago
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
5 years ago
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
5 years ago
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
5 years ago
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
076c9ae40e
User: Remove superfluous `maybe_follow`.
5 years ago
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
50afe5ab9e
Merge branch 'fix-stuck-follows' into 'develop'
...
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
5 years ago
Ivan Tashkinov