Ariadne Conill
|
c3d09921e4
|
test: factory: implement support for generating mock audio and listen objects
|
5 years ago |
Ariadne Conill
|
5fd29edac4
|
docs: add scrobble API description
|
5 years ago |
Egor Kislitsyn
|
d4d88b3361
|
Extract conversation actions from `MastodonAPIController` to ConversationController
|
5 years ago |
rinpatch
|
1fba66178d
|
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
|
5 years ago |
rinpatch
|
81b4243173
|
Remove subscription_notifications table if it existed
Followup to !1741
|
5 years ago |
rinpatch
|
90537f3981
|
Merge branch 'revert/subscription-refactoring' into 'develop'
Revert subscription refactoring.
See merge request pleroma/pleroma!1741
|
5 years ago |
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10 , reversing
changes made to c4fbb56984 .
|
5 years ago |
kaniini
|
6d74a7528c
|
Merge branch 'feature/follow-requests-count' into 'develop'
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
|
5 years ago |
Haelwenn
|
f31ad5549b
|
Merge branch 'chores/1691-breaking-change' into 'develop'
!1691 is a breaking change + documentation fixes
See merge request pleroma/pleroma!1739
|
5 years ago |
Haelwenn (lanodan) Monnier
|
e46dfd9295
|
CHANGELOG.md: Sorting, colon after breaking
[ci skip]
|
5 years ago |
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).
|
5 years ago |
Haelwenn (lanodan) Monnier
|
51a4a211a3
|
CHANGELOG.md: !1691 is a breaking change
!1691: https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
|
5 years ago |
Haelwenn
|
239cf46eb4
|
Merge branch 'chore/update-docs' into 'develop'
Update admin_api.md
See merge request pleroma/pleroma!1738
|
5 years ago |
Maxim Filippov
|
0e59d1dc04
|
Update admin_api.md
|
5 years ago |
Haelwenn
|
b35a0f0ce4
|
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'
tests for mastodon_api_controller.ex
See merge request pleroma/pleroma!1639
|
5 years ago |
Maksim Pechnikov
|
1053319cd6
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
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
|
5 years ago |
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
5 years ago |
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
|
5 years ago |
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
5 years ago |
Haelwenn
|
705ea1b975
|
Merge branch 'remote-ip' into 'develop'
Add `remote_ip` plug
See merge request pleroma/pleroma!1608
|
5 years ago |
minibikini
|
f9380289eb
|
Add `remote_ip` plug
|
5 years ago |
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
|
5 years ago |
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
|
5 years ago |
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
|
5 years ago |
kaniini
|
c903d46a12
|
Merge branch 'split-masto-api/filters' into 'develop'
Extract filter actions from `MastodonAPIController` to `FilterController`
See merge request pleroma/pleroma!1725
|
5 years ago |
Egor Kislitsyn
|
408750b94e
|
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
|
5 years ago |
Egor Kislitsyn
|
99c5a35890
|
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
|
5 years ago |
Egor Kislitsyn
|
8d31530119
|
Cleanup ScheduledActivityView
|
5 years ago |
Egor Kislitsyn
|
0a5b106ddd
|
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
|
5 years ago |
kaniini
|
a83c116df7
|
Merge branch 'fix/subscription-notification-view' into 'develop'
Fix SubscriptionNotificationView
See merge request pleroma/pleroma!1727
|
5 years ago |
Egor Kislitsyn
|
621377f378
|
Extract filter actions from `MastodonAPIController` to `FilterController`
|
5 years ago |
Egor Kislitsyn
|
6c7c35dbe1
|
Fix SubscriptionNotificationView
|
5 years ago |
kaniini
|
91e2bcf218
|
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
|
5 years ago |
Ariadne Conill
|
843c11d1f6
|
changelog
|
5 years ago |
Ariadne Conill
|
14294243a2
|
mastodon api: implement follow_requests_count
|
5 years ago |
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
5 years ago |
Egor Kislitsyn
|
76b7e5cd5b
|
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
|
5 years ago |
kaniini
|
eb9aa7aa10
|
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
|
5 years ago |
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from `MastodonAPIController` into `StatusController`
|
5 years ago |
kaniini
|
c4fbb56984
|
Merge branch 'patch-2' into 'develop'
Minor corrections and clarification for Alpine standard v.3.10
See merge request pleroma/pleroma!1594
|
5 years ago |
kaniini
|
0e280354d9
|
Merge branch 'update/docs-jp' into 'develop'
Update Japanese document to follow English document
See merge request pleroma/pleroma!1615
|
5 years ago |
kaniini
|
01a7e20c32
|
Merge branch 'list-packs-docs' into 'develop'
Add list_from endpoint to the pleroma_api docs
See merge request pleroma/pleroma!1720
|
5 years ago |
kaniini
|
8df3a63ce9
|
Merge branch 'patch-1' into 'develop'
Fix code block for admin api document
See merge request pleroma/pleroma!1722
|
5 years ago |
kaniini
|
219771288c
|
Merge branch 'refactor/common_api' into 'develop'
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
|
5 years ago |
kaniini
|
dc0fdb5e84
|
Merge branch 'refactor/timeline-controller' into 'develop'
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
|
5 years ago |
rinpatch
|
67a659a096
|
Merge branch 'chore/changelog-sync' into 'develop'
Sync changelogs between master and develop
See merge request pleroma/pleroma!1724
|
5 years ago |
rinpatch
|
3ec81b816f
|
Sync changelogs between master and develop
|
5 years ago |
Maksim Pechnikov
|
73ae38ca04
|
add deprecated tag
|
5 years ago |
Maksim Pechnikov
|
b4fc96f640
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |