3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
06151776c0
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'
...
Remove deprecated endpoint from docs that is fully removed from backend now
See merge request pleroma/pleroma!1992
5 years ago
adacf1b5e1
Remove deprecated endpoint from docs that is fully removed from backend now
5 years ago
0937895182
updated fetch_favorites
5 years ago
9da4c88b49
fix test
5 years ago
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
4df2d64b9f
Merge branch 'chore/bump-fast-sanitize' into 'develop'
...
Bump fast_sanitize
See merge request pleroma/pleroma!1988
5 years ago
fad296e432
Bump fast_sanitize
5 years ago
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
5 years ago
a869c718ab
Merge branch 'chore/changelog-sync-' into 'develop'
...
Sync the changelogs between develop and stable
See merge request pleroma/pleroma!1985
5 years ago
da28bf8fdd
Sync the changelogs between develop and stable
5 years ago
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
9e3868425a
Merge branch 'mix-task-warning' into 'develop'
...
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
c9a06b14ab
Add test
5 years ago
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
5 years ago
234c27cb20
Documentation: Add warning about database mix tasks.
5 years ago
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
13b6aefd59
Merge branch 'feature/mrf-object-age-policy' into 'develop'
...
MRF: add ObjectAgePolicy
See merge request pleroma/pleroma!1982
5 years ago
075789c442
Apply suggestion to CHANGELOG.md
5 years ago
72d2557e11
Add fieldsLimit to metadata of nodeinfo
5 years ago
7c59bc9ef9
fix credo
5 years ago
eecd64cc07
object age policy: remove debug logging
5 years ago
2469880a2b
add changelog entry for MRF ObjectAgePolicy
5 years ago
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
29f49bf5fa
docs: document MRF ObjectAgePolicy
5 years ago
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
5 years ago
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
30af5da330
Admin API: list all statuses from a given instance
5 years ago
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
5 years ago
94f1cfced8
format the code
5 years ago
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
574369b42d
Merge branch 'ci/disable-trace' into 'develop'
...
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
5 years ago
2861f97e46
ci: disable --trace for unit tests
...
it is mostly useless, but makes failures harder to find
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
7a322713c3
Update CHANGELOG.md
5 years ago
f74bb1d0fc
Merge branch 'static-fe-object-id' into 'develop'
...
Redirect object/activity ID to notice in static-fe
Closes #1412
See merge request pleroma/pleroma!1977
5 years ago
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
60cc5a7750
Merge branch 'fix-rate-limiter-test' into 'develop'
...
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
5 years ago
24d5f9cbe0
Merge branch 'fix-docs-formatting' into 'develop'
...
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
5 years ago
3350cd8d96
Fix formatting in OpenBSD install manual
5 years ago
72cf6a76f4
Fix random fails of the rate limiter tests
5 years ago
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
5 years ago
1025c526c0
Merge branch 'bugfix/1360-actorless-posts' into 'develop'
...
Containment: Add a catch-all clause to contain_origin.
Closes #1360
See merge request pleroma/pleroma!1975
5 years ago
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
768c1a5de1
Fix tests
5 years ago
Ivan Tashkinov