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>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
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.
2019-12-13 14:27:10 +03:00
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
2019-12-12 18:43:21 +00:00
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.
2019-12-12 16:00:06 +03:00
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
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
2019-12-12 09:28:27 +00:00
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
2019-12-11 15:02:53 -06:00
Maxim Filippov
82fae3e23f
AdminAPI: Merge account views for list instance statuses
2019-12-11 18:57:36 +03:00
rinpatch
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
Sadposter
1ad96d667a
remove single-step pipe
2019-12-11 09:08:20 +00:00
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
2019-12-11 08:50:43 +00:00
Ivan Tashkinov
3920244be5
[ #1427 ] Fixed :admin option handling in OAuthScopesPlug, added tests.
2019-12-11 11:42:02 +03:00
Sadposter
457821adb0
Apply suggestion to lib/pleroma/user.ex
2019-12-10 18:49:41 +00:00
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
2019-12-10 17:25:56 +00:00
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter
25f774f7c1
format activity_pub.ex
2019-12-10 16:41:43 +00:00
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
2019-12-10 16:40:12 +00:00
Egor Kislitsyn
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
2019-12-10 22:36:03 +07:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
Maksim Pechnikov
9dfaa0b832
fix loads config variable with large value from db
2019-12-09 22:29:44 +03:00
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
2019-12-09 17:55:48 +00:00
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
2019-12-09 20:45:04 +03:00
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
2019-12-09 15:10:05 +00:00
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
2019-12-09 14:55:42 +00:00
lain
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
2019-12-09 14:44:56 +00:00
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
lain
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
2019-12-09 13:52:01 +00:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
rinpatch
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
2019-12-08 21:08:25 +03:00
rinpatch
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
2019-12-08 20:03:33 +03:00
rinpatch
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
2019-12-08 13:50:57 +00:00
rinpatch
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
2019-12-08 16:46:18 +03:00
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
2019-12-08 13:07:05 +00:00
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
2019-12-08 11:23:31 +00:00
Maxim Filippov
a7f77785c2
Implement report notes destruction
2019-12-08 11:27:23 +03:00
Ivan Tashkinov
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
2019-12-07 17:49:53 +03:00
Ivan Tashkinov
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
2019-12-06 20:33:47 +03:00
rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
Ivan Tashkinov
93a80ee915
[ #1427 ] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.
2019-12-06 16:56:23 +03:00
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
Maxim Filippov
08c89fd2b8
Fix incorrect report count
2019-12-06 17:17:24 +09:00
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
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).
2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
