summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-22fixMaksim Pechnikov
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
Add CLI list users command See merge request pleroma/pleroma!1990
2019-11-21Add CLI list users commandAlex Schroeder
2019-11-21Merge branch 'revert-5c6c3026' into 'develop'rinpatch
Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002
2019-11-21Merge branch 'fix/mix-task-logging' into 'develop'lain
Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997
2019-11-21Revert "Merge branch 'patch-1' into 'develop'"rinpatch
This reverts merge request !1829
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-21Object: Use inspect to log missing preload.lain
2019-11-21Merge branch 'fix/user-following-count' into 'develop'lain
Fix user.following_count See merge request pleroma/pleroma!2000
2019-11-21Merge branch 'remove-useless-warning' into 'develop'lain
Remove version mismatch warning See merge request pleroma/pleroma!2001
2019-11-21Remove version mismatch warningEgor Kislitsyn
2019-11-21Fix user.following_countEgor Kislitsyn
2019-11-20Some tasks try to set log level in test environment, but we were stripping ↵Mark Felder
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-20Console backend's log format should be prefixed and suffixed with newlines.Mark Felder
This is how upstream does it by default.
2019-11-20Merge branch 'develop' into fix/mix-task-loggingMark Felder
2019-11-20Be specific about format for logs in test as we have tests that check itMark Felder
2019-11-20[#1335] Added CHANGELOG.md entry.Ivan Tashkinov
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-20Merge branch 'fix/sporadic-tests' into 'develop'lain
Fix sporadically failing test Closes #1432 See merge request pleroma/pleroma!1999
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
Fix failing docker build See merge request pleroma/pleroma!1998
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Allow test builds to have info and debug logs strippedMark Felder
2019-11-19Allow mix tasks to always run with debug loggingMark Felder
2019-11-19Merge branch 'chore/bump-fe' into 'develop'rinpatch
Bump fe and sync changelogs See merge request pleroma/pleroma!1996
2019-11-20changelog: add 1.1.6 entries from stablerinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-19Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19Merge branch 'release/1.1.6' into 'stable'rinpatch
Release/1.1.6 See merge request pleroma/pleroma!1995
2019-11-19benchmarks/ added favourites timelineMaksim Pechnikov
2019-11-19fix order favorites activitesMaksim Pechnikov
2019-11-19changelog: fix wrong header levelsrinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-19mix.exs: bump version to 1.1.6rinpatch
2019-11-19UserEnabledPlug: fix test after backportingrinpatch
We didn't get rid of user info on stable yet
2019-11-19Add a changelog entry for email confirmation fixrinpatch
2019-11-19OAuthPlug, Router: Handle deactivated users in the UserEnabledPluglain
2019-11-19UserEnabledPlug: Don't authenticate unconfirmed users.lain
2019-11-19User: Don't let deactivated users authenticate.rinpatch
2019-11-19Add a changelog entry for oauth authorize fixrinpatch
2019-11-19Check client and token in GET /oauth/authorizeAkiraFukushima
2019-11-19Fix rendering conversations when there's a malformed statusrinpatch
2019-11-20remove docs/ from .dockerignorekPherox
2019-11-19Fix testsMaxim Filippov
2019-11-19Merge branch 'feature/admin-api/support-token-header' into 'develop'lain
Admin API: Support authentication via `x-admin-token` HTTP header Closes #1430 See merge request pleroma/pleroma!1993
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 07:32:07 +0000