Ivan Tashkinov
|
4f88b1b435
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
lain
|
937d6c6b32
|
Merge branch 'fix/sporadic-tests' into 'develop'
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
|
5 years ago |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
|
lain
|
75efdb0781
|
Merge branch 'fix-docker-build' into 'develop'
Fix failing docker build
See merge request pleroma/pleroma!1998
|
5 years ago |
|
Ivan Tashkinov
|
555edd01ab
|
[#1335] User AP ID relations fetching performance optimizations.
|
5 years ago |
|
Egor Kislitsyn
|
63711258ce
|
Fix sporadically failing test
|
5 years ago |
|
rinpatch
|
27f73d38c0
|
Merge branch 'chore/bump-fe' into 'develop'
Bump fe and sync changelogs
See merge request pleroma/pleroma!1996
|
5 years ago |
|
rinpatch
|
dc8830da27
|
changelog: add 1.1.6 entries from stable
|
5 years ago |
|
rinpatch
|
0fe08346db
|
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
|
5 years ago |
|
Ivan Tashkinov
|
565f261338
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
|
kPherox
|
b7bbb5445d
|
remove docs/ from .dockerignore
|
5 years ago |
|
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 |
|
Ivan Tashkinov
|
3aaf3aa2c2
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
Ivan Tashkinov
|
aad6576130
|
[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
|
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 |
|
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
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 |
