Egor Kislitsyn
3572cf29b7
Extract timeline actions from MastodonAPIController
into TimelineController
2019-09-26 10:53:42 +07:00
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
kaniini
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
2019-09-26 00:03:47 +00:00
rinpatch
16487716af
Merge branch 'support/test' into 'develop'
...
clears `robot.txt` after tests
See merge request pleroma/pleroma!1715
2019-09-25 18:51:45 +00:00
Maksim
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
2019-09-25 17:47:22 +00:00
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
Maksim Pechnikov
1b2e4a0ae0
clears robot.txt
after tests
2019-09-25 13:27:31 +03:00
Egor Kislitsyn
b5dfe83433
Replace Pleroma.FlakeId
with flake_id
hex package
2019-09-25 17:14:31 +07:00
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
Egor Kislitsyn
a66a7a328f
Extract notification actions from MastodonAPIController
into NotificationController
2019-09-24 15:16:44 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
kaniini
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
Steven Fuchs
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
Maksim Pechnikov
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03: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 #833 and #1096
See merge request pleroma/pleroma!1551
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
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public
)
2019-09-20 18:27:00 +03:00
lain
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
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
Egor Kislitsyn
95c948110c
Add rel="ugc"
to hashtags and mentions
2019-09-19 14:56:10 +07:00
Egor Kislitsyn
cf3041220a
Add support for rel="ugc"
2019-09-19 14:56:10 +07: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'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
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 pleroma/pleroma!1698
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
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
feld
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
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 pleroma/pleroma!1695
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 pleroma/pleroma!1628
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 pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
Steven Fuchs
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
2019-09-17 16:52:23 +03:00
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
2019-09-17 16:48:24 +03:00
Roman Chvanikov
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-17 13:43:15 +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
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
2019-09-16 21:59:49 +03:00
Roman Chvanikov
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +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 !1653
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 pleroma/pleroma!1661
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
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
rinpatch
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
Roman Chvanikov
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
Egor Kislitsyn
b870ae08fd
Fix Activity.all_by_actor_and_id/2
test
2019-09-14 19:31:20 +07:00
rinpatch
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:50:08 +00:00