Roman Chvanikov
81133702d4
Delete attachments after object and cache cleanup
5 years ago
Roman Chvanikov
0709757e47
Check if object->data is array when looking up attachment objects to delete
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'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
5 years ago
feld
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
feld
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
5 years ago
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
5 years ago
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
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
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
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
5 years ago
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
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'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
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
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
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
rinpatch
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
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'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
5 years ago
Ivan Tashkinov
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
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'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
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'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
5 years ago
Sadposter
1ad96d667a
remove single-step pipe
5 years ago
lain
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
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'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
5 years ago
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Sadposter
25f774f7c1
format activity_pub.ex
5 years ago