feld
|
5f981178d0
|
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
|
5 years ago |
feld
|
9374b52756
|
Merge branch 'fix/update-reports-old-format' into 'develop'
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
|
5 years ago |
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
Maxim Filippov
|
fd24467b92
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
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 |
rinpatch
|
c2ad9fd5f9
|
Merge branch 'list-users' into 'develop'
Add CLI list users command
See merge request pleroma/pleroma!1990
|
5 years ago |
Alex Schroeder
|
fbc379d689
|
Add CLI list users command
|
5 years ago |
rinpatch
|
dc8830da27
|
changelog: add 1.1.6 entries from stable
|
5 years ago |
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
Egor Kislitsyn
|
36686f5245
|
Support authentication via `x-admin-token` HTTP header
|
5 years ago |
Maxim Filippov
|
c506cc48ef
|
Admin API: Error when trying to update reports in the "old" format
|
5 years ago |
rinpatch
|
da28bf8fdd
|
Sync the changelogs between develop and stable
|
5 years ago |
lain
|
075789c442
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
Ariadne Conill
|
2469880a2b
|
add changelog entry for MRF ObjectAgePolicy
|
5 years ago |
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
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 |
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
5 years ago |
lain
|
7a322713c3
|
Update CHANGELOG.md
|
5 years ago |
kaniini
|
2cc043591c
|
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
|
5 years ago |
rinpatch
|
827b938502
|
Add a changelog entry for !1940
|
5 years ago |
Maxim Filippov
|
46787b9fe1
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
Maxim Filippov
|
1649d6f689
|
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
|
5 years ago |
Maxim Filippov
|
31343e4321
|
Code style fixes
|
5 years ago |
Maxim Filippov
|
b2e8371e6a
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
rinpatch
|
4499a7a075
|
Disable attachment links by default
Closes #1394
|
5 years ago |
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
5 years ago |
Phil Hagelberg
|
6ef8049664
|
Add changelog entry, cheatsheet docs, and alphabetize.
|
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 |
Ivan Tashkinov
|
66c502879b
|
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
|
5 years ago |
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
5 years ago |
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
eugenijm
|
ed29be24cb
|
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
|
5 years ago |
Maxim Filippov
|
10e9ba6340
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
5 years ago |
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
5 years ago |
Maxim Filippov
|
8eff05d4c6
|
Strip status data from Flag (when federating or closing/resolving report)
|
5 years ago |
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
Maksim Pechnikov
|
31d6ef6f92
|
update changelog
|
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 |
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
5 years ago |
rinpatch
|
0341f6f779
|
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
|
5 years ago |
rinpatch
|
901bf0fb8c
|
pleroma_ctl: Fix attempting to use RPC for config generation
|
5 years ago |
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
Ariadne Conill
|
4e270964d7
|
update changelog
|
5 years ago |
rinpatch
|
c2f1cc4f16
|
Fix wrong list level in the changelog
|
5 years ago |
rinpatch
|
09c1e7a82e
|
Sync the changelog from stable and collapse the API sections
|
5 years ago |