rinpatch
808d0a0170
Move relay docs to a separate file
5 years ago
rinpatch
6435ba83cd
Move instance CLI task docs to a text file
5 years ago
rinpatch
869ea2ab90
Move digest email docs to a separate file and improve styling
5 years ago
rinpatch
bd9c7807fb
Move emoji task docs to a separate file
5 years ago
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
Egor Kislitsyn
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
Egor Kislitsyn
d3c404af12
Add MastoFEController
5 years ago
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
5 years ago
kaniini
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
5 years ago
kaniini
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
5 years ago
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
Thibaut Girka
3d61efa7c9
Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
Egor Kislitsyn
26693292f4
Remove `:enqueued` counter
5 years ago
Egor Kislitsyn
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
5 years ago
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
5 years ago
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
5 years ago
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka
4c1f158f5d
Allow users to announce privately, including own private notes
5 years ago
Maxim Filippov
b2273c695e
Discard identifier, if empty
5 years ago
Thibaut Girka
fe538973dd
Ensure self-announces do not widen the audience of the original post
5 years ago
KokaKiwi
1f0be71ea4
Make activity announceable by its author.
5 years ago
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
5 years ago
Egor Kislitsyn
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn
e7aef27c00
Fix merge
5 years ago
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
5 years ago
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
5 years ago
Egor Kislitsyn
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
5 years ago
Ariadne Conill
e653edd182
split scrobble functions into their own controller
5 years ago
Ariadne Conill
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
5 years ago
Ariadne Conill
8b34b221cb
common api: add some missing IR bits for listen activities' children
5 years ago
Ariadne Conill
84712c35f9
activitypub: object view: include child object for Listen activities
5 years ago
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill
2c82d8603b
common api: implement scrobbling
5 years ago
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
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
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
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
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
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
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
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
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
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
Maksim Pechnikov
73ae38ca04
add deprecated tag
5 years ago
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn
75290cbfbd
Add Pleroma.JobQueueMonitor
5 years ago
Roman Chvanikov
b4b147000c
Merge develop
5 years ago
Egor Kislitsyn
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn
c57ad0a402
Cleanup CommonAPI
5 years ago
Egor Kislitsyn
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
Egor Kislitsyn
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
kaniini
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
rinpatch
f2880d7d29
Credo considered harmful
5 years ago
rinpatch
c7d8ccd0c4
Remove useless with clause
5 years ago
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
5 years ago