tcit/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
3308 commits 3 branches 72 tags 292 MiB
Commit graph

1099 commits

Author SHA1 Message Date
lambda
608cc65d43 Merge branch 'feature/improve-microformats' into 'develop' 
improve microformats support

See merge request pleroma/pleroma!672
 2019-01-16 09:06:47 +00:00
lambda
da4b670451 Merge branch '518_instance_stats_fix' into 'develop' 
[#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers

Closes #518

See merge request pleroma/pleroma!673
 2019-01-16 08:59:40 +00:00
Ivan Tashkinov
90433b988e [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses. 2019-01-16 11:07:46 +03:00
William Pitcock
85a5be6220 tests: fixup 2019-01-16 04:09:01 +00:00
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename 2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename 2019-01-15 07:40:39 +01:00
rinpatch
f20bfc9ea5 Merge branch 'media-url-escape' into 'develop' 
URI escape file upload URLs

See merge request pleroma/pleroma!665
 2019-01-14 18:52:23 +00:00
Shadowfacts
dcbe5bd58c
Add attachment escaping test 2019-01-14 13:29:38 -05:00
kaniini
de1da7b3d1 Merge branch 'feature/add-oembed-parser' into 'develop' 
Add OEmbed parser

See merge request pleroma/pleroma!661
 2019-01-14 07:28:04 +00:00
kaniini
fa0392e49c Merge branch 'activitypub-likes' into 'develop' 
Activitypub c2s likes

See merge request pleroma/pleroma!658
 2019-01-14 07:27:05 +00:00
Sadposter
98d9ae0718 Add test for mastodon API /favourites endpoint 2019-01-13 15:17:47 +00:00
Maxim Filippov
b8a77c5d70 Add OEmbed parser 2019-01-13 02:06:50 +02:00
sxsdv1
868034375c Add likes to activitypub object representation 
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
 2019-01-12 20:24:41 +01:00
sxsdv1
581edd5a91 Add route to get object like activities 2019-01-12 20:24:38 +01:00
sxsdv1
36711e1c83 Handle client submitted activitypub like activity 2019-01-12 20:24:35 +01:00
sxsdv1
1eb7318831 Prepare all types objects before serialising 
Activities returned from inbox can include other types of objects like
Article
 2019-01-12 20:24:32 +01:00
Egor Kislitsyn
728587fdaa typo 2019-01-11 12:47:44 +07:00
Egor Kislitsyn
b594a54d0c unpin when deleting a status 2019-01-11 12:31:31 +07:00
kaniini
e4afe1359b Merge branch 'activitypub-dereference-activity-id' into 'develop' 
Support activity+json request for activity

See merge request pleroma/pleroma!641
 2019-01-10 18:42:36 +00:00
Maxim Filippov
1f851a0723 Add Twitter Card parser 2019-01-10 18:09:56 +00:00
kaniini
11d08c6226 Merge branch 'twapi-follower-pagination' into 'develop' 
Twapi follower pagination

See merge request pleroma/pleroma!648
 2019-01-10 18:03:32 +00:00
Haelwenn
ab4c5f5bf7 Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop' 
common api: fix newlines in markdown code blocks

See merge request pleroma/pleroma!651
 2019-01-10 03:54:29 +00:00
William Pitcock
490c80bc96 test: common api: add tests for format_input/4 2019-01-10 03:46:34 +00:00
kaniini
7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop' 
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
 2019-01-10 02:39:53 +00:00
kaniini
f85d108c41 Merge branch 'mass-follow' into 'develop' 
Mass follow

See merge request pleroma/pleroma!642
 2019-01-10 02:33:11 +00:00
kaniini
d203b0b4d3 Merge branch 'dm-optimizations' into 'develop' 
Add activity visibility index.

See merge request pleroma/pleroma!646
 2019-01-10 02:31:29 +00:00
lain
a99e156f2c Add integer casts. 2019-01-09 18:17:23 +01:00
lain
7ac152ed38 TwitterAPI: Add follower/following pagination. 2019-01-09 18:14:32 +01:00
lambda
1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' 
Scarlett/pleroma summary html api

See merge request pleroma/pleroma!647
 2019-01-09 16:26:38 +00:00
lain
8df348a3da Add test for summary_html 2019-01-09 17:18:37 +01:00
lain
5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
Egor Kislitsyn
6cbe63726d improve tests 2019-01-09 19:54:37 +07:00
Egor Kislitsyn
44a1e69484 Add Twitter API for the pinned statuses 
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true

# Pin
POST /api/statuses/pin/:id

# Unpin
POST /api/statuses/unpin/:id
```
 2019-01-09 19:54:19 +07:00
Egor Kislitsyn
1b06e6fdf3 only non-reblogs, self-authored, public statuses can be pinned 2019-01-09 17:40:15 +07:00
lain
26938d65fd Add User mass following function. 2019-01-09 11:35:23 +01:00
Egor Kislitsyn
48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 
# Conflicts:
#	docs/config.md
 2019-01-09 16:56:31 +07:00
sxsdv1
20c0dd1e24 Support activity+json request for activity 2019-01-09 09:33:30 +01:00
kaniini
5c5c8508c2 Merge branch 'hotfix/media-proxy-uri' into 'develop' 
user: fix local vs remote determination in remote_or_auth_active?/1

See merge request pleroma/pleroma!640
 2019-01-09 07:09:39 +00:00
William Pitcock
567651fb3f test: user: add tests for visible_for?/2 2019-01-09 07:03:32 +00:00
William Pitcock
f2a4f89abe tests: user: add tests for superuser?/1 2019-01-09 06:50:31 +00:00
William Pitcock
74f48beec3 user: remove entirely redundant remote_or_auth_active?/1. 
auth_active?/1 can check remote users and return true directly.
 2019-01-09 06:36:50 +00:00
William Pitcock
4124c9aa4a tests: user: add regression test for remote_or_auth_active?/1 2019-01-09 06:02:18 +00:00
Egor Kislitsyn
0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-08 16:32:07 +07:00
Egor Kislitsyn
7b6c5f0a9d improve test readability 2019-01-08 16:01:35 +07:00
lain
0fae04c4e3 Add a setting for users to autofollow on sign up. 2019-01-08 09:57:53 +01:00
Egor Kislitsyn
db6f4496eb fix test 2019-01-08 15:32:06 +07:00
Egor Kislitsyn
e679da4c34 add pinned property to StatusView 2019-01-08 15:27:02 +07:00
Egor Kislitsyn
63dbd87568 rename post to status 2019-01-08 15:25:50 +07:00
lain
a16b17cc61 Actually put some onformation in the error user, make it actually properly parse 
in conversations.
 2019-01-07 20:59:30 +01:00
kaniini
74e1093732 Merge branch 'resilient-user-view' into 'develop' 
Make TwAPI UserView more resilient to issues.

See merge request pleroma/pleroma!634
 2019-01-07 17:09:52 +00:00