Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
4 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
b87b798ca1
|
Merge branch 'fix/1658-invite-send' into 'develop'
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
|
5 years ago |
|
Alexander Strizhakov
|
c8bfbf511e
|
Apply suggestion to docs/API/admin_api.md
|
5 years ago |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
5 years ago |
|
Egor Kislitsyn
|
8a0ffaa9ea
|
Fix formatting in documentation
|
5 years ago |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Alexander Strizhakov
|
2d64500a9d
|
error improvement for email_invite endpoint
|
5 years ago |
|
Alexander Strizhakov
|
7af0959a07
|
updating docs
|
5 years ago |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
5 years ago |
|
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
5 years ago |
|
Alexander Strizhakov
|
98a60df41f
|
include_types parameter in /api/v1/notifications
|
5 years ago |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
5 years ago |
|
eugenijm
|
13cce9c0de
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
|
5 years ago |
|
eugenijm
|
d198e7fa2a
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
|
5 years ago |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
5 years ago |
|
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
5 years ago |
|
Ivan Tashkinov
|
ecb7809e92
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
|
5 years ago |
|
rinpatch
|
4db88242e5
|
Merge branch 'docs/direct_conversation_id' into 'develop'
pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263
|
5 years ago |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
5 years ago |
|
Ivan Tashkinov
|
027714b519
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
|
5 years ago |
|
Ivan Tashkinov
|
b4367125e9
|
[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
|
5 years ago |
|
eugenijm
|
7af431c150
|
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
deb5f5c40e
|
pleroma_api.md: direct_conversation_id vs. conversation_id
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
|
5 years ago |
|
Alexander Strizhakov
|
814b275af7
|
Merge branch 'develop' into gun
|
5 years ago |
|
eugenijm
|
4ab07cf0d5
|
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
|
5 years ago |
|
Maksim Pechnikov
|
10f452ad1f
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
eugenijm
|
7ad5c51f23
|
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
|
5 years ago |
|
Alexander Strizhakov
|
13918cb545
|
Merge branch 'develop' into gun
|
5 years ago |
|
lain
|
3af6d3f8e2
|
Emoji Reactions: Add documentation
|
5 years ago |
|
Mark Felder
|
cf94349287
|
Merge branch 'develop' into gun
|
5 years ago |
|
lain
|
c07efd5b42
|
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
|
5 years ago |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
5 years ago |
|
Maksim Pechnikov
|
da44ee5b0f
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
24c526a0b1
|
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
ad16f38b9c
|
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
|
5 years ago |
|
Maksim Pechnikov
|
b87533760b
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
5 years ago |
|
lain
|
57098713c0
|
Apply suggestion to docs/API/pleroma_api.md
|
5 years ago |
|
lain
|
713645d5c5
|
Apply suggestion to docs/API/pleroma_api.md
|
5 years ago |
|
Lain Soykaf
|
ce95882009
|
EmojiReactions: Add docs and Changelog
|
5 years ago |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
5 years ago |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
5 years ago |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
5 years ago |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
5 years ago |
