William Pitcock
|
15d624e077
|
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
|
2018-06-27 13:07:29 +00:00 |
|
lambda
|
dfc96f222c
|
Merge branch 'feature/configurable-blocks' into 'develop'
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
|
2018-06-25 06:12:29 +00:00 |
|
squidboi
|
ea214b8ba6
|
combined outgoing_blocks with statement
|
2018-06-24 23:05:44 -07:00 |
|
squidboi
|
c4038ede07
|
fix mind-crushingly dumb syntax error
|
2018-06-23 14:32:00 -07:00 |
|
squidboi
|
f4990283de
|
change moved attributes into normal variables
|
2018-06-23 14:27:07 -07:00 |
|
squidboi
|
4e099fcfa9
|
move configurable module attributes into relevant functions
|
2018-06-23 14:16:08 -07:00 |
|
lambda
|
90cf75f4a7
|
Merge branch 'features/column_media_streaming' into 'develop'
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
|
2018-06-19 09:50:05 +00:00 |
|
William Pitcock
|
4f589998ee
|
activitypub: support filtering activities by whether or not they are a reply (closes #109)
|
2018-06-18 03:21:32 +00:00 |
|
Haelwenn (lanodan) Monnier
|
b670d4d683
|
MastodonAPI: Add streaming to media tabs of federated and local TLs
|
2018-06-17 16:17:15 +02:00 |
|
squidboi
|
2e294ee44a
|
Merge branch 'develop' into feature/configurable-blocks
|
2018-06-16 15:37:16 -07:00 |
|
lambda
|
8c7fdcb31b
|
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
|
2018-06-14 07:19:36 +00:00 |
|
Francis Dinh
|
1555c66650
|
Add unretweet TwAPI endpoint and cleanup AP.unannounce
|
2018-06-13 21:33:36 -04:00 |
|
lambda
|
3f42806b1b
|
Merge branch 'develop' into 'develop'
Dedupe uploads
See merge request pleroma/pleroma!115
|
2018-06-12 08:26:26 +00:00 |
|
lambda
|
564c73ab24
|
Merge branch 'feature/list-streaming' into 'develop'
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
|
2018-06-12 07:19:45 +00:00 |
|
William Pitcock
|
76f80ba8c2
|
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
|
2018-06-11 22:15:53 +00:00 |
|
lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
squidboi
|
4f9ecfc77a
|
formatting
|
2018-06-09 04:28:11 +00:00 |
|
squidboi
|
8903f1ad4d
|
more fixes
|
2018-06-08 19:07:14 -07:00 |
|
squidboi
|
16d896f526
|
fixes
|
2018-06-08 19:01:14 -07:00 |
|
squidboi
|
2847fc8f90
|
add option to not unfollow on block, and option to not federate outgoing blocks
|
2018-06-08 17:12:16 -07:00 |
|
William Pitcock
|
09604182d0
|
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
|
2018-06-07 14:38:09 +00:00 |
|
Sir_Boops
|
3f0440ac3c
|
Dedupe uploads
|
2018-06-06 13:25:44 -06:00 |
|
eal
|
29c9c8d93b
|
Extract host from ap_id, add index
|
2018-06-06 21:13:40 +03:00 |
|
eal
|
9075b6d25b
|
ActivityPub.ex: filter domain blocked activities.
|
2018-06-03 23:33:33 +03:00 |
|
eal
|
5d3fdbc082
|
MastoAPI: Add streaming for lists.
|
2018-05-30 16:48:59 +03:00 |
|
lain
|
841ee8e3e4
|
Simplify DM query.
Should also use indexes better.
|
2018-05-26 16:25:32 +02:00 |
|
lain
|
4b3ec53514
|
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
|
2018-05-26 16:00:59 +02:00 |
|
lain
|
3839a11ef5
|
Don't treat remote accepts/rejects as local.
Also, use specialized functions to get safe data.
|
2018-05-26 14:07:46 +02:00 |
|
William Pitcock
|
c0ca9f82b9
|
mastodon api: properly track if an account is locked or not
|
2018-05-25 06:14:09 +00:00 |
|
csaurus
|
4fd9df100f
|
Merge branch 'develop' into feature/mstdn-direct-api
|
2018-05-21 20:19:37 -04:00 |
|
Francis Dinh
|
46427cb90f
|
Pass correct number of arguments to unfollow
|
2018-05-21 11:57:15 -04:00 |
|
Francis Dinh
|
89c5de9096
|
Fix unfollows
|
2018-05-20 21:01:14 -04:00 |
|
Francis Dinh
|
1afd6d37bd
|
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
|
2018-05-20 19:17:15 -04:00 |
|
lain
|
434601a5c3
|
Return private / direct posts on user timelines, too.
|
2018-05-20 16:15:18 +02:00 |
|
Thog
|
6f39ecc41b
|
Support Undo like activities (Fix #139)
|
2018-05-19 22:14:15 +02:00 |
|
lambda
|
ad563669c8
|
Merge branch 'feature/remote-user-deactivation' into 'develop'
remote user deactivation
See merge request pleroma/pleroma!154
|
2018-05-19 09:30:09 +00:00 |
|
William Pitcock
|
2051530868
|
activitypub transmogrifier: handle hubzilla AP actor quirks
|
2018-05-19 03:28:29 -05:00 |
|
William Pitcock
|
13d4b6d2b5
|
remote user deactivation: fix test failures
|
2018-05-19 01:26:13 -05:00 |
|
Francis Dinh
|
0ec1abb3b6
|
Add federated blocks
|
2018-05-18 18:09:56 -04:00 |
|
csaurus
|
4dfb40a546
|
Handle cases where a to/cc field is absent on a status
|
2018-05-14 21:54:25 -04:00 |
|
William Pitcock
|
9390492138
|
ActivityPub create: discard activities from deactivated users
|
2018-05-13 19:05:02 -05:00 |
|
csaurus
|
2ce48c1a42
|
Formatting
|
2018-05-13 15:36:41 -04:00 |
|
csaurus
|
9aabff4883
|
Fix tests.
|
2018-05-13 15:33:59 -04:00 |
|
lain
|
c7a85de35c
|
Revert "Remove 'unlisted' handling for now."
This reverts commit 1027d1f696.
|
2018-05-13 12:38:13 +02:00 |
|
lain
|
1027d1f696
|
Remove 'unlisted' handling for now.
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
|
2018-05-13 12:07:11 +02:00 |
|
lain
|
a5c9dd0a2a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-05-13 11:59:35 +02:00 |
|
lain
|
3c3933e40b
|
Unlisted fetching: Reverse logic
Generates a faster query.
|
2018-05-13 11:58:03 +02:00 |
|
lambda
|
aeff2d6474
|
Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
|
2018-05-13 09:32:29 +00:00 |
|
lain
|
ec531ca281
|
Add test.
|
2018-05-13 11:18:48 +02:00 |
|
lain
|
29376fcc13
|
Format.
|
2018-05-13 10:56:44 +02:00 |
|