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 |
|
Ariadne Conill
|
14294243a2
|
mastodon api: implement follow_requests_count
|
2019-09-27 04:22:40 +00:00 |
|
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
2019-09-27 10:52:47 +07:00 |
|
Egor Kislitsyn
|
76b7e5cd5b
|
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
|
2019-09-27 10:52:47 +07:00 |
|
kaniini
|
eb9aa7aa10
|
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
|
2019-09-27 03:51:24 +00:00 |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from MastodonAPIController into StatusController
|
2019-09-27 10:51:15 +07:00 |
|
kaniini
|
c4fbb56984
|
Merge branch 'patch-2' into 'develop'
Minor corrections and clarification for Alpine standard v.3.10
See merge request pleroma/pleroma!1594
|
2019-09-27 03:50:36 +00:00 |
|
kaniini
|
0e280354d9
|
Merge branch 'update/docs-jp' into 'develop'
Update Japanese document to follow English document
See merge request pleroma/pleroma!1615
|
2019-09-27 03:49:00 +00:00 |
|
kaniini
|
01a7e20c32
|
Merge branch 'list-packs-docs' into 'develop'
Add list_from endpoint to the pleroma_api docs
See merge request pleroma/pleroma!1720
|
2019-09-27 03:46:53 +00:00 |
|
kaniini
|
8df3a63ce9
|
Merge branch 'patch-1' into 'develop'
Fix code block for admin api document
See merge request pleroma/pleroma!1722
|
2019-09-27 03:46:34 +00:00 |
|
kaniini
|
219771288c
|
Merge branch 'refactor/common_api' into 'develop'
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
|
2019-09-27 03:46:02 +00:00 |
|
kaniini
|
dc0fdb5e84
|
Merge branch 'refactor/timeline-controller' into 'develop'
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
|
2019-09-27 03:42:30 +00:00 |
|
rinpatch
|
67a659a096
|
Merge branch 'chore/changelog-sync' into 'develop'
Sync changelogs between master and develop
See merge request pleroma/pleroma!1724
|
2019-09-26 22:17:20 +00:00 |
|
rinpatch
|
3ec81b816f
|
Sync changelogs between master and develop
|
2019-09-27 01:16:24 +03:00 |
|
Maksim Pechnikov
|
73ae38ca04
|
add deprecated tag
|
2019-09-26 21:08:04 +03:00 |
|
Maksim Pechnikov
|
b4fc96f640
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-26 20:56:59 +03:00 |
|
feld
|
cb282f2ccd
|
Merge branch 'feature/moderation-log-filters' into 'develop'
Moderation log filters
See merge request pleroma/pleroma!1607
|
2019-09-26 16:44:53 +00:00 |
|
Maxim Filippov
|
39a4892929
|
Add docs
|
2019-09-26 19:20:47 +03:00 |
|
kPherox
|
f249b2381f
|
Fix code block for admin api document
|
2019-09-26 16:10:34 +00:00 |
|
Maxim Filippov
|
e7836adf21
|
Merge branch 'develop' into feature/moderation-log-filters
|
2019-09-26 19:01:54 +03:00 |
|
Maksim Pechnikov
|
3d722dc200
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-26 16:16:30 +03:00 |
|
Roman Chvanikov
|
b736312123
|
Update CHANGELOG
|
2019-09-26 15:17:36 +03:00 |
|
Egor Kislitsyn
|
75290cbfbd
|
Add Pleroma.JobQueueMonitor
|
2019-09-26 18:49:57 +07:00 |
|
Ekaterina Vaartis
|
fc16bec317
|
Add list_from endpoint to the pleroma_api docs
|
2019-09-26 09:50:53 +02:00 |
|