Ivan Tashkinov [Wed, 2 Oct 2019 17:42:40 +0000 (20:42 +0300)]
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
kaniini [Mon, 30 Sep 2019 12:53:43 +0000 (12:53 +0000)]
Merge branch 'split-masto-api/mascots' into 'develop'
Extract mascot actions from `MastodonAPIController` to MascotController
See merge request pleroma/pleroma!1745
kaniini [Mon, 30 Sep 2019 12:53:28 +0000 (12:53 +0000)]
Merge branch 'update/admin-fe-
20190930' into 'develop'
update admin fe
See merge request pleroma/pleroma!1747
Ariadne Conill [Mon, 30 Sep 2019 12:52:28 +0000 (12:52 +0000)]
update admin fe
Egor Kislitsyn [Mon, 30 Sep 2019 12:32:43 +0000 (19:32 +0700)]
Extract mascot actions from `MastodonAPIController` to MascotController
kaniini [Mon, 30 Sep 2019 12:21:16 +0000 (12:21 +0000)]
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Egor Kislitsyn [Mon, 30 Sep 2019 12:06:17 +0000 (19:06 +0700)]
Fix warning in TransmogrifierTest
Egor Kislitsyn [Mon, 30 Sep 2019 08:47:01 +0000 (15:47 +0700)]
Move update_credentials to MastodonAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 09:08:29 +0000 (16:08 +0700)]
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 07:43:54 +0000 (14:43 +0700)]
Move account_lists test to MastodonAPI.AccountControllerTest
Egor Kislitsyn [Mon, 30 Sep 2019 07:28:37 +0000 (14:28 +0700)]
Disable async in DomainBlockControllerTest
Egor Kislitsyn [Mon, 30 Sep 2019 07:28:12 +0000 (14:28 +0700)]
Add PleromaAPI.AccountController
Egor Kislitsyn [Mon, 30 Sep 2019 12:10:54 +0000 (19:10 +0700)]
Fix merge
kaniini [Mon, 30 Sep 2019 11:41:39 +0000 (11:41 +0000)]
Merge branch 'fix/report-controller-test' into 'develop'
Fix ReportControllerTest
See merge request pleroma/pleroma!1746
Egor Kislitsyn [Mon, 30 Sep 2019 11:30:10 +0000 (18:30 +0700)]
Fix ReportControllerTest
kaniini [Mon, 30 Sep 2019 11:21:49 +0000 (11:21 +0000)]
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
kaniini [Mon, 30 Sep 2019 11:17:30 +0000 (11:17 +0000)]
Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
kaniini [Mon, 30 Sep 2019 10:49:40 +0000 (10:49 +0000)]
Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
kaniini [Mon, 30 Sep 2019 10:46:34 +0000 (10:46 +0000)]
Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'
Remove subscription_notifications table if it existed
See merge request pleroma/pleroma!1742
kaniini [Mon, 30 Sep 2019 10:45:00 +0000 (10:45 +0000)]
Merge branch 'feature/scrobbling' into 'develop'
media scrobbling ("now playing" API)
See merge request pleroma/pleroma!1732
Egor Kislitsyn [Mon, 30 Sep 2019 10:04:03 +0000 (17:04 +0700)]
Extract report actions from `MastodonAPIController` to `ReportController`
Update MastodonAPI.ReportView
Ariadne Conill [Sun, 29 Sep 2019 02:18:34 +0000 (02:18 +0000)]
change new scrobble endpoint
Ariadne Conill [Sun, 29 Sep 2019 00:35:40 +0000 (00:35 +0000)]
test: fix scrobble controller tests
Ariadne Conill [Sun, 29 Sep 2019 00:25:42 +0000 (00:25 +0000)]
split scrobble functions into their own controller
Ariadne Conill [Sun, 29 Sep 2019 00:18:06 +0000 (00:18 +0000)]
router: change scrobble timeline route from now-playing to scrobbles
Ariadne Conill [Sat, 28 Sep 2019 12:29:00 +0000 (12:29 +0000)]
common api: add some missing IR bits for listen activities' children
Ariadne Conill [Sat, 28 Sep 2019 12:28:39 +0000 (12:28 +0000)]
activitypub: object view: include child object for Listen activities
Ariadne Conill [Sat, 28 Sep 2019 12:12:35 +0000 (12:12 +0000)]
common api: make sure the generated IR is actually federatable
Ariadne Conill [Sat, 28 Sep 2019 11:57:24 +0000 (11:57 +0000)]
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
Ariadne Conill [Sat, 28 Sep 2019 02:13:26 +0000 (02:13 +0000)]
update changelog
Ariadne Conill [Sat, 28 Sep 2019 02:12:12 +0000 (02:12 +0000)]
pleroma api: hook up scrobbler controller
Ariadne Conill [Sat, 28 Sep 2019 00:24:32 +0000 (00:24 +0000)]
common api: implement scrobbling
Ariadne Conill [Fri, 27 Sep 2019 12:40:31 +0000 (12:40 +0000)]
activitypub: transmogrifier: implement support for Listen activities
Ariadne Conill [Fri, 27 Sep 2019 12:22:35 +0000 (12:22 +0000)]
activitypub: implement IR-level considerations for Listen activities
Ariadne Conill [Fri, 27 Sep 2019 11:40:40 +0000 (11:40 +0000)]
mastodon api: implement rendering of listen activities
Ariadne Conill [Fri, 27 Sep 2019 11:15:20 +0000 (11:15 +0000)]
test: factory: implement support for generating mock audio and listen objects
Ariadne Conill [Fri, 27 Sep 2019 11:04:52 +0000 (11:04 +0000)]
docs: add scrobble API description
Egor Kislitsyn [Mon, 30 Sep 2019 09:52:07 +0000 (16:52 +0700)]
Extract conversation actions from `MastodonAPIController` to ConversationController
rinpatch [Sun, 29 Sep 2019 21:26:49 +0000 (00:26 +0300)]
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
rinpatch [Sun, 29 Sep 2019 20:52:40 +0000 (23:52 +0300)]
Remove subscription_notifications table if it existed
Followup to !1741
rinpatch [Sun, 29 Sep 2019 20:07:37 +0000 (20:07 +0000)]
Merge branch 'revert/subscription-refactoring' into 'develop'
Revert subscription refactoring.
See merge request pleroma/pleroma!1741
rinpatch [Sun, 29 Sep 2019 15:43:27 +0000 (18:43 +0300)]
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit
eb9aa7aa1095de150d036839c78c402019efb4b1, reversing
changes made to
c4fbb56984d8f86df948cfd9b0f7c081d688c365.
kaniini [Sun, 29 Sep 2019 11:44:31 +0000 (11:44 +0000)]
Merge branch 'feature/follow-requests-count' into 'develop'
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
Haelwenn [Sun, 29 Sep 2019 00:34:14 +0000 (00:34 +0000)]
Merge branch 'chores/1691-breaking-change' into 'develop'
!1691 is a breaking change + documentation fixes
See merge request pleroma/pleroma!1739
Haelwenn (lanodan) Monnier [Sun, 29 Sep 2019 00:16:52 +0000 (02:16 +0200)]
CHANGELOG.md: Sorting, colon after breaking
[ci skip]
Haelwenn (lanodan) Monnier [Sun, 29 Sep 2019 00:14:53 +0000 (02:14 +0200)]
admin_api.md: Put data-type info as the values
Similar to how the other responses examples are done,
this also makes it proper JSON (as it doesn’t have comments).
Haelwenn (lanodan) Monnier [Sun, 29 Sep 2019 00:13:17 +0000 (02:13 +0200)]
CHANGELOG.md: !1691 is a breaking change
!1691: https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
Haelwenn [Sat, 28 Sep 2019 23:59:15 +0000 (23:59 +0000)]
Merge branch 'chore/update-docs' into 'develop'
Update admin_api.md
See merge request pleroma/pleroma!1738
Maxim Filippov [Sat, 28 Sep 2019 21:01:35 +0000 (00:01 +0300)]
Update admin_api.md
Haelwenn [Sat, 28 Sep 2019 19:02:05 +0000 (19:02 +0000)]
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'
tests for mastodon_api_controller.ex
See merge request pleroma/pleroma!1639
Maksim Pechnikov [Sat, 28 Sep 2019 07:32:03 +0000 (10:32 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex
Haelwenn [Sat, 28 Sep 2019 00:03:24 +0000 (00:03 +0000)]
Merge branch 'bugfix/post-empty-status' into 'develop'
status_controller.ex: Posting media status without content defined
See merge request pleroma/pleroma!1735
Haelwenn (lanodan) Monnier [Fri, 27 Sep 2019 23:21:28 +0000 (01:21 +0200)]
status_controller.ex: Posting media status without content defined
rinpatch [Fri, 27 Sep 2019 23:09:07 +0000 (23:09 +0000)]
Merge branch 'fix/empty-attachment-statuses' into 'develop'
Fix not being able to post empty statuses with attachments
See merge request pleroma/pleroma!1734
rinpatch [Fri, 27 Sep 2019 22:56:20 +0000 (01:56 +0300)]
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
Haelwenn [Fri, 27 Sep 2019 21:59:23 +0000 (21:59 +0000)]
Merge branch 'remote-ip' into 'develop'
Add `remote_ip` plug
See merge request pleroma/pleroma!1608
minibikini [Fri, 27 Sep 2019 21:59:23 +0000 (21:59 +0000)]
Add `remote_ip` plug
kaniini [Fri, 27 Sep 2019 07:54:54 +0000 (07:54 +0000)]
Merge branch 'split-masto-api/follow-requests' into 'develop'
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
kaniini [Fri, 27 Sep 2019 07:54:08 +0000 (07:54 +0000)]
Merge branch 'split-masto-api/domain-blocks' into 'develop'
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
kaniini [Fri, 27 Sep 2019 07:53:22 +0000 (07:53 +0000)]
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
kaniini [Fri, 27 Sep 2019 07:52:27 +0000 (07:52 +0000)]
Merge branch 'split-masto-api/filters' into 'develop'
Extract filter actions from `MastodonAPIController` to `FilterController`
See merge request pleroma/pleroma!1725
Egor Kislitsyn [Fri, 27 Sep 2019 07:28:05 +0000 (14:28 +0700)]
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
Egor Kislitsyn [Fri, 27 Sep 2019 07:25:17 +0000 (14:25 +0700)]
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
Egor Kislitsyn [Fri, 27 Sep 2019 04:46:20 +0000 (11:46 +0700)]
Cleanup ScheduledActivityView
Egor Kislitsyn [Fri, 27 Sep 2019 06:35:45 +0000 (13:35 +0700)]
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
kaniini [Fri, 27 Sep 2019 06:17:40 +0000 (06:17 +0000)]
Merge branch 'fix/subscription-notification-view' into 'develop'
Fix SubscriptionNotificationView
See merge request pleroma/pleroma!1727
Egor Kislitsyn [Fri, 27 Sep 2019 06:06:25 +0000 (13:06 +0700)]
Extract filter actions from `MastodonAPIController` to `FilterController`
Egor Kislitsyn [Fri, 27 Sep 2019 04:55:47 +0000 (11:55 +0700)]
Fix SubscriptionNotificationView
kaniini [Fri, 27 Sep 2019 04:37:48 +0000 (04:37 +0000)]
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
Ariadne Conill [Fri, 27 Sep 2019 04:24:20 +0000 (04:24 +0000)]
changelog
Ariadne Conill [Fri, 27 Sep 2019 04:22:40 +0000 (04:22 +0000)]
mastodon api: implement follow_requests_count
Egor Kislitsyn [Thu, 26 Sep 2019 07:28:35 +0000 (14:28 +0700)]
Move view logic from StatusController.context to StatusView and add a test
Egor Kislitsyn [Thu, 26 Sep 2019 06:38:45 +0000 (13:38 +0700)]
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
kaniini [Fri, 27 Sep 2019 03:51:24 +0000 (03:51 +0000)]
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
Egor Kislitsyn [Mon, 9 Sep 2019 14:49:02 +0000 (21:49 +0700)]
Extract status actions from `MastodonAPIController` into `StatusController`
kaniini [Fri, 27 Sep 2019 03:50:36 +0000 (03:50 +0000)]
Merge branch 'patch-2' into 'develop'
Minor corrections and clarification for Alpine standard v.3.10
See merge request pleroma/pleroma!1594
kaniini [Fri, 27 Sep 2019 03:49:00 +0000 (03:49 +0000)]
Merge branch 'update/docs-jp' into 'develop'
Update Japanese document to follow English document
See merge request pleroma/pleroma!1615
kaniini [Fri, 27 Sep 2019 03:46:53 +0000 (03:46 +0000)]
Merge branch 'list-packs-docs' into 'develop'
Add list_from endpoint to the pleroma_api docs
See merge request pleroma/pleroma!1720
kaniini [Fri, 27 Sep 2019 03:46:34 +0000 (03:46 +0000)]
Merge branch 'patch-1' into 'develop'
Fix code block for admin api document
See merge request pleroma/pleroma!1722
kaniini [Fri, 27 Sep 2019 03:46:02 +0000 (03:46 +0000)]
Merge branch 'refactor/common_api' into 'develop'
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
kaniini [Fri, 27 Sep 2019 03:42:30 +0000 (03:42 +0000)]
Merge branch 'refactor/timeline-controller' into 'develop'
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
rinpatch [Thu, 26 Sep 2019 22:17:20 +0000 (22:17 +0000)]
Merge branch 'chore/changelog-sync' into 'develop'
Sync changelogs between master and develop
See merge request pleroma/pleroma!1724
rinpatch [Thu, 26 Sep 2019 22:16:24 +0000 (01:16 +0300)]
Sync changelogs between master and develop
Maksim Pechnikov [Thu, 26 Sep 2019 18:08:04 +0000 (21:08 +0300)]
add deprecated tag
Maksim Pechnikov [Thu, 26 Sep 2019 17:56:59 +0000 (20:56 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex
feld [Thu, 26 Sep 2019 16:44:53 +0000 (16:44 +0000)]
Merge branch 'feature/moderation-log-filters' into 'develop'
Moderation log filters
See merge request pleroma/pleroma!1607
Maxim Filippov [Thu, 26 Sep 2019 16:20:47 +0000 (19:20 +0300)]
Add docs
kPherox [Thu, 26 Sep 2019 16:10:34 +0000 (16:10 +0000)]
Fix code block for admin api document
Maxim Filippov [Thu, 26 Sep 2019 16:01:54 +0000 (19:01 +0300)]
Merge branch 'develop' into feature/moderation-log-filters
Maksim Pechnikov [Thu, 26 Sep 2019 13:13:07 +0000 (16:13 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex
Roman Chvanikov [Thu, 26 Sep 2019 12:17:36 +0000 (15:17 +0300)]
Update CHANGELOG
Ekaterina Vaartis [Thu, 26 Sep 2019 06:52:11 +0000 (09:52 +0300)]
Add list_from endpoint to the pleroma_api docs
Roman Chvanikov [Thu, 26 Sep 2019 07:38:54 +0000 (10:38 +0300)]
Merge develop
Egor Kislitsyn [Thu, 26 Sep 2019 03:53:42 +0000 (10:53 +0700)]
Extract timeline actions from `MastodonAPIController` into `TimelineController`
Egor Kislitsyn [Tue, 24 Sep 2019 08:56:20 +0000 (15:56 +0700)]
Cleanup CommonAPI
Egor Kislitsyn [Mon, 23 Sep 2019 11:52:41 +0000 (18:52 +0700)]
Add ActivityDraft.with_valid/2
Egor Kislitsyn [Tue, 24 Sep 2019 09:10:54 +0000 (16:10 +0700)]
Add CommonAPI.ActivityDraft
kaniini [Thu, 26 Sep 2019 03:13:22 +0000 (03:13 +0000)]
Merge branch 'refactor/notification-controller' into 'develop'
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
kaniini [Thu, 26 Sep 2019 03:12:03 +0000 (03:12 +0000)]
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
kaniini [Thu, 26 Sep 2019 03:00:38 +0000 (03:00 +0000)]
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
projects / akkoma / log