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 |
|
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 |
|
kaniini
|
0ee6100c8d
|
Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
|
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
|
b1ff66dc5f
|
Add test for handling Announces with inlined object from different origin
|
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
|
e51c20f28a
|
Merge branch 'revert-5c04e817' into 'develop'
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
See merge request pleroma/pleroma!1794
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
kaniini
|
9c47d8571c
|
Merge branch 'issue/1296' into 'develop'
[#1296] removed legacy api: "/objects/:uuid/likes"
See merge request pleroma/pleroma!1788
|
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 |
|
kaniini
|
75e415d5f4
|
Merge branch 'fix/extended-nickname-format-default-config' into 'develop'
Add missing extended_nickname_format setting to the default config
See merge request pleroma/pleroma!1776
|
5 years ago |
|
kaniini
|
99b312cbab
|
Merge branch 'undo-fixes' into 'develop'
ActivityPub: Change addressing of Undo.
See merge request pleroma/pleroma!1782
|
5 years ago |
|
Ariadne Conill
|
dbf5fce67e
|
update changelog
|
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 |
|
Ariadne Conill
|
8325858ed2
|
tests: streamer: add a test for blocked transitive activities
|
5 years ago |
|
lain
|
2a7f44acfe
|
ActivityPub.Utils: Fix undo test.
|
5 years ago |
|
lain
|
568a995d64
|
ActivityPub: Change addressing of Undo.
|
5 years ago |
|
feld
|
31e57cd1b3
|
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
|
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 |
|
lain
|
bc095a27f1
|
Merge branch 'fix/oauth-controller' into 'develop'
Fix OAuthController
Closes #1294
See merge request pleroma/pleroma!1780
|
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 |
|
rinpatch
|
bdf188b2a6
|
Merge branch 'docs/frontend_configuration' into 'develop'
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
See merge request pleroma/pleroma!1778
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
e4ab9a05dd
|
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
rinpatch
|
4fe2af3b2d
|
Merge branch 'mkdocs-migration-prep' into 'develop'
MkDocs migration preparation
See merge request pleroma/pleroma!1774
|
5 years ago |
|
rinpatch
|
b2f2012a4f
|
Remove a test branch from CI
|
5 years ago |
|
Mark Felder
|
b8b98ac40f
|
Add missing extended_nickname_format setting to the default config
|
5 years ago |
|
rinpatch
|
69784eb75a
|
Add a missing language specification
|
5 years ago |
|
rinpatch
|
b5a43e301e
|
Change docs build/deploy to just trigger a pipeline in the docs repo
|
5 years ago |
|
rinpatch
|
1cae564b5d
|
Move config task docs to a separate file and mark it as WIP
|
5 years ago |
|
rinpatch
|
e00403af23
|
Mix tasks: derive moduledoc from doc files
|
5 years ago |
|
rinpatch
|
6baa037903
|
Move database maintenance tasks docs to a separate file
|
5 years ago |
|
rinpatch
|
8e08d5b233
|
MkDocs does not like if a paragraph doesn't have a newline after it
|
5 years ago |
|
rinpatch
|
2656f41818
|
Remove silent mode note as it's no longer relevant
|
5 years ago |
|
rinpatch
|
aefb4dcff5
|
Cheatsheet: Use note/warning blocks instead of bold text
|
5 years ago |
|
rinpatch
|
e560d65db3
|
Fix a typo in activity expirations
|
5 years ago |
