4af69f047d
Remove `account` field from web push payload
5 years ago
80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
eb3c47f1d8
Merge branch 'fix/prod-syslog-level' into 'develop'
...
Default log level for syslog in prod should also be :warn
See merge request pleroma/pleroma!2011
5 years ago
f673e3deef
Default log level for syslog in prod should also be :warn
5 years ago
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
5869a43fe7
Fix tests
5 years ago
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
dc9090810d
Merge branch 'fix/ap-disable-remote-render' into 'develop'
...
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
5 years ago
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
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
5 years ago
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
02f7383891
ActivityPub controller: do not render remote users
5 years ago
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
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
756bdef5f5
Merge branch 'feature/useragent-override' into 'develop'
...
Add ability to set a custom user-agent string
See merge request pleroma/pleroma!2009
5 years ago
e2dc89069d
move documentation section for http client
5 years ago
d3656c2725
add ability to set a custom user-agent string
5 years ago
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
40059c9b1e
Typo
5 years ago
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
9f29930440
fetcher: move local object checking into a reusable function
5 years ago
1636cc5b7e
Removed users.info and remaining usages.
5 years ago
34cdbcbb64
Merge branch 'fix/release-envvars' into 'develop'
...
OTP releases: only set name and distribution type if not set already
See merge request pleroma/pleroma!2004
5 years ago
4a5bb7eb02
OTP releases: only set name and distribution type if not set already
...
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
5 years ago
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
1d6970baf1
fix
5 years ago
b64c7b35d4
Swap map with each
5 years ago
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
5 years ago
fbc379d689
Add CLI list users command
5 years ago
dedb1ad5d6
Merge branch 'revert-5c6c3026' into 'develop'
...
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
5 years ago
19b727bf8f
Merge branch 'fix/mix-task-logging' into 'develop'
...
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
5 years ago
dc9303eac5
Revert "Merge branch 'patch-1' into 'develop'"
...
This reverts merge request !1829
5 years ago
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
320690f7a5
Object: Use inspect to log missing preload.
5 years ago
1680a3479e
Merge branch 'fix/user-following-count' into 'develop'
...
Fix user.following_count
See merge request pleroma/pleroma!2000
5 years ago
cd8da73bbe
Merge branch 'remove-useless-warning' into 'develop'
...
Remove version mismatch warning
See merge request pleroma/pleroma!2001
5 years ago
8ffd1c792c
Remove version mismatch warning
5 years ago
d38ab4bb89
Fix user.following_count
5 years ago
edaae845af
Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
...
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
5 years ago
c65190c799
Console backend's log format should be prefixed and suffixed with newlines.
...
This is how upstream does it by default.
5 years ago
140a54fd4e
Merge branch 'develop' into fix/mix-task-logging
5 years ago
1c17f18329
Be specific about format for logs in test as we have tests that check it
5 years ago
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
5 years ago
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
937d6c6b32
Merge branch 'fix/sporadic-tests' into 'develop'
...
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
5 years ago
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
75efdb0781
Merge branch 'fix-docker-build' into 'develop'
...
Fix failing docker build
See merge request pleroma/pleroma!1998
5 years ago
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
5 years ago
Egor Kislitsyn