Commit graph

2318 commits

Author SHA1 Message Date
kaniini
ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
added tests /activity_pub/transmogrifier.ex

See merge request 
2019-09-23 22:34:52 +00:00
Steven Fuchs
e1d2d69c87 Clean up views 2019-09-23 22:33:59 +00:00
Maksim Pechnikov
38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-23 21:32:50 +03:00
rinpatch
fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs

Closes  and 

See merge request 
2019-09-23 18:20:08 +00:00
rinpatch
6b3d5ed6db Emoji API Controller: Follow phoenix directory structure 2019-09-23 21:14:51 +03:00
lain
b80c41a14f Merge branch 'outbox_pagination' into 'develop'
Fix AP outbox pagination

See merge request 
2019-09-19 16:53:59 +00:00
D Anzorge
9aca2cc95d Add test for correct AP outbox pagination 2019-09-19 16:49:27 +02:00
eugenijm
fe5e0b7846 Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses) 2019-09-19 08:59:25 +03:00
Maksim Pechnikov
d4ed3a35b8 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-19 07:35:34 +03:00
Haelwenn
f95a2b2cda Merge branch 'issue/733' into 'develop'
[] added test for Ostatus

See merge request 
2019-09-18 22:28:10 +00:00
rinpatch
b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019

See merge request 
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18 23:21:11 +02:00
Ekaterina Vaartis
b585134c90 Get the nodeinfo address from the well-known 2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
a1325d5fd9 Change path from nodeinfo to metadata->features 2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
36f2275dc9 A feature for shareable emoji packs, use it in download_from & tests 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6cd651a38b Make the emoji controller api more RESTy 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7c784128fd Change emoji api responses to JSON 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f5131540dc Add a way to create emoji packs via an endpoint 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8dbdd5c280 Allow uploading new emojis to packs from URLs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9afe7258dd Implememt emoji pack file updating + write tests 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9dc9689144 Add tests for pack metadata updating 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
adf31d596e Add tests for downloading from fallback url 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2a94eca096 Change YAML to JSON 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2d4b8f3d20 Add an endpoint for deleting emoji packs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7e4c8b56ea Add tests for emoji pack sharing 2019-09-19 00:16:33 +03:00
ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile

See merge request 
2019-09-18 21:13:15 +00:00
25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api

See merge request 
2019-09-18 21:11:37 +00:00
220afadc55 Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`

See merge request 
2019-09-18 21:05:18 +00:00
Haelwenn
56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished

See merge request 
2019-09-18 21:00:09 +00:00
rinpatch
a12aeb09c4 Cleanup uploads after the tests are finished 2019-09-18 23:34:13 +03:00
rinpatch
eb87a86b5b Preserve internal fields when reinjecting 2019-09-18 19:53:51 +03:00
rinpatch
84a40f6f26 Capture log in object refetch tests 2019-09-18 18:31:24 +03:00
rinpatch
7ef575d11e Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
Alex S
4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
Maksim Pechnikov
0447c42715 Merge branch 'develop' into issue/733 2019-09-17 22:20:39 +03:00
rinpatch
ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports

See merge request 
2019-09-17 19:09:56 +00:00
Maksim Pechnikov
7dd51652f9 Merge branch 'develop' into issue/733 2019-09-17 21:20:08 +03:00
rinpatch
95a4a19417 Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex

See merge request 
2019-09-17 14:47:26 +00:00
Steven Fuchs
80c5c3495b remove remaining errors from tests 2019-09-17 14:44:52 +00:00
eugenijm
450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count) 2019-09-17 14:45:47 +03:00
Maxim Filippov
219dca1b00 Merge branch 'develop' into feature/return-total-for-reports 2019-09-16 14:40:17 +03:00
Egor Kislitsyn
96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
rinpatch
e8120944d8 Fix signed fetch inclusion publisher test
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
2019-09-16 13:23:06 +03:00
kaniini
c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request 
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
kaniini
17142a3720 Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation

See merge request 
2019-09-16 07:39:58 +00:00
Egor Kislitsyn
ca88e37a8f Fix a race condition in tests 2019-09-16 12:55:05 +07:00
Egor Kislitsyn
43f17c2e67 Restore tests for change_password and delete_account 2019-09-16 12:34:47 +07:00