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 |
|
Maksim Pechnikov
|
1d6970baf1
|
fix
|
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 |
|
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
|
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 |
|
Ivan Tashkinov
|
81f1c6bc47
|
[#1335] Added CHANGELOG.md entry.
|
5 years ago |
|
Ivan Tashkinov
|
4f88b1b435
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
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 |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
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 |
|
Ivan Tashkinov
|
555edd01ab
|
[#1335] User AP ID relations fetching performance optimizations.
|
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 |
|
Ivan Tashkinov
|
565f261338
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
|
rinpatch
|
0ba3f1ffb2
|
Merge branch 'release/1.1.6' into 'stable'
Release/1.1.6
See merge request pleroma/pleroma!1995
|
5 years ago |
|
Maksim Pechnikov
|
1fcd579b6d
|
benchmarks/ added favourites timeline
|
5 years ago |
|
Maksim Pechnikov
|
708fd234bd
|
fix order favorites activites
|
5 years ago |
|
rinpatch
|
34206e4d7f
|
changelog: fix wrong header levels
|
5 years ago |
|
rinpatch
|
c2e9c1c8a5
|
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
|
5 years ago |
|
rinpatch
|
b24b848057
|
mix.exs: bump version to 1.1.6
|
5 years ago |
|
rinpatch
|
5386d1f49f
|
UserEnabledPlug: fix test after backporting
We didn't get rid of user info on stable yet
|
5 years ago |
|
rinpatch
|
957fb059df
|
Add a changelog entry for email confirmation fix
|
5 years ago |
|
lain
|
4079ed3b75
|
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
|
5 years ago |
|
lain
|
5b5f855237
|
UserEnabledPlug: Don't authenticate unconfirmed users.
|
5 years ago |
|
rinpatch
|
ff4af8c5ee
|
User: Don't let deactivated users authenticate.
|
5 years ago |
|
rinpatch
|
3527a03e58
|
Add a changelog entry for oauth authorize fix
|
5 years ago |
|
AkiraFukushima
|
df22197755
|
Check client and token in GET /oauth/authorize
|
5 years ago |
|
rinpatch
|
b74f4260ae
|
Fix rendering conversations when there's a malformed status
|
5 years ago |
|
kPherox
|
b7bbb5445d
|
remove docs/ from .dockerignore
|
5 years ago |
|
Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
5 years ago |
