Commit graph

8690 commits

Author SHA1 Message Date
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
Ivan Tashkinov
1636cc5b7e Removed users.info and remaining usages. 2019-11-23 14:06:19 +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
Maksim Pechnikov
1d6970baf1 fix 2019-11-22 14:17:12 +03: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
Ivan Tashkinov
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
2019-11-21 16:47:52 +03: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
Ivan Tashkinov
81f1c6bc47 [#1335] Added CHANGELOG.md entry. 2019-11-20 15:57:51 +03:00
Ivan Tashkinov
4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-20 15:47:11 +03: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
Ivan Tashkinov
de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03: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
Ivan Tashkinov
555edd01ab [#1335] User AP ID relations fetching performance optimizations. 2019-11-20 12:19:07 +03: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
Ivan Tashkinov
565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-19 23:22:47 +03:00
Ivan Tashkinov
ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
rinpatch
0ba3f1ffb2 Merge branch 'release/1.1.6' into 'stable'
Release/1.1.6

See merge request pleroma/pleroma!1995
2019-11-19 20:04:19 +00:00
Maksim Pechnikov
1fcd579b6d benchmarks/ added favourites timeline 2019-11-19 21:11:15 +03:00
Maksim Pechnikov
708fd234bd fix order favorites activites 2019-11-19 20:19:41 +03:00
rinpatch
34206e4d7f changelog: fix wrong header levels 2019-11-19 19:47:03 +03:00
rinpatch
c2e9c1c8a5 bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 2019-11-19 19:45:20 +03:00
rinpatch
b24b848057 mix.exs: bump version to 1.1.6 2019-11-19 19:36:37 +03:00
rinpatch
5386d1f49f UserEnabledPlug: fix test after backporting
We didn't get rid of user info on stable yet
2019-11-19 19:34:44 +03:00
rinpatch
957fb059df Add a changelog entry for email confirmation fix 2019-11-19 19:24:45 +03:00
lain
4079ed3b75 OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-19 19:24:13 +03:00
lain
5b5f855237 UserEnabledPlug: Don't authenticate unconfirmed users. 2019-11-19 19:23:21 +03:00
rinpatch
ff4af8c5ee User: Don't let deactivated users authenticate. 2019-11-19 19:22:20 +03:00