lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
4 years ago |
|
lain
|
4800ee656b
|
Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
|
4 years ago |
|
lain
|
504a829edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
|
4 years ago |
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
4 years ago |
|
Egor Kislitsyn
|
ca95cbe0b4
|
Add `with_muted` param to ChatController.index/2
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
aafdc975bd
|
federation_status: Add ApiSpec
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
4 years ago |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
4 years ago |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
4 years ago |
|
Alexander Strizhakov
|
b5b4395e4a
|
oauth consistency
|
4 years ago |
|
Alex Gleason
|
3f9263fb16
|
Merge remote-tracking branch 'upstream/develop' into restrict-origin
|
4 years ago |
|
Egor Kislitsyn
|
86ce4afd93
|
Improve backup urls
|
4 years ago |
|
Egor Kislitsyn
|
2c73bfe122
|
Add API endpoints for Backups
|
4 years ago |
|
Mark Felder
|
346cc3ac24
|
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
|
4 years ago |
|
Maksim Pechnikov
|
de993b856b
|
added `force` option to the unfollow operation
|
4 years ago |
|
Alexander Strizhakov
|
5d7ec00bed
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
dbbc801667
|
pagination for remote emoji packs
|
4 years ago |
|
Alexander Strizhakov
|
9b6d89ff8c
|
support for special chars in pack name
|
4 years ago |
|
lain
|
436d1a3c41
|
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Roman Chvanikov
|
8f5589cf66
|
Merge develop
|
4 years ago |
|
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
4 years ago |
|
lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
4 years ago |
|
lain
|
b36b6259d8
|
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
|
4 years ago |
|
Roman Chvanikov
|
4987ee6256
|
Merge branch 'develop' into feature/expire-mutes
|
4 years ago |
|
rinpatch
|
51116b5392
|
OpenAPI: fix various errors pointed out by editor.swagger.io
|
4 years ago |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
4 years ago |
|
eugenijm
|
c711a2b157
|
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
|
4 years ago |
|
eugenijm
|
582ad5d4e1
|
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
|
4 years ago |
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
4 years ago |
|
Alex Gleason
|
02d70228b5
|
AdminAPI: fix delete chat message
|
4 years ago |
|
Alex Gleason
|
9dd0b23da4
|
AdminAPI: show chat
|
4 years ago |
|
Alex Gleason
|
f13b52a703
|
AdminAPI: list messages in a chat
|
4 years ago |
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
4 years ago |
|
Maksim Pechnikov
|
9853c90abb
|
added paginate links to headers for /chats/:id/messages
|
4 years ago |
|
Roman Chvanikov
|
e3f845b243
|
Add expiring mutes for activities
|
4 years ago |
|
Roman Chvanikov
|
c56e3d4f3b
|
Add expires_in param for account mutes
|
4 years ago |
|
Maksim Pechnikov
|
917d325972
|
added api spec
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
4 years ago |
|
Maksim Pechnikov
|
0922791e4d
|
updated errors on add emoji
|
4 years ago |
|
Maksim Pechnikov
|
f5845ff033
|
upload emoji zip file
|
4 years ago |
|
Alexander Strizhakov
|
7dc275b69b
|
relay fix for admin-fe
|
4 years ago |
|
Maksim Pechnikov
|
7794d7c694
|
added Pleroma.Web.PleromaAPI.EmojiFileController
|
4 years ago |
|
Maksim Pechnikov
|
345ac512e4
|
added paginate+search for admin/MediaProxy URLs
|
4 years ago |
|
Alex Gleason
|
24ce9c011c
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Alex Gleason
|
cc196e2cd5
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
4 years ago |
|
Ivan Tashkinov
|
27b0a8b155
|
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
|
4 years ago |
|
Alibek Omarov
|
6107440ea0
|
OpenAPI: remove accidentally pasted buffer data
|
4 years ago |
