lain
bf89e0bf38
Merge branch 'feature/admin-api/support-token-header' into 'develop'
...
Admin API: Support authentication via `x-admin-token` HTTP header
Closes #1430
See merge request pleroma/pleroma!1993
5 years ago
Egor Kislitsyn
36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
feld
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
feld
adacf1b5e1
Remove deprecated endpoint from docs that is fully removed from backend now
5 years ago
rinpatch
4df2d64b9f
Merge branch 'chore/bump-fast-sanitize' into 'develop'
...
Bump fast_sanitize
See merge request pleroma/pleroma!1988
5 years ago
rinpatch
fad296e432
Bump fast_sanitize
5 years ago
rinpatch
a869c718ab
Merge branch 'chore/changelog-sync-' into 'develop'
...
Sync the changelogs between develop and stable
See merge request pleroma/pleroma!1985
5 years ago
rinpatch
da28bf8fdd
Sync the changelogs between develop and stable
5 years ago
kaniini
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
rinpatch
9e3868425a
Merge branch 'mix-task-warning' into 'develop'
...
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
5 years ago
kPherox
c9a06b14ab
Add test
5 years ago
rinpatch
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
5 years ago
lain
234c27cb20
Documentation: Add warning about database mix tasks.
5 years ago
lain
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
lain
13b6aefd59
Merge branch 'feature/mrf-object-age-policy' into 'develop'
...
MRF: add ObjectAgePolicy
See merge request pleroma/pleroma!1982
5 years ago
lain
075789c442
Apply suggestion to CHANGELOG.md
5 years ago
kPherox
72d2557e11
Add fieldsLimit to metadata of nodeinfo
5 years ago
Ariadne Conill
7c59bc9ef9
fix credo
5 years ago
Ariadne Conill
eecd64cc07
object age policy: remove debug logging
5 years ago
Ariadne Conill
2469880a2b
add changelog entry for MRF ObjectAgePolicy
5 years ago
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Ariadne Conill
29f49bf5fa
docs: document MRF ObjectAgePolicy
5 years ago
Ariadne Conill
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
5 years ago
rinpatch
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
rinpatch
94f1cfced8
format the code
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
574369b42d
Merge branch 'ci/disable-trace' into 'develop'
...
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
5 years ago
rinpatch
2861f97e46
ci: disable --trace for unit tests
...
it is mostly useless, but makes failures harder to find
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
lain
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
Phil Hagelberg
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
lain
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
rinpatch
24d5f9cbe0
Merge branch 'fix-docs-formatting' into 'develop'
...
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
5 years ago
Egor Kislitsyn
3350cd8d96
Fix formatting in OpenBSD install manual
5 years ago
Egor Kislitsyn
72cf6a76f4
Fix random fails of the rate limiter tests
5 years ago
lain
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
rinpatch
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
Phil Hagelberg
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
lain
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
5 years ago
Mark Felder
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
rinpatch
fb090b748a
Merge branch 'fix/docs-static-fe-category' into 'develop'
...
docs: move static-fe docs under a proper category
See merge request pleroma/pleroma!1972
5 years ago
rinpatch
04473677cc
docs: move static-fe docs under a proper category
5 years ago
feld
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
href
b39b49cc14
report federating status in nodeinfo
5 years ago
lain
55ac38c1d2
Merge branch 'fix-dokku-2' into 'develop'
...
Dokku deploys: Keep the git dir so version number generation works.
See merge request pleroma/pleroma!1967
5 years ago
rinpatch
51f40fab00
Merge branch 'patch-1' into 'develop'
...
Default config: Use extended nickname format
See merge request pleroma/pleroma!1968
5 years ago
rinpatch
54ae688fa1
Merge branch 'chore/changelog-1940' into 'develop'
...
Add a changelog entry for !1940
See merge request pleroma/pleroma!1970
5 years ago