Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
5 years ago
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
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
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
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
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
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
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'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
lain
0d2c13a119
Merge branch 'fix/otp-parsers' into 'develop'
...
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
5 years ago
lain
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
5 years ago
lain
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
5 years ago
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
lain
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
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
...
Closes #1109
5 years ago
rinpatch
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
5 years ago
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
rinpatch
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
5 years ago
rinpatch
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
5 years ago
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
rinpatch
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
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'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
Ivan Tashkinov
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
Maxim Filippov
08c89fd2b8
Fix incorrect report count
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago