Commit graph

7119 commits

Author SHA1 Message Date
kaniini 51b5c53988 Merge branch 'split-masto-api/apps' into 'develop'
Extract apps actions from `MastodonAPIController` to `AppController`

See merge request pleroma/pleroma!1758
2019-10-01 08:32:59 +00:00
Egor Kislitsyn 2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
kaniini 82d7985ae9 Merge branch 'split-masto-api/suggestions' into 'develop'
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`

See merge request pleroma/pleroma!1757
2019-10-01 08:15:56 +00:00
Egor Kislitsyn 39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
kaniini b4369e7e68 Merge branch 'split-masto-api/media' into 'develop'
Extract media actions from `MastodonAPIController` to `MediaController`

See merge request pleroma/pleroma!1756
2019-10-01 07:57:46 +00:00
Egor Kislitsyn 585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00
kaniini f0b4ba1bf9 Merge branch 'split-masto-api/polls' into 'develop'
Extract poll actions from `MastodonAPIController` to `PollController`

See merge request pleroma/pleroma!1755
2019-10-01 07:11:54 +00:00
Egor Kislitsyn 36a34c36fe
Extract poll actions from MastodonAPIController to PollController 2019-10-01 11:44:34 +07:00
kPherox f364438032
Add rel="ugc" 2019-10-01 02:24:06 +09:00
kPherox a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials 2019-10-01 01:40:33 +09:00
kaniini 703deb66d9 Merge branch 'compact-undos' into 'develop'
Transmogrifier: Handle compact objects in undos.

See merge request pleroma/pleroma!1752
2019-09-30 16:25:45 +00:00
lain dae744478e Transmogrifier: Handle compact objects in undos. 2019-09-30 18:13:05 +02:00
kaniini 7c9b023a91 Merge branch 'ci/build-otp-maint' into 'develop'
CI: Enable OTP release building for maint/* branches

See merge request pleroma/pleroma!1749
2019-09-30 15:37:03 +00:00
rinpatch 7131580058 CI: Enable OTP release building for maint/* branches 2019-09-30 18:23:29 +03:00
Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
#	CHANGELOG.md
2019-09-30 17:41:20 +03:00
kaniini a22a7437d8 Merge branch 'split-masto-api/mascots' into 'develop'
Extract mascot actions from `MastodonAPIController` to MascotController

See merge request pleroma/pleroma!1745
2019-09-30 12:53:43 +00:00
kaniini dfab2232f8 Merge branch 'update/admin-fe-20190930' into 'develop'
update admin fe

See merge request pleroma/pleroma!1747
2019-09-30 12:53:28 +00:00
Ariadne Conill 28be12b38e update admin fe 2019-09-30 12:52:28 +00:00
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07:00
kaniini 905bb11747 Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`

See merge request pleroma/pleroma!1731
2019-09-30 12:21:16 +00:00
Egor Kislitsyn c55facf78b
Fix warning in TransmogrifierTest 2019-09-30 19:10:56 +07:00
Egor Kislitsyn 987e0b8be8
Move update_credentials to MastodonAPI.AccountController 2019-09-30 19:10:56 +07:00
Egor Kislitsyn c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn 122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn 38db4878a4
Disable async in DomainBlockControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
kaniini 3f0e276ac9 Merge branch 'fix/report-controller-test' into 'develop'
Fix ReportControllerTest

See merge request pleroma/pleroma!1746
2019-09-30 11:41:39 +00:00
Egor Kislitsyn 1207e88195
Fix ReportControllerTest 2019-09-30 18:30:10 +07:00
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`

See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
kaniini 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
kaniini f889e8e309 Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop'
Remove subscription_notifications table if it existed

See merge request pleroma/pleroma!1742
2019-09-30 10:46:34 +00:00
kaniini ed176e7402 Merge branch 'feature/scrobbling' into 'develop'
media scrobbling ("now playing" API)

See merge request pleroma/pleroma!1732
2019-09-30 10:45:00 +00:00
Egor Kislitsyn b7f27a4f58
Extract report actions from MastodonAPIController to ReportController
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill 211008ae2f test: fix scrobble controller tests 2019-09-30 10:39:48 +00:00
Ariadne Conill e653edd182 split scrobble functions into their own controller 2019-09-30 10:39:48 +00:00
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles 2019-09-30 10:39:48 +00:00
Ariadne Conill 8b34b221cb common api: add some missing IR bits for listen activities' children 2019-09-30 10:39:48 +00:00
Ariadne Conill 84712c35f9 activitypub: object view: include child object for Listen activities 2019-09-30 10:39:48 +00:00
Ariadne Conill 71eff09e56 common api: make sure the generated IR is actually federatable 2019-09-30 10:39:48 +00:00
Ariadne Conill e7309d3b60 test: transmogrifier: add test proving that transmogrifier can handle outgoing listens 2019-09-30 10:39:48 +00:00
Ariadne Conill 53506da414 update changelog 2019-09-30 10:39:48 +00:00
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller 2019-09-30 10:39:17 +00:00
Ariadne Conill 2c82d8603b common api: implement scrobbling 2019-09-30 10:39:17 +00:00
Ariadne Conill 172c74a77b activitypub: transmogrifier: implement support for Listen activities 2019-09-30 10:39:17 +00:00
Ariadne Conill 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities 2019-09-30 10:39:17 +00:00
Ariadne Conill b7877e9b1c mastodon api: implement rendering of listen activities 2019-09-30 10:39:17 +00:00
Ariadne Conill c3d09921e4 test: factory: implement support for generating mock audio and listen objects 2019-09-30 10:39:17 +00:00