Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,101 Commits 1 Branch 0 Tags 222 MiB
d4769b076a
Commit Graph

16101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini
c00fba4f7d Merge branch 'documentation/mastalab' into 'develop' 
README: Mastalab officially supports Pleroma.

See merge request pleroma/pleroma!713
 2019-01-26 14:10:42 +00:00
William Pitcock
18b80be5ee README: Mastalab officially supports Pleroma. 2019-01-26 14:10:26 +00:00
kaniini
b050d27c2d Merge branch 'bugfix/content_nil_lenght_check' into 'develop' 
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil

See merge request pleroma/pleroma!711
 2019-01-26 13:41:18 +00:00
Haelwenn (lanodan) Monnier
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag() 
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines 2019-01-26 04:45:36 +01:00
Haelwenn (lanodan) Monnier
499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null 2019-01-26 04:23:52 +01:00
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil 2019-01-26 03:50:49 +01:00
Ivan Tashkinov
d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
Ivan Tashkinov
060d280e64 [#534] Made Salmon.send_to_user calls be handled through Federator.enqueue. 2019-01-25 20:38:13 +03:00
lain
aa8ddfdbe2 SPC fixes: Fix activities. 2019-01-25 18:14:48 +01:00
Ivan Tashkinov
465adedb7c [#534] Websub fix: made SQL use UTC time zone when comparing with valid_until (instead of postgresql-server default time zone). 2019-01-25 18:29:43 +03:00
kaniini
6383fa3a5d Merge branch 'oembed_provider' into 'develop' 
Opengraph/TwitterCard::summary for statuses and user profiles

See merge request pleroma/pleroma!533
 2019-01-25 15:16:12 +00:00
Ivan Tashkinov
656ed7c84a [#534] Configurable outgoing federation reachability timeout. 2019-01-25 15:10:21 +03:00
lambda
b9cd5117a1 Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop' 
update pleroma frontend (summary_html hotfix)

See merge request pleroma/pleroma!710
 2019-01-25 10:23:43 +00:00
William Pitcock
57c3f8214c update pleroma frontend (summary_html hotfix) 2019-01-25 10:17:00 +00:00
rinpatch
a45a903480 Fix OGP provider tests 2019-01-25 10:51:06 +03:00
rinpatch
3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider 2019-01-25 10:40:51 +03:00
kaniini
4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
kaniini
c9b418e547 Merge branch 'develop' into 'oembed_provider' 
# Conflicts:
#   lib/pleroma/activity.ex
 2019-01-25 05:00:47 +00:00
kaniini
4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
kaniini
9bf1a4234d Merge branch 'update/pleroma-fe-20190125' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!709
 2019-01-25 04:57:05 +00:00
William Pitcock
4b76f14da1 update pleroma frontend 2019-01-25 04:49:35 +00:00
Maxim Filippov
9274cabe01 Use correct logic to determine "attentions" list 2019-01-24 23:30:43 +03:00
Ivan Tashkinov
3e9399ec0b [#534] Optimized bulk publish ops to filter on reachability early. Instance refactoring. 2019-01-24 19:15:23 +03:00
href
a3ba72d978
Fix clippy with one/five lines 2019-01-24 16:53:14 +01:00
Ivan Tashkinov
8654a591f0 [#534] Updating external instances reachability on incoming federation. 2019-01-24 17:37:23 +03:00
kaniini
2ebabaeb9c Merge branch 'fix-activity_visibility-autovacuum' into 'develop' 
Fix postgres activity_visibility when running in autovacuum

See merge request pleroma/pleroma!708
 2019-01-24 13:22:34 +00:00
href
e02b19d1d7
Fix postgres activity_visibility when running in autovacuum 2019-01-24 14:13:20 +01:00
href
be43aa2875
FlakeId: ignore null mac for workerid, use first mac 2019-01-24 13:08:27 +01:00
href
0f80bc2dca Merge branch 'feature/mrf-anti-followbot' into 'develop' 
mrf: add anti-followbot policy

See merge request pleroma/pleroma!706
 2019-01-24 10:20:22 +00:00
William Pitcock
13d72826df test: add anti-followbot policy tests 2019-01-24 09:50:40 +00:00
William Pitcock
54ec6d09b0 mrf: add anti-followbot policy 2019-01-24 09:35:19 +00:00
Ivan Tashkinov
20b54366ee [#534] Federation publish requests status control (enforced 2xx response code check). 2019-01-24 11:54:52 +03:00
kaniini
4983e6e9d2 Merge branch 'fix/hide-network-setting' into 'develop' 
Send "hide_network" in user_view

See merge request pleroma/pleroma!704
 2019-01-23 23:47:36 +00:00
Maxim Filippov
4333fea1dc Send "hide_network" in user_view 2019-01-23 19:47:51 +03:00
Ivan Tashkinov
f161a92cb1 [#534] Initial implementation of unreachable federation targets retirement. 2019-01-23 18:37:25 +03:00
kaniini
4a278cd80a Merge branch 's3-namespace' into 'develop' 
S3 uploader: support for namespaced bucket

Closes #532

See merge request pleroma/pleroma!699
 2019-01-23 13:25:04 +00:00
href
abb349bde0 Merge branch 'fix-info-id' into 'develop' 
Fix info ids.

Closes #511

See merge request pleroma/pleroma!702
 2019-01-23 13:20:34 +00:00
lain
ab03f81219 Fix info ids. 
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.

Closes #511
 2019-01-23 14:01:44 +01:00
lambda
5067b791a1 Merge branch 'rename/pleroma_activity_consistency' into 'develop' 
Consistent fonction names in Pleroma.Activity

See merge request pleroma/pleroma!690
 2019-01-23 12:14:41 +00:00
lain
2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency 2019-01-23 13:05:58 +01:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
href
9ba6e1fabe
FlakeId: chain alter statements 2019-01-23 12:09:21 +01:00
href
e67bd93d90
Flake: migrate pinned_activities in jsonb 2019-01-23 11:26:39 +01:00
href
a92c43bc4b
Clippy! 2019-01-23 11:26:38 +01:00
href
465fb4327d
Lock activities/users table during flake migration. 2019-01-23 11:26:37 +01:00