rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
lain
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
feld
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
lain
21353a8ee9
Changelog: Add information about chat limit.
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
Ivan Tashkinov
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
Maxim Filippov
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
5 years ago
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
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
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
Ivan Tashkinov
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
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
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
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
Egor Kislitsyn
63c493cd53
Update CHANGELOG
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
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
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
Maksim Pechnikov
58da7f6620
updated docs\changelog
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
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
feld
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
5 years ago
rinpatch
d1e969842d
Add a changelog entry for branch-moving
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
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
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
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
5 years ago
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
eugenijm
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
feld
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
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
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
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
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
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill
dbf5fce67e
update changelog
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
8e83c8423f
Update Changelog.
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
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
Mark Felder
b8b98ac40f
Add missing extended_nickname_format setting to the default config
5 years ago
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
Egor Kislitsyn
93f966ea4b
Update CHANGELOG and pleroma_api.md
5 years ago
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
5 years ago
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
5 years ago
Ariadne Conill
53506da414
update changelog
5 years ago
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10
, reversing
changes made to c4fbb56984
.
5 years ago
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
Haelwenn (lanodan) Monnier
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
5 years ago
Haelwenn (lanodan) Monnier
51a4a211a3
CHANGELOG.md: !1691 is a breaking change
...
!1691 : https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
Ariadne Conill
843c11d1f6
changelog
5 years ago
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
rinpatch
3ec81b816f
Sync changelogs between master and develop
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Roman Chvanikov
b736312123
Update CHANGELOG
5 years ago
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
5 years ago
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
Maxim Filippov
cf1960d596
Better changelog wording
5 years ago
Maxim Filippov
79c3443b60
Update CHANGELOG
5 years ago
Maxim Filippov
c8fdf757c1
I did not put these lines in CHANGELOG
5 years ago
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
Egor Kislitsyn
ae1d371428
Update CHANGELOG
5 years ago
eugenijm
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
rinpatch
a22b87b30c
Add a changelog entry for poll refetching
5 years ago
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov
847c7f02f5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Ivan Tashkinov
9f28249dfb
[ #1260 ] Added changelog entry.
5 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
5 years ago
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
Egor Kislitsyn
25d8216804
Add email change endpoint
5 years ago
Alex S
68e45a327f
changelog
5 years ago
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
feld
bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
5 years ago
Egor Kislitsyn
e34de00052
Update CHANGELOG (add a note about !1649 )
5 years ago
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
5 years ago
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
5 years ago
rinpatch
558969a0fd
Do not crash if one notification failed to render
5 years ago
Maxim Filippov
af746fa4a8
Return total for reports
5 years ago
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
rinpatch
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
rinpatch
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
Ivan Tashkinov
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
b15cfd80ef
Return "total" optionally
5 years ago
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
5 years ago
Maxim Filippov
c5ffbfb8d5
Changelog entry
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
1d7033d962
Update CHANGELOG.md
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
rinpatch
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
Egor Kislitsyn
cd2fd225dc
Update CHANGELOG
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Mark Felder
cb222b72b3
Add changelog entry too
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
b27fafe161
Fix CHANGELOG entry
5 years ago
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
rinpatch
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
5 years ago
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor
8ab87ce40b
Apply suggestion to CHANGELOG.md
5 years ago
Egor Kislitsyn
069951722f
Update CHANGELOG
5 years ago
Ariadne Conill
8fab9c5c1c
update changelog to cover MRF describe API.
5 years ago
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
Ariadne Conill
369d9cf03b
update changelog for mrf_vocabulary
5 years ago
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
5 years ago
lain
2674db14a2
Modify Changelog.
5 years ago
rinpatch
d4d31ffdc4
Add a changelog entry for !1552
5 years ago
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
5 years ago
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
5 years ago
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
5 years ago
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
rinpatch
4f1b9c54b9
Do not rembed the object after updating it
5 years ago
Egor Kislitsyn
bbd9ed0257
Update CHANGELOG
5 years ago
Eugenij
96028cd585
Remove Reply-To from report emails
5 years ago
kaniini
f7fc902c29
Merge branch 'feature/relay-list-task' into 'develop'
...
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
5 years ago
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
5 years ago
Ariadne Conill
cef3af5536
tasks: relay: add list task
5 years ago
feld
d93d777915
Fix/mediaproxy whitelist base url
5 years ago
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
rinpatch
81412240e6
Fix Invalid SemVer version generation
...
when the current branch does not have commits ahead of tag/checked out on a tag
5 years ago
rinpatch
def0c49ead
Add a changelog entry for disallowing locked accounts follows over OStatus
5 years ago
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
5 years ago
Alexander Strizhakov
51b3b6d816
Admin changes
5 years ago
Eugenij
0bee2131ce
Add `mailerEnabled` to the NodeInfo metadata
5 years ago
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
5 years ago
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Haelwenn (lanodan) Monnier
7c8abbcb1c
CHANGELOG.md: Add entry for !1484
...
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484
[ci skip]
5 years ago
Eugenij
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone
877575d0da
fixup! Update changelog
5 years ago
Mike Verdone
91d9fdc7de
Update changelog to document expiring posts feature
5 years ago
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
kaniini
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
5 years ago
Ariadne Conill
d3bdb8e704
rich media: parser: splice the given URL into the result
5 years ago
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
5 years ago
Alexander Strizhakov
2442b5c18e
changelog
5 years ago
Haelwenn
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
5 years ago
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
5 years ago
Ariadne Conill
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
5 years ago
rinpatch
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
5 years ago
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
feld
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
5 years ago
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Ariadne Conill
7bb50bfccc
update changelog
5 years ago
Ariadne Conill
c119835102
update changelog
5 years ago
kaniini
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
5 years ago
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
Eugenij
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
Mark Felder
46c7c53fbb
Add changelog entry for Mastodon API change
5 years ago
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sergey Suprunenko
dce8ebc9ea
Unfollow should also unsubscribe
5 years ago
Ariadne Conill
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
Alex S
7af27c143d
changelog & docs
5 years ago
Maxim Filippov
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
5 years ago
kaniini
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
5 years ago
Haelwenn
9497d14f09
Merge branch 'fix/hackney-global-options' into 'develop'
...
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409
5 years ago
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch
29ffe81c2e
Add a changelog entry for tolerating incorrect chain order
5 years ago
rinpatch
f40004e746
Add changelog entries for follower/following collection behaviour changes
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Egor Kislitsyn
9991254c06
Update CHANGELOG
5 years ago
Alexander Strizhakov
846ad9a463
admin api configure changes
5 years ago
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
5 years ago
rinpatch
e2782c342f
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
5 years ago
Maksim
12b1454245
[ #1062 ] added option to disable send email
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
feld
c91b5c87ff
Docs/more mastodon api
5 years ago
kaniini
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
5 years ago
kaniini
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
Mark Felder
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
5 years ago
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
kaniini
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
5 years ago
Haelwenn
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
5 years ago
rinpatch
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
5 years ago
rinpatch
f3cc2acb0f
Add a changelog entry for changing the defaults
5 years ago
rinpatch
f5b91bc157
Improve wording in CHANGELOG.md
5 years ago
rinpatch
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
5 years ago
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
Haelwenn (lanodan) Monnier
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
5 years ago
Ivan Tashkinov
e2f4135a8c
Apply suggestion to CHANGELOG.md
5 years ago
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
Maxim Filippov
6c50fbcd14
Admin API: Allow querying user by ID
5 years ago
Eugenij
15eb1235ed
Expose `skip_thread_containment` in nodeinfo
5 years ago
Eugenij
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
5 years ago
Maxim Filippov
0b3561ae72
Move changelog entries
5 years ago
Maxim Filippov
611f6665ac
Update changelog and admin API docs with tags, display_name, avatar additions
5 years ago
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
William Pitcock
074ffee0b2
docs: add documentation for MediaProxyWarmingPolicy
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
lain
da17bdd87e
BUMP OF CHICKEN
...
1.0
5 years ago
Mark Felder
e64c758cea
Add changelog entry for syslog tag change
5 years ago
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
Maksim Pechnikov
437fd6046d
update changelog
5 years ago
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
Maksim
f1817fe94b
Apply suggestion to CHANGELOG.md
5 years ago
Maksim Pechnikov
7d6a543eca
update changelog
5 years ago
rinpatch
875100de01
Bind to 127.0.0.1 instead of 0.0.0.0 by default
5 years ago
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
William Pitcock
630ac6a921
docs: better description for mrf anti link spam
5 years ago
William Pitcock
736d8ad6be
implement anti link spam MRF
5 years ago
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
5 years ago
lain
0632ed2f87
Apply suggestion to CHANGELOG.md
5 years ago
lain
5ea6e26da0
Changelog: Document chat token.
5 years ago
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
lain
774637a2f4
Mastodon API: Document changes.
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
f26013cf2e
Update CHANGELOG
5 years ago
kaniini
e343e4ff91
Merge branch 'change-containment-default' into 'develop'
...
Configuration: Skip thread containment by default
See merge request pleroma/pleroma!1256
5 years ago
rinpatch
cfcc0c8776
Add a changelog entry for releases
5 years ago
rinpatch
4f5149c93b
Set default loglevel to `warn` in prod
...
It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances
Closes #962
5 years ago
lain
593b8b1e6a
Configuration: Skip thread containment by default
...
In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example.
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
lain
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
5 years ago
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
5 years ago
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
lain
25198d48f7
Docs: Add Explicit addressing to Readme and changelog.
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
William Pitcock
7758148990
update CHANGELOG for mrf_subchain
5 years ago
Roman Chvanikov
7718a215e9
Update changelog
5 years ago
Maksim Pechnikov
46c7e16512
updated changelog
5 years ago
rinpatch
baefb97dc4
Add a changelog entry for polls
5 years ago
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
lain
7591a8928d
Setting Store: Document in changelog.
5 years ago
lambda
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
5 years ago
rinpatch
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
5 years ago
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
5 years ago
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi
0c53d91f3b
fix merge conflict
5 years ago
kaniini
75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
5 years ago
kaniini
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
William Pitcock
7d9b33b3ce
update documentation for the new MRF features [no-ci]
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
78ac8ee561
Update CHANGELOG.md
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
lain
3b12e1ba7c
Changelog: Add tip for debian users.
5 years ago
lain
f9e0d09ec0
Changelog: Add SSH mode.
5 years ago
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
5 years ago
William Pitcock
f446f94290
add changelog entry for object pruning
5 years ago
lain
d378b342ba
MongooseIM: Add documentation.
5 years ago
William Pitcock
c972d0bb14
http: bump connection timeout to 10 seconds
5 years ago
Sadposter
d835810610
Add changelog entry for mascot config
5 years ago
rinpatch
8e9a764dfc
Merge branch 'feature/mrf-always-nsfw' into 'develop'
...
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
5 years ago
William Pitcock
c4a55e167a
add Changelog entry
5 years ago
William Pitcock
c234ce546a
add CHANGELOG entry
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago