sadposter
1e11b97c1b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-26 23:22:24 +01: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
sadposter
f82d9e1359
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-25 13:33:10 +01: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
sadposter
ab55e41626
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-14 00:20:56 +01: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
sadposter
cc28184854
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-27 08:58:51 +01: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
sadposter
3fc4b078f2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-16 10:54:53 +01: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
sadposter
59c9b90169
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-10 23:43:32 +01: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
sadposter
325372b1e1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-07 08:59:31 +01: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
sadposter
3cc6cb266b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-31 14:23:03 +01: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
sadposter
e11058c20c
add user show task
2019-07-22 01:17:59 +01:00
sadposter
c2737d13df
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-20 14:28:30 +01:00
sadposter
ed1ce20c5a
add email util tasks
2019-07-20 14:28:25 +01:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
Ariadne Conill
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
Roman Chvanikov
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
sadposter
32ce409514
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-16 11:21:31 +01:00
Alex S
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
Alex S
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
sadposter
d4348eeb62
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-14 22:03:20 +01:00
Roman Chvanikov
b052a9d4d0
Update DigestEmailWorker to compile and send emails via queue
2019-07-14 22:32:11 +03:00
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
kaniini
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
sadposter
dbeb8f43fe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-09 21:08:12 +01:00
