Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maksim Pechnikov
9dfaa0b832
fix loads config variable with large value from db
5 years ago
lain
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
Egor Kislitsyn
356a936ecb
Fix `mix pleroma.user list` task
5 years ago
Maksim Pechnikov
a36607c27e
add mix task to set\unset privacy option of notification
5 years ago
Alex Schroeder
fbc379d689
Add CLI list users command
5 years ago
Alexander
6a4201e0b4
fix for migrate task
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
rinpatch
fd6d05dc45
Merge branch 'mix-emoji-task-pack-json' into 'develop'
...
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
5 years ago
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Ekaterina Vaartis
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
5 years ago
Maxim Filippov
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
rinpatch
1cae564b5d
Move config task docs to a separate file and mark it as WIP
5 years ago
rinpatch
e00403af23
Mix tasks: derive moduledoc from doc files
5 years ago
rinpatch
6baa037903
Move database maintenance tasks docs to a separate file
5 years ago
rinpatch
b4ca864c6b
Move user tasks docs to a separate file
5 years ago
rinpatch
d39ccc2e7f
Move uploads task docs to a separate file
5 years ago
rinpatch
808d0a0170
Move relay docs to a separate file
5 years ago
rinpatch
6435ba83cd
Move instance CLI task docs to a text file
5 years ago
rinpatch
869ea2ab90
Move digest email docs to a separate file and improve styling
5 years ago
rinpatch
bd9c7807fb
Move emoji task docs to a separate file
5 years ago
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
5 years ago
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
5 years ago
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
rinpatch
5a76d5d239
Add extended benchmark
5 years ago
Alex S
38b29779c3
refactoring
5 years ago
Alex S
57dc59d98d
little fix
5 years ago
Alex S
8f5ee7db06
typo fix
5 years ago
Alex S
6721301086
some changes
5 years ago
Alex S
0559c82bdb
fix
5 years ago
Alex S
511d93fa54
mix docs generates config.md
5 years ago
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
5 years ago
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
5 years ago
rinpatch
1ad71592ad
Parallelize template rendering
5 years ago
rinpatch
a9e75fa6a4
Add a task to benchmark timeline rendering
5 years ago
Egor Kislitsyn
4b7f1c6995
Improve digest email template
5 years ago