Sadposter
|
c7cc80a9ee
|
obligatory format commit
|
5 years ago |
|
Sadposter
|
fa97eddf8a
|
make follows take precedence over domain blocks
|
5 years ago |
|
kaniini
|
cb656938ca
|
Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'
User: Never return nil for user follower counts.
Closes #1442
See merge request pleroma/pleroma!2017
|
5 years ago |
|
lain
|
50b152766f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
|
5 years ago |
|
lain
|
ef1718a045
|
Merge branch 'remove-user-info' into 'develop'
Remove User.user_info/2
See merge request pleroma/pleroma!2016
|
5 years ago |
|
lain
|
f36724efb1
|
User: Never return nil for user follower counts.
|
5 years ago |
|
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
5 years ago |
|
lain
|
139b1feda1
|
Merge branch 'feature/direct_conversation_id_web_push' into 'develop'
Add `direct_conversation_id` to web push payload
See merge request pleroma/pleroma!2012
|
5 years ago |
|
Egor Kislitsyn
|
4af69f047d
|
Remove `account` field from web push payload
|
5 years ago |
|
Egor Kislitsyn
|
80ededc04f
|
Add `direct_conversation_id` to web push payload
|
5 years ago |
|
feld
|
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 |
|
Mark Felder
|
f673e3deef
|
Default log level for syslog in prod should also be :warn
|
5 years ago |
|
lain
|
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 |
|
rinpatch
|
4b10804f21
|
OStatus controller: don't serve json at /notice/, redirect instead
|
5 years ago |
|
rinpatch
|
02f7383891
|
ActivityPub controller: do not render remote users
|
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 |
|
rinpatch
|
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 |
|
Sadposter
|
e2dc89069d
|
move documentation section for http client
|
5 years ago |
|
Sadposter
|
d3656c2725
|
add ability to set a custom user-agent string
|
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 |
|
rinpatch
|
9f29930440
|
fetcher: move local object checking into a reusable function
|
5 years ago |
|
rinpatch
|
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 |
|
rinpatch
|
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 |
|
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 |
|
Maxim Filippov
|
b64c7b35d4
|
Swap map with each
|
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 |
|
rinpatch
|
dedb1ad5d6
|
Merge branch 'revert-5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
|
5 years ago |
|
lain
|
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 |
|
rinpatch
|
dc9303eac5
|
Revert "Merge branch 'patch-1' into 'develop'"
This reverts merge request !1829
|
5 years ago |
|
lain
|
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 |
|
lain
|
320690f7a5
|
Object: Use inspect to log missing preload.
|
5 years ago |
|
lain
|
1680a3479e
|
Merge branch 'fix/user-following-count' into 'develop'
Fix user.following_count
See merge request pleroma/pleroma!2000
|
5 years ago |
|
lain
|
cd8da73bbe
|
Merge branch 'remove-useless-warning' into 'develop'
Remove version mismatch warning
See merge request pleroma/pleroma!2001
|
5 years ago |
|
Egor Kislitsyn
|
8ffd1c792c
|
Remove version mismatch warning
|
5 years ago |
|
Egor Kislitsyn
|
d38ab4bb89
|
Fix user.following_count
|
5 years ago |
|
Mark Felder
|
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 |
|
Mark Felder
|
c65190c799
|
Console backend's log format should be prefixed and suffixed with newlines.
This is how upstream does it by default.
|
5 years ago |
|
Mark Felder
|
140a54fd4e
|
Merge branch 'develop' into fix/mix-task-logging
|
5 years ago |
|
Mark Felder
|
1c17f18329
|
Be specific about format for logs in test as we have tests that check it
|
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 |
|
lain
|
75efdb0781
|
Merge branch 'fix-docker-build' into 'develop'
Fix failing docker build
See merge request pleroma/pleroma!1998
|
5 years ago |
|
Egor Kislitsyn
|
63711258ce
|
Fix sporadically failing test
|
5 years ago |
|
Mark Felder
|
cb513a599c
|
Allow test builds to have info and debug logs stripped
|
5 years ago |
|
Mark Felder
|
ff9133b978
|
Allow mix tasks to always run with debug logging
|
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 |
