rinpatch
7356659273
wow
2019-02-08 15:12:13 +03:00
rinpatch
f88dec8b33
What idiot did that? (me)
2019-02-08 13:16:50 +03:00
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
rinpatch
46aa8c18a2
Add keyword policy
2019-02-08 12:38:24 +03:00
Mark Felder
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
rinpatch
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
2019-02-06 17:47:58 +00:00
href
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
kaniini
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
2019-02-05 20:26:31 +00:00
kaniini
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
2019-02-05 18:56:59 +00:00
William Pitcock
e71ab5a10f
activitypub: transmogrifier: fix bare tags
2019-02-05 00:43:28 +00:00
William Pitcock
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 22:58:29 +00:00
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
William Pitcock
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
2019-02-04 19:03:54 +00:00
William Pitcock
64a3993425
activitypub: mrf: tag policy: add support for subscription control
2019-02-04 17:48:48 +00:00
William Pitcock
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
2019-02-04 17:06:37 +00:00
William Pitcock
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
2019-02-04 17:04:05 +00:00
William Pitcock
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
2019-02-04 17:04:05 +00:00
William Pitcock
88e32a32ce
mrf: add initial MRF.TagPolicy engine
2019-02-04 17:04:05 +00:00
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
Karen Konou
58262a8b8a
removed a debug thingy
2019-02-04 11:22:25 +00:00
Karen Konou
4430641349
squished a bug
2019-02-04 12:09:00 +01:00
Karen Konou
3cf046babb
actually commited the changes
2019-02-04 10:23:43 +01:00
Karen Konou
63a4f4b7be
fixed Map,put arguments, updated nomenclature
2019-02-04 10:23:07 +01:00
Karen Konou
583c4e0f17
more tweaks, fixed silly mistakes...
2019-02-03 23:56:20 +01:00
Karen Konou
e10cda7541
implemented tweaks
2019-02-03 22:46:06 +01:00
Karen Konou
531507a635
fixed things
2019-02-03 20:45:32 +01:00
Karen Konou
10130fa7d6
made toggleable, added docs
2019-02-03 20:27:28 +01:00
Karen Konou
0ef0ae35ab
added optional delist feature
2019-02-03 20:12:23 +01:00
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
2019-02-03 21:55:04 +03:00
lambda
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
2019-02-03 18:19:40 +00:00
lain
505a084058
Still do caching in tests.
2019-02-03 18:28:14 +01:00
Ivan Tashkinov
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if set_reachable
is not specified.
...
Added tests.
2019-02-03 13:28:13 +03:00
Ivan Tashkinov
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
2019-02-03 12:41:27 +03:00
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
William Pitcock
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
2019-01-29 12:21:02 +00:00
William Pitcock
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
2019-01-29 11:57:46 +00:00
Ivan Tashkinov
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of referer
header. Updated tests.
2019-01-29 13:12:28 +03:00
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged upstream/develop
.
2019-01-28 15:39:14 +03:00
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
William Pitcock
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
2019-01-28 06:07:18 +00:00
kaniini
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
2019-01-27 19:10:15 +00:00
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes
2019-01-27 19:33:21 +01:00
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
2019-01-26 04:46:02 +01:00