76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
2019-08-20 20:20:12 +00:00
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
8d899d6197
Add `:ap_routes` rate limit
2019-08-20 22:10:36 +07:00
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
cd2fd225dc
Update CHANGELOG
2019-08-20 19:50:50 +07:00
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
5171aa5b4d
Refactor check_actor_is_active
2019-08-19 20:36:25 +03:00
10696ce2ee
Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'
...
Reverse Proxy max_body_size is incorrect
See merge request pleroma/pleroma!1581
2019-08-19 17:05:30 +00:00
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
e5d2c0c669
Merge branch 'tests/database-digest-tests' into 'develop'
...
Add more tests for Database tasks and DigestEmailWorker
See merge request pleroma/pleroma!1577
2019-08-19 16:10:00 +00:00
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
2019-08-19 16:10:00 +00:00
222ac3bcbe
Merge branch 'support/test_helpers' into 'develop'
...
added test helpers to clear config after tests
See merge request pleroma/pleroma!1547
2019-08-19 15:34:29 +00:00
a320358703
added test helpers to clear config after tests
2019-08-19 15:34:29 +00:00
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
608773c5ef
Merge branch 'chore/fix-ap-muted-tests' into 'develop'
...
tests: activitypub: fix muted thread tests
See merge request pleroma/pleroma!1584
2019-08-18 22:33:51 +00:00
a2fdc32368
tests: activitypub: fix typo
2019-08-18 22:31:59 +00:00
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
2019-08-18 21:59:22 +00:00
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
58c1391c4d
use commonAPI in tests
2019-08-18 22:54:40 +01:00
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
cb222b72b3
Add changelog entry too
2019-08-16 10:28:07 -05:00
ef82f868d9
Formatting
2019-08-16 10:00:18 -05:00
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
6a3b1a526e
max_body_size -> max_body_length, as it should be
2019-08-15 15:34:41 -05:00
0f24edcd8d
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
...
Fix OAuth cleanup worker unconditionally starting
See merge request pleroma/pleroma!1578
2019-08-15 17:51:30 +00:00
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
2019-08-15 20:36:20 +03:00
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
2019-08-15 17:34:16 +00:00
aefb9cdee8
Merge branch 'feature/parallel-rendering' into 'develop'
...
Parallelize template rendering
See merge request pleroma/pleroma!1576
2019-08-15 15:51:11 +00:00
1ad71592ad
Parallelize template rendering
2019-08-15 18:05:50 +03:00
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
2019-08-15 17:37:30 +03:00
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
2019-08-15 14:06:27 +00:00
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
b27fafe161
Fix CHANGELOG entry
2019-08-15 01:42:43 +03:00
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
27b747546a
Merge branch 'fix/stats-send-after' into 'develop'
...
Collect stats immediately after init
See merge request pleroma/pleroma!1574
2019-08-14 22:10:44 +00:00
e8a8d50138
Collect stats immediately after init
2019-08-15 01:01:13 +03:00
bd5ad0af78
Cache follow state
2019-08-15 00:47:30 +03:00
a9e75fa6a4
Add a task to benchmark timeline rendering
2019-08-15 00:43:02 +03:00
a6a814420d
html.ex: Allow sub and sup elements by default
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-14 22:49:13 +02:00
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
2019-08-14 19:22:15 +00:00
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
2019-08-14 19:16:52 +00:00
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
2019-08-14 19:05:44 +00:00
4be71c91e0
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'
...
MRF: fix up unserializable option lists in describe implementations
See merge request pleroma/pleroma!1568
2019-08-14 19:03:39 +00:00
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
c43152f6c1
fix formatting
2019-08-14 14:01:11 -04:00
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
Ariadne Conill