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 |
|
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 |
|
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 |
|
Haelwenn (lanodan) Monnier
|
51a4a211a3
|
CHANGELOG.md: !1691 is a breaking change
!1691: https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
|
2019-09-29 02:13:17 +02:00 |
|
Haelwenn
|
239cf46eb4
|
Merge branch 'chore/update-docs' into 'develop'
Update admin_api.md
See merge request pleroma/pleroma!1738
|
2019-09-28 23:59:15 +00:00 |
|
Maxim Filippov
|
0e59d1dc04
|
Update admin_api.md
|
2019-09-29 00:01:35 +03:00 |
|
Haelwenn
|
b35a0f0ce4
|
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'
tests for mastodon_api_controller.ex
See merge request pleroma/pleroma!1639
|
2019-09-28 19:02:05 +00:00 |
|
Maksim Pechnikov
|
1053319cd6
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-28 10:36:04 +03:00 |
|
Haelwenn
|
50ab064353
|
Merge branch 'bugfix/post-empty-status' into 'develop'
status_controller.ex: Posting media status without content defined
See merge request pleroma/pleroma!1735
|
2019-09-28 00:03:24 +00:00 |
|
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
2019-09-28 01:53:41 +02:00 |
|
rinpatch
|
a0f42ecbca
|
Merge branch 'fix/empty-attachment-statuses' into 'develop'
Fix not being able to post empty statuses with attachments
See merge request pleroma/pleroma!1734
|
2019-09-27 23:09:07 +00:00 |
|
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
2019-09-28 01:58:06 +03:00 |
|
Haelwenn
|
705ea1b975
|
Merge branch 'remote-ip' into 'develop'
Add `remote_ip` plug
See merge request pleroma/pleroma!1608
|
2019-09-27 21:59:23 +00:00 |
|
minibikini
|
f9380289eb
|
Add remote_ip plug
|
2019-09-27 21:59:23 +00:00 |
|
kaniini
|
92d08d4113
|
Merge branch 'split-masto-api/follow-requests' into 'develop'
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
|
2019-09-27 07:54:54 +00:00 |
|
kaniini
|
68bf99baf2
|
Merge branch 'split-masto-api/domain-blocks' into 'develop'
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
|
2019-09-27 07:54:08 +00:00 |
|
kaniini
|
27a3221d57
|
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
|
2019-09-27 07:53:22 +00:00 |
|
kaniini
|
c903d46a12
|
Merge branch 'split-masto-api/filters' into 'develop'
Extract filter actions from `MastodonAPIController` to `FilterController`
See merge request pleroma/pleroma!1725
|
2019-09-27 07:52:27 +00:00 |
|
Egor Kislitsyn
|
408750b94e
|
Extract domain blocks actions from MastodonAPIController to DomainBlockController
|
2019-09-27 14:28:05 +07:00 |
|
Egor Kislitsyn
|
99c5a35890
|
Extract follow requests actions from MastodonAPIController to FollowRequestController
|
2019-09-27 14:25:17 +07:00 |
|
Egor Kislitsyn
|
8d31530119
|
Cleanup ScheduledActivityView
|
2019-09-27 13:36:28 +07:00 |
|
Egor Kislitsyn
|
0a5b106ddd
|
Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController
|
2019-09-27 13:36:28 +07:00 |
|
kaniini
|
a83c116df7
|
Merge branch 'fix/subscription-notification-view' into 'develop'
Fix SubscriptionNotificationView
See merge request pleroma/pleroma!1727
|
2019-09-27 06:17:40 +00:00 |
|
Egor Kislitsyn
|
621377f378
|
Extract filter actions from MastodonAPIController to FilterController
|
2019-09-27 13:06:25 +07:00 |
|
Egor Kislitsyn
|
6c7c35dbe1
|
Fix SubscriptionNotificationView
|
2019-09-27 11:55:47 +07:00 |
|
kaniini
|
91e2bcf218
|
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
|
2019-09-27 04:37:48 +00:00 |
|
Ariadne Conill
|
843c11d1f6
|
changelog
|
2019-09-27 04:24:20 +00:00 |
|