Maxim Filippov
|
c0aca32dd0
|
Merge branch 'develop' into feature/multiple-users-activation-permissions
|
5 years ago |
|
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
5 years ago |
|
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
5 years ago |
|
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
|
eugenijm
|
580a67f5ca
|
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
|
5 years ago |
|
Ariadne Conill
|
9a2f71f4d5
|
mastodon api: fix exclude_replies (closes #1287)
|
5 years ago |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
5 years ago |
|
kaniini
|
93bdc55306
|
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
|
5 years ago |
|
Ivan Tashkinov
|
28fb98d69e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Haelwenn
|
b4f3c16885
|
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
5 years ago |
|
kaniini
|
2411d09215
|
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
|
5 years ago |
|
feld
|
1d8e956c32
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
5 years ago |
|
Ivan Tashkinov
|
b93856874d
|
[#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 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of `user.info`
|
5 years ago |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Ivan Tashkinov
|
f459aabdfa
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
5 years ago |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
5 years ago |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
5 years ago |
|
kaniini
|
17ff4b43cb
|
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
lain
|
276a520163
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
5 years ago |
|
lain
|
4b8524f392
|
ActivityPub / Transmogrifier: Correctly store incoming Update id.
|
5 years ago |
|
Thibaut Girka
|
791d93ff0e
|
Make credo happy
|
5 years ago |
|
Thibaut Girka
|
977e711e22
|
Import object from self-Announce whenever possible
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
Maksim Pechnikov
|
83631752af
|
removed legacy api: "/objects/:uuid/likes"
|
5 years ago |
|
kaniini
|
e0c0ea9f13
|
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
widen streaming API block effects
See merge request pleroma/pleroma!1784
|
5 years ago |
|
kaniini
|
5c04e81724
|
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
|
5 years ago |
|
Ariadne Conill
|
d1d058bf85
|
streamer: worker: actually use should_send? consistently
|
5 years ago |
|
Ariadne Conill
|
5a0c018d2a
|
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
|
5 years ago |
|
Ariadne Conill
|
2417b633ed
|
streamer: add missing copyright headers
|
5 years ago |
|
lain
|
568a995d64
|
ActivityPub: Change addressing of Undo.
|
5 years ago |
|
lain
|
27110793a7
|
Merge branch 'featrue/job-monitor' into 'develop'
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
|
5 years ago |
|
lain
|
27e914955e
|
Merge branch 'fix/nickname-fail' into 'develop'
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
|
5 years ago |
|
rinpatch
|
8217292085
|
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
|
5 years ago |
|
lain
|
01da6344b9
|
Merge branch 'bugfix/notification-nil-actor' into 'develop'
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
|
5 years ago |
|
Egor Kislitsyn
|
d3ac4e8083
|
Fix OAuthController
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5dc14c89ce
|
notification_view.ex: Make sure `account` isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
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 |
