Commits · 172c74a77baf5b8910987e19c620158d0497d16a · Pleroma / pleroma

30 Sep, 2019 5 commits
- activitypub: transmogrifier: implement support for Listen activities · 172c74a7
  kaniini authored Sep 27, 2019
  
  172c74a7
- activitypub: implement IR-level considerations for Listen activities · 1f9de2a8
  kaniini authored Sep 27, 2019
  
  1f9de2a8
- mastodon api: implement rendering of listen activities · b7877e9b
  kaniini authored Sep 27, 2019
  
  b7877e9b
- test: factory: implement support for generating mock audio and listen objects · c3d09921
  kaniini authored Sep 27, 2019
  
  c3d09921
- docs: add scrobble API description · 5fd29eda
  kaniini authored Sep 27, 2019
  
  5fd29eda
29 Sep, 2019 7 commits
- Merge branch 'revert/subscription-refactoring' into 'develop' · 90537f39
  rinpatch authored Sep 29, 2019
```
Revert subscription refactoring.

See merge request !1741
```
  90537f39
- Revert subscription refactoring. · e9d1aa75
  rinpatch authored Sep 29, 2019
```
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa, reversing
changes made to c4fbb569.
```
  e9d1aa75
- Merge branch 'feature/follow-requests-count' into 'develop' · 6d74a752
  kaniini authored Sep 29, 2019
```
Mastodon API: add follow_requests_count

See merge request !1726
```
  6d74a752
- Merge branch 'chores/1691-breaking-change' into 'develop' · f31ad554
  Haelwenn authored Sep 29, 2019
```
!1691 is a breaking change + documentation fixes

See merge request !1739
```
  f31ad554
- CHANGELOG.md: Sorting, colon after breaking · e46dfd92
  Haelwenn authored Sep 29, 2019
```
[ci skip]
```
  e46dfd92
- admin_api.md: Put data-type info as the values · 717cb4f9
  Haelwenn authored Sep 29, 2019
```
Similar to how the other responses examples are done,
this also makes it proper JSON (as it doesn’t have comments).
```
  717cb4f9
- CHANGELOG.md: !1691 is a breaking change · 51a4a211
  Haelwenn authored Sep 29, 2019
```
!1691: !1691
```
  51a4a211
28 Sep, 2019 5 commits
- Merge branch 'chore/update-docs' into 'develop' · 239cf46e
  Haelwenn authored Sep 28, 2019
```
Update admin_api.md

See merge request !1738
```
  239cf46e
- Update admin_api.md · 0e59d1dc
  Maxim Filippov authored Sep 29, 2019
  
  0e59d1dc
- Merge branch 'tests/mastodon_api_controller.ex' into 'develop' · b35a0f0c
  Haelwenn authored Sep 28, 2019
```
tests for mastodon_api_controller.ex

See merge request !1639
```
  b35a0f0c
- Merge branch 'develop' into tests/mastodon_api_controller.ex · 1053319c
  Maksim authored Sep 28, 2019
  
  1053319c
- Merge branch 'bugfix/post-empty-status' into 'develop' · 50ab0643
  Haelwenn authored Sep 28, 2019
```
status_controller.ex: Posting media status without content defined

See merge request !1735
```
  50ab0643
27 Sep, 2019 23 commits
- status_controller.ex: Posting media status without content defined · 9202904d
  Haelwenn authored Sep 28, 2019
  
  9202904d
- Merge branch 'fix/empty-attachment-statuses' into 'develop' · a0f42ecb
  rinpatch authored Sep 27, 2019
```
Fix not being able to post empty statuses with attachments

See merge request !1734
```
  a0f42ecb
- Fix not being able to post empty statuses with attachments · 374f83d2
  rinpatch authored Sep 28, 2019
```
Attachment field was filled in after the empty status check
```
  374f83d2
- Merge branch 'remote-ip' into 'develop' · 705ea1b9
  Haelwenn authored Sep 27, 2019
```
Add `remote_ip` plug

See merge request !1608
```
  705ea1b9
- Add `remote_ip` plug · f9380289
  minibikini authored Sep 27, 2019 and Haelwenn committed Sep 27, 2019
  
  f9380289
- Merge branch 'split-masto-api/follow-requests' into 'develop' · 92d08d41
  kaniini authored Sep 27, 2019
```
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request !1730
```
  92d08d41
- Merge branch 'split-masto-api/domain-blocks' into 'develop' · 68bf99ba
  kaniini authored Sep 27, 2019
```
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request !1729
```
  68bf99ba
- Merge branch 'split-masto-api/scheduled-statuses' into 'develop' · 27a3221d
  kaniini authored Sep 27, 2019
```
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

See merge request !1728
```
  27a3221d
- Merge branch 'split-masto-api/filters' into 'develop' · c903d46a
  kaniini authored Sep 27, 2019
```
Extract filter actions from `MastodonAPIController` to `FilterController`

See merge request !1725
```
  c903d46a
- Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` · 408750b9
  minibikini authored Sep 27, 2019
  
  408750b9
- Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` · 99c5a358
  minibikini authored Sep 27, 2019
  
  99c5a358
- Cleanup ScheduledActivityView · 8d315301
  minibikini authored Sep 27, 2019
  
  8d315301
- Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` · 0a5b106d
  minibikini authored Sep 27, 2019
  
  0a5b106d
- Merge branch 'fix/subscription-notification-view' into 'develop' · a83c116d
  kaniini authored Sep 27, 2019
```
Fix SubscriptionNotificationView

See merge request !1727
```
  a83c116d
- Extract filter actions from `MastodonAPIController` to `FilterController` · 621377f3
  minibikini authored Sep 27, 2019
  
  621377f3
- Fix SubscriptionNotificationView · 6c7c35db
  minibikini authored Sep 27, 2019
  
  6c7c35db
- Merge branch 'refactor/status-controller' into 'develop' · 91e2bcf2
  kaniini authored Sep 27, 2019
```
Extract status actions from `MastodonAPIController` to `StatusController`

See merge request !1719
```
  91e2bcf2
- changelog · 843c11d1
  kaniini authored Sep 27, 2019
  
  843c11d1
- mastodon api: implement follow_requests_count · 14294243
  kaniini authored Sep 27, 2019
  
  14294243
- Move view logic from StatusController.context to StatusView and add a test · 5ea5c58a
  minibikini authored Sep 26, 2019
  
  5ea5c58a
- Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest · 76b7e5cd
  minibikini authored Sep 26, 2019
  
  76b7e5cd
- Merge branch 'refactor/subscription' into 'develop' · eb9aa7aa
  kaniini authored Sep 27, 2019
```
Refactor subscription functionality

Closes #1130

See merge request !1664
```
  eb9aa7aa
- Extract status actions from `MastodonAPIController` into `StatusController` · 98d1347a
  minibikini authored Sep 09, 2019
  
  98d1347a