lain
|
8480f84615
|
Update differences_in_mastoapi_responses.md
|
4 years ago |
|
Alexander
|
be34672d67
|
formatting
|
4 years ago |
|
Alexander
|
6e625a427c
|
reply filtering
|
4 years ago |
|
Egor Kislitsyn
|
1b06a27746
|
Update Flake ID description
|
4 years ago |
|
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
4 years ago |
|
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
4 years ago |
|
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
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
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 |
|
lain
|
d378550d2d
|
Emoji Reactions: Document changes
|
5 years ago |
|
Alexander Strizhakov
|
7c6e5c541d
|
docs update
|
5 years ago |
|
Maksim Pechnikov
|
e442ea5722
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
9a994878f1
|
Emoji reactions: Update docs and changelog
|
5 years ago |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
5 years ago |
|
lain
|
85f45c7689
|
Document new EmojiReaction notifications
|
5 years ago |
|
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
5 years ago |
|
Alexander Strizhakov
|
f3e074e949
|
little fixes
|
5 years ago |
|
Alexander Strizhakov
|
a9c6f119ac
|
docs update
|
5 years ago |
|
lain
|
043cd5aa54
|
Emoji reactions: Document changes
|
5 years ago |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
lain
|
4c5b5f14dc
|
StatusView: Add `emoji_reactions`
|
5 years ago |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Alibek Omarov
|
e1308f10bd
|
docs: API: update Mastodon API link
|
5 years ago |
|
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
5 years ago |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
5 years ago |
|
Alexander Strizhakov
|
958d0452e4
|
fix for pleroma assets group update
|
5 years ago |
|
Alexander
|
bb9a43c3ae
|
typo fix
|
5 years ago |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
5 years ago |
|
Alexander
|
5cacb988b9
|
partially settings update
|
5 years ago |
|
Alex S
|
2753285b77
|
config editing through database
|
5 years ago |
|
Egor Kislitsyn
|
fc79c69173
|
Remove `/api/account/register` documentation from pleroma_api.md
|
5 years ago |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
5 years ago |
|
lain
|
1ae976ac51
|
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
5 years ago |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
lain
|
e4ea0e20b3
|
Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
|
5 years ago |
|
lain
|
4692919ea6
|
Update pleroma_api.md
|
5 years ago |
|
Egor Kislitsyn
|
b4027e7187
|
Document `with_move` parameter of the notification API
|
5 years ago |
|
Maksim Pechnikov
|
e260a16c05
|
update docs
|
5 years ago |
|
Maxim Filippov
|
00c38cf28d
|
Docs
|
5 years ago |
|
Ivan Tashkinov
|
93a80ee915
|
[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
|
5 years ago |
|
Maksim Pechnikov
|
49bb0a130f
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
5 years ago |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
5 years ago |
|
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
5 years ago |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
|
feld
|
adacf1b5e1
|
Remove deprecated endpoint from docs that is fully removed from backend now
|
5 years ago |
|
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
5 years ago |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
|
Egor Kislitsyn
|
e6d7e27bd6
|
Add `allow_following_move` setting to User
|
5 years ago |
|
Maxim Filippov
|
31343e4321
|
Code style fixes
|
5 years ago |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
eugenijm
|
7888803ffe
|
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
|
5 years ago |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
ab5c8ec9fa
|
Update docs
|
5 years ago |
|
Maksim Pechnikov
|
58da7f6620
|
updated docs\changelog
|
5 years ago |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
5 years ago |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
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 |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
lain
|
1ed8fbc4d9
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
|
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
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 |
|
lain
|
27110793a7
|
Merge branch 'featrue/job-monitor' into 'develop'
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
|
5 years ago |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
rinpatch
|
0ba5c1a9d7
|
Fix more links
|
5 years ago |
|
rinpatch
|
acc62f327d
|
Rename some directories because MkDocs uses them for categories
|
5 years ago |
