6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
73bcbf4fa3
add tests
5 years ago
bc78a875c8
Merge branch 'fix-default-config-account_field' into 'develop'
...
Fix default config of account fields length
See merge request pleroma/pleroma!1593
5 years ago
e5f76a54e6
Fix default config of account fields length
5 years ago
7a2a1ddfe4
Merge branch 'fix/add-likes-index-objects' into 'develop'
...
Add an index on object likes
See merge request pleroma/pleroma!1592
5 years ago
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
8dc6a6b210
fix /inbox for Relay
5 years ago
399ca9133b
fix test
5 years ago
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
0e50e9e4fa
Merge branch 'support/tests' into 'develop'
...
fixed clear config after test
See merge request pleroma/pleroma!1588
5 years ago
01653f618d
Merge branch 'improve-ap-routes-rate-limit' into 'develop'
...
Improve AP routes rate limit
See merge request pleroma/pleroma!1590
5 years ago
a79ebac592
Improve AP routes rate limit
5 years ago
64bfb41c55
fixed unfollow for relay actor
5 years ago
37229af15f
remove old user create and delete routes for admin
5 years ago
85bd8a4e31
fixed clear config after test
5 years ago
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
73884441f3
Merge branch 'chore/fix-flakey-aws-test' into 'develop'
...
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
See merge request pleroma/pleroma!1587
5 years ago
76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
5 years ago
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
8d899d6197
Add `:ap_routes` rate limit
5 years ago
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
cd2fd225dc
Update CHANGELOG
5 years ago
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
5171aa5b4d
Refactor check_actor_is_active
5 years ago
10696ce2ee
Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'
...
Reverse Proxy max_body_size is incorrect
See merge request pleroma/pleroma!1581
5 years ago
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
e5d2c0c669
Merge branch 'tests/database-digest-tests' into 'develop'
...
Add more tests for Database tasks and DigestEmailWorker
See merge request pleroma/pleroma!1577
5 years ago
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
5 years ago
222ac3bcbe
Merge branch 'support/test_helpers' into 'develop'
...
added test helpers to clear config after tests
See merge request pleroma/pleroma!1547
5 years ago
a320358703
added test helpers to clear config after tests
5 years ago
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
5 years ago
e652cef76b
removes duplicates from relay subscription list
5 years ago
608773c5ef
Merge branch 'chore/fix-ap-muted-tests' into 'develop'
...
tests: activitypub: fix muted thread tests
See merge request pleroma/pleroma!1584
5 years ago
a2fdc32368
tests: activitypub: fix typo
5 years ago
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
5 years ago
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
5 years ago
58c1391c4d
use commonAPI in tests
5 years ago
94e336d9d5
clear follow requests when blocking a user
5 years ago
cb222b72b3
Add changelog entry too
5 years ago
ef82f868d9
Formatting
5 years ago
3315a2a1c3
fixed User.unfollow with synchronization external user
5 years ago
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
158231cd20
Add configurable colors and logo for the digest template
5 years ago
6a3b1a526e
max_body_size -> max_body_length, as it should be
5 years ago
0f24edcd8d
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
...
Fix OAuth cleanup worker unconditionally starting
See merge request pleroma/pleroma!1578
5 years ago
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
5 years ago
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
5 years ago
aefb9cdee8
Merge branch 'feature/parallel-rendering' into 'develop'
...
Parallelize template rendering
See merge request pleroma/pleroma!1576
5 years ago
1ad71592ad
Parallelize template rendering
5 years ago
Maksim Pechnikov