Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
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
2019-11-25 15:23:45 +00:00
Maxim Filippov
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)
2019-11-26 00:20:46 +09:00
Maxim Filippov
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
2019-11-26 00:13:11 +09:00
rinpatch
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
2019-11-25 17:55:17 +03:00
rinpatch
02f7383891
ActivityPub controller: do not render remote users
2019-11-25 17:19:33 +03:00
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
2019-11-25 13:29:53 +00:00
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
2019-11-25 13:29:22 +00:00
rinpatch
756bdef5f5
Merge branch 'feature/useragent-override' into 'develop'
...
Add ability to set a custom user-agent string
See merge request pleroma/pleroma!2009
2019-11-25 11:36:59 +00:00
Sadposter
e2dc89069d
move documentation section for http client
2019-11-25 11:26:42 +00:00
Sadposter
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
Maxim Filippov
40059c9b1e
Typo
2019-11-25 00:05:52 +09:00
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
rinpatch
9f29930440
fetcher: move local object checking into a reusable function
2019-11-23 22:55:41 +03:00
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
2019-11-22 17:17:20 +00:00
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.
2019-11-22 19:58:39 +03:00
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
2019-11-22 15:39:19 +00:00
Maxim Filippov
b64c7b35d4
Swap map with each
2019-11-22 09:11:36 +09:00
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
rinpatch
dedb1ad5d6
Merge branch 'revert-5c6c3026' into 'develop'
...
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
2019-11-21 15:20:05 +00:00
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
2019-11-21 15:04:19 +00:00
rinpatch
dc9303eac5
Revert "Merge branch 'patch-1' into 'develop'"
...
This reverts merge request !1829
2019-11-21 15:03:27 +00:00
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
lain
320690f7a5
Object: Use inspect to log missing preload.
2019-11-21 14:03:01 +01:00
lain
1680a3479e
Merge branch 'fix/user-following-count' into 'develop'
...
Fix user.following_count
See merge request pleroma/pleroma!2000
2019-11-21 12:26:05 +00:00
lain
cd8da73bbe
Merge branch 'remove-useless-warning' into 'develop'
...
Remove version mismatch warning
See merge request pleroma/pleroma!2001
2019-11-21 12:22:46 +00:00
Egor Kislitsyn
8ffd1c792c
Remove version mismatch warning
2019-11-21 18:22:18 +07:00
Egor Kislitsyn
d38ab4bb89
Fix user.following_count
2019-11-21 16:31:13 +07:00
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.
2019-11-20 11:55:30 -06:00
Mark Felder
c65190c799
Console backend's log format should be prefixed and suffixed with newlines.
...
This is how upstream does it by default.
2019-11-20 11:18:42 -06:00
Mark Felder
140a54fd4e
Merge branch 'develop' into fix/mix-task-logging
2019-11-20 09:16:46 -06:00
Mark Felder
1c17f18329
Be specific about format for logs in test as we have tests that check it
2019-11-20 09:14:27 -06:00
lain
937d6c6b32
Merge branch 'fix/sporadic-tests' into 'develop'
...
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
2019-11-20 12:46:33 +00:00
lain
75efdb0781
Merge branch 'fix-docker-build' into 'develop'
...
Fix failing docker build
See merge request pleroma/pleroma!1998
2019-11-20 10:32:58 +00:00
Egor Kislitsyn
63711258ce
Fix sporadically failing test
2019-11-20 14:25:00 +07:00
Mark Felder
cb513a599c
Allow test builds to have info and debug logs stripped
2019-11-19 16:21:30 -06:00
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
2019-11-19 16:01:17 -06:00
rinpatch
27f73d38c0
Merge branch 'chore/bump-fe' into 'develop'
...
Bump fe and sync changelogs
See merge request pleroma/pleroma!1996
2019-11-19 21:03:42 +00:00
rinpatch
dc8830da27
changelog: add 1.1.6 entries from stable
2019-11-20 00:01:58 +03:00
rinpatch
0fe08346db
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
2019-11-19 23:28:34 +03:00
kPherox
b7bbb5445d
remove docs/ from .dockerignore
2019-11-20 00:09:07 +09:00
Maxim Filippov
b88dbc17c8
Fix tests
2019-11-19 22:50:24 +09:00
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
2019-11-19 13:16:49 +00:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header
2019-11-19 15:58:20 +07:00
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
2019-11-18 16:16:27 +00:00
adacf1b5e1
Remove deprecated endpoint from docs that is fully removed from backend now
2019-11-18 16:16:27 +00:00
