alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,166 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

7166 Commits

Author SHA1 Message Date
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
Ariadne Conill 5fd29edac4 docs: add scrobble API description 2019-09-30 10:39:17 +00:00
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController 2019-09-30 16:52:07 +07:00
rinpatch 1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists 2019-09-30 00:26:49 +03:00
rinpatch 81b4243173 Remove subscription_notifications table if it existed 
Followup to !1741
 2019-09-29 23:52:40 +03:00
rinpatch 90537f3981 Merge branch 'revert/subscription-refactoring' into 'develop' 
Revert subscription refactoring.

See merge request pleroma/pleroma!1741
 2019-09-29 20:07:37 +00:00
rinpatch e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
kaniini 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' 
Mastodon API: add follow_requests_count

See merge request pleroma/pleroma!1726
 2019-09-29 11:44:31 +00:00
Haelwenn f31ad5549b Merge branch 'chores/1691-breaking-change' into 'develop' 
!1691 is a breaking change + documentation fixes

See merge request pleroma/pleroma!1739
 2019-09-29 00:34:14 +00:00
Haelwenn (lanodan) Monnier e46dfd9295
CHANGELOG.md: Sorting, colon after breaking 
[ci skip]
 2019-09-29 02:16:52 +02:00
Haelwenn (lanodan) Monnier 717cb4f933
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).
 2019-09-29 02:14:53 +02:00