sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7949 commits 2 branches 40 tags 290 MiB
Commit graph

2825 commits

Author SHA1 Message Date
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
Roman Chvanikov
88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
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
 2020-01-12 18:37:52 +00:00
feld
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
e64059d218 Assign token that can write to follows 2020-01-12 12:14:09 -06:00
Mark Felder
2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
feld
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
Hakaba Hitoyo
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 Pechnikov
5b84156013 moved remote follow in separate controller 2019-12-21 21:27:42 +03:00
Maksim Pechnikov
54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +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
feld
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
Maxim Filippov
4079d66f00 Expose issue via failing test 2019-12-19 19:47:36 +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
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
eae65e3216 formatting 2019-12-16 01:37:33 +03:00
rinpatch
6ffbfdeeb2 tests: significantly reduce streamer timeout 
there is no reason IPC between two processes on the same node should
take 4 seconds
 2019-12-16 01:22:01 +03:00
rinpatch
54029fe212 tests: remove a useless sleep in rate limiter tests 
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
 2019-12-16 01:03:13 +03:00
rinpatch
137a3d220b tests: remove a useless 1 second sleep 
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
 2019-12-16 00:51:59 +03:00
rinpatch
814a99c80f tests: remove a useless 3 second sleep 
the ids favs use are accurate down to a microsecond, there is no need
for it
 2019-12-16 00:50:39 +03:00
rinpatch
c8046e1080 tests: Replace 2 second sleep with offseting updated_at 2019-12-16 00:50:15 +03: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
Maksim Pechnikov
67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44: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
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
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
Ivan Tashkinov
3920244be5 [#1427] Fixed :admin option handling in OAuthScopesPlug, added tests. 2019-12-11 11:42:02 +03:00
Sadposter
8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence' 
# Conflicts:
#   lib/pleroma/user.ex
 2019-12-10 16:54:25 +00:00
Sadposter
5abee19b63 make analysis happy 2019-12-10 16:50:58 +00:00
Sadposter
19d228cc58 modify SQL to include followed-but-domain-blocked activities 2019-12-10 16:40:12 +00:00
minibikini
43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules' 
# Conflicts:
#   CHANGELOG.md
 2019-12-10 13:38:25 +00: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