Alexander
6a4201e0b4
fix for migrate task
2019-11-10 22:54:37 +03:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
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
2019-10-20 20:43:18 +03:00
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
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
2019-10-19 08:51:03 +00:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
Ekaterina Vaartis
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
2019-10-15 09:53:28 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
rinpatch
1cae564b5d
Move config task docs to a separate file and mark it as WIP
2019-10-03 14:12:57 +03:00
rinpatch
e00403af23
Mix tasks: derive moduledoc from doc files
2019-10-03 14:00:23 +03:00
rinpatch
6baa037903
Move database maintenance tasks docs to a separate file
2019-10-03 11:17:29 +03:00
rinpatch
b4ca864c6b
Move user tasks docs to a separate file
2019-10-03 10:15:24 +03:00
rinpatch
d39ccc2e7f
Move uploads task docs to a separate file
2019-10-03 09:35:21 +03:00
rinpatch
808d0a0170
Move relay docs to a separate file
2019-10-03 09:10:31 +03:00
rinpatch
6435ba83cd
Move instance CLI task docs to a text file
2019-10-03 09:06:06 +03:00
rinpatch
869ea2ab90
Move digest email docs to a separate file and improve styling
2019-10-03 01:10:36 +03:00
rinpatch
bd9c7807fb
Move emoji task docs to a separate file
2019-10-03 01:03:47 +03:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
rinpatch
5a76d5d239
Add extended benchmark
2019-09-11 11:13:17 +03:00
Alex S
38b29779c3
refactoring
2019-09-11 09:25:33 +03:00
Alex S
57dc59d98d
little fix
2019-09-11 09:25:33 +03:00
Alex S
8f5ee7db06
typo fix
2019-09-11 09:25:33 +03:00
Alex S
6721301086
some changes
2019-09-11 09:25:33 +03:00
Alex S
0559c82bdb
fix
2019-09-11 09:25:33 +03:00
Alex S
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
2019-09-10 22:01:45 +03:00
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
rinpatch
1ad71592ad
Parallelize template rendering
2019-08-15 18:05:50 +03:00
rinpatch
a9e75fa6a4
Add a task to benchmark timeline rendering
2019-08-15 00:43:02 +03:00
Egor Kislitsyn
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
Ariadne Conill
cef3af5536
tasks: relay: add list task
2019-08-03 23:17:17 +00:00
Haelwenn (lanodan) Monnier
8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]
2019-08-02 23:38:02 +02:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
Alexander Strizhakov
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
