Commit graph

4833 commits

Author SHA1 Message Date
Roman Chvanikov
88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
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
2020-01-12 18:37:52 +00:00
bb5862ea2f Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow

See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
Mark Felder
2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
ea4a462858 Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear  HTML entities after scrub html and truncate

See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
lain
05ca420c09 Merge branch 'issue/1490' into 'develop'
[#1490] fixed create  service user   (relay, internal.fetch)

See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
Maksim Pechnikov
70410dfafd fix create service actor 2020-01-08 16:40:49 +03:00
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 2020-01-05 17:38:51 +03:00
Maksim Pechnikov
fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate 2020-01-03 16:28:13 +03:00
Ivan Tashkinov
badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests 2020-01-02 13:03:33 +03:00
Maksim Pechnikov
933dc12043 added code of mr#2067 2019-12-25 15:12:43 +03:00
Maksim Pechnikov
bdd71669da update test 2019-12-22 21:21:31 +03:00
Maksim
4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex 2019-12-22 17:58:54 +00:00
Maksim
c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex 2019-12-22 17:58:45 +00:00
Maksim Pechnikov
5b84156013 moved remote follow in separate controller 2019-12-21 21:27:42 +03:00
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
2019-12-21 11:56:24 +00:00
Maxim Filippov
e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
Mark Felder
06ae56a3ae Posts without media attachments should get the Summary TwitterCard 2019-12-20 16:32:04 -06:00
a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope

See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
Maksim Pechnikov
7bd0bca2ab fixed remote follow 2019-12-20 16:33:44 +03:00
Maxim Filippov
5fc84552d3 Fix all count 2019-12-19 19:52:55 +03:00
Ivan Tashkinov
ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests 2019-12-19 17:24:08 +03:00
Ivan Tashkinov
455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests. 2019-12-19 17:23:27 +03:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden 2019-12-19 19:26:46 +07:00
Maxim Filippov
404a9ccb9a Stats: return status counts by scope 2019-12-18 23:17:34 +03:00
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
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Ivan Tashkinov
7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03: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
Egor Kislitsyn
7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07: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
Egor Kislitsyn
ee6805850c Set log level to debug for not important messages 2019-12-11 17:47:19 +07: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
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