lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
|
kaniini
|
83aeb60900
|
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
|
2019-08-24 16:01:57 +00:00 |
|
lain
|
1d7033d962
|
Update CHANGELOG.md
|
2019-08-24 15:33:17 +00:00 |
|
lain
|
24994f3e0c
|
Activity expiration: Fix docs.
|
2019-08-24 17:28:19 +02:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
lain
|
1692fa8945
|
ActivityExpirationWorker: Fix merge issues.
|
2019-08-24 17:22:26 +02:00 |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
2019-08-24 17:41:53 +03:00 |
|
Maksim Pechnikov
|
6062017493
|
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
|
2019-08-24 17:17:17 +03:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02:00 |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
2019-08-24 11:03:13 +03:00 |
|
kaniini
|
bc78a875c8
|
Merge branch 'fix-default-config-account_field' into 'develop'
Fix default config of account fields length
See merge request pleroma/pleroma!1593
|
2019-08-23 21:28:52 +00:00 |
|
aries
|
e5f76a54e6
|
Fix default config of account fields length
|
2019-08-23 21:28:52 +00:00 |
|
kaniini
|
7a2a1ddfe4
|
Merge branch 'fix/add-likes-index-objects' into 'develop'
Add an index on object likes
See merge request pleroma/pleroma!1592
|
2019-08-23 01:41:18 +00:00 |
|
rinpatch
|
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.
|
2019-08-23 03:17:20 +03:00 |
|
Maksim Pechnikov
|
8dc6a6b210
|
fix /inbox for Relay
|
2019-08-22 22:48:07 +03:00 |
|
Maksim Pechnikov
|
399ca9133b
|
fix test
|
2019-08-22 21:54:37 +03:00 |
|
Maksim Pechnikov
|
f95b67c933
|
Merge branch 'develop' into issue/1177
|
2019-08-22 21:13:03 +03:00 |
|
feld
|
0e50e9e4fa
|
Merge branch 'support/tests' into 'develop'
fixed clear config after test
See merge request pleroma/pleroma!1588
|
2019-08-22 17:37:01 +00:00 |
|
lain
|
01653f618d
|
Merge branch 'improve-ap-routes-rate-limit' into 'develop'
Improve AP routes rate limit
See merge request pleroma/pleroma!1590
|
2019-08-22 10:20:50 +00:00 |
|
Egor Kislitsyn
|
a79ebac592
|
Improve AP routes rate limit
|
2019-08-22 16:03:43 +07:00 |
|
Maksim Pechnikov
|
64bfb41c55
|
fixed unfollow for relay actor
|
2019-08-22 06:57:55 +03:00 |
|
Sachin Joshi
|
37229af15f
|
remove old user create and delete routes for admin
|
2019-08-22 00:15:00 +05:45 |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03:00 |
|
lain
|
f740d786a3
|
Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes
See merge request pleroma/pleroma!1586
|
2019-08-21 16:45:20 +00:00 |
|
kaniini
|
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
|
2019-08-20 20:28:54 +00:00 |
|
Ariadne Conill
|
76bb3572dd
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
2019-08-20 20:20:12 +00:00 |
|
lain
|
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 |
|
Egor Kislitsyn
|
8d899d6197
|
Add :ap_routes rate limit
|
2019-08-20 22:10:36 +07: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 |
|
Egor Kislitsyn
|
cd2fd225dc
|
Update CHANGELOG
|
2019-08-20 19:50:50 +07:00 |
|
lain
|
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 |
|
Maxim Filippov
|
5171aa5b4d
|
Refactor check_actor_is_active
|
2019-08-19 20:36:25 +03:00 |
|
lain
|
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 |
|
lain
|
d2c9befc64
|
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
|
2019-08-19 17:00:59 +00:00 |
|
lain
|
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 |
|
Sergey Suprunenko
|
75a5dd41ee
|
Add more tests for Database tasks and DigestEmailWorker
|
2019-08-19 16:10:00 +00:00 |
|
lain
|
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 |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00:00 |
|
lain
|
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 |
|
Maksim Pechnikov
|
e652cef76b
|
removes duplicates from relay subscription list
|
2019-08-19 13:39:18 +03:00 |
|
kaniini
|
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 |
|
Ariadne Conill
|
a2fdc32368
|
tests: activitypub: fix typo
|
2019-08-18 22:31:59 +00:00 |
|
kaniini
|
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 |
|
kaniini
|
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 |
|
Sadposter
|
58c1391c4d
|
use commonAPI in tests
|
2019-08-18 22:54:40 +01:00 |
|
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
2019-08-18 20:30:57 +01:00 |
|
Mark Felder
|
cb222b72b3
|
Add changelog entry too
|
2019-08-16 10:28:07 -05:00 |
|
Mark Felder
|
ef82f868d9
|
Formatting
|
2019-08-16 10:00:18 -05:00 |
|
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
2019-08-16 15:58:42 +03:00 |
|
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
2019-08-16 12:55:33 +00:00 |
|