rinpatch [Tue, 3 Sep 2019 13:03:06 +0000 (13:03 +0000)]
Merge branch 'feature/pagination-total' into 'develop'
Return total items count from pagination + tests
See merge request pleroma/pleroma!1620
Maxim Filippov [Tue, 3 Sep 2019 10:58:27 +0000 (13:58 +0300)]
Return "total" optionally
Maxim Filippov [Mon, 2 Sep 2019 19:48:52 +0000 (22:48 +0300)]
Return total from pagination + tests
feld [Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)]
Merge branch 'iss-930-media' into 'develop'
Fix missing changes in pleroma/pleroma!1197
See merge request pleroma/pleroma!1613
kPherox [Fri, 30 Aug 2019 12:00:50 +0000 (21:00 +0900)]
Fix missing changes in pleroma/pleroma!1197
kaniini [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Merge branch 'fix/antifollowbot-and-relays' into 'develop'
Fix AntiFollowbotPolicy when trying to follow a relay
Closes #1231
See merge request pleroma/pleroma!1610
feld [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Fix AntiFollowbotPolicy when trying to follow a relay
Haelwenn [Wed, 28 Aug 2019 07:10:35 +0000 (07:10 +0000)]
Merge branch 'fix-osada-follow' into 'develop'
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
lain [Tue, 27 Aug 2019 21:15:54 +0000 (21:15 +0000)]
Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
lain [Tue, 27 Aug 2019 20:59:09 +0000 (20:59 +0000)]
Merge branch 'tests/activity_pub' into 'develop'
added tests for ActivityPub.like\unlike
See merge request pleroma/pleroma!1606
Maksim [Tue, 27 Aug 2019 17:37:19 +0000 (17:37 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
lain [Tue, 27 Aug 2019 17:22:30 +0000 (12:22 -0500)]
Transmogrifier: Use Containment.get_actor to get actors.
Maksim Pechnikov [Tue, 27 Aug 2019 13:21:03 +0000 (16:21 +0300)]
added tests for ActivityPub.like\unlike
lain [Mon, 26 Aug 2019 19:37:24 +0000 (19:37 +0000)]
Merge branch 'fix-typo' into 'develop'
Fix typo
See merge request pleroma/pleroma!1603
lain [Mon, 26 Aug 2019 19:34:52 +0000 (14:34 -0500)]
Transmogrifier: Fix follow handling when the actor is an object.
Egor Kislitsyn [Mon, 26 Aug 2019 19:24:14 +0000 (02:24 +0700)]
Fix typo
rinpatch [Mon, 26 Aug 2019 14:44:11 +0000 (14:44 +0000)]
Merge branch 'fix/sporadic-test' into 'develop'
Fix sporadic test
Closes #1221
See merge request pleroma/pleroma!1602
Maxim Filippov [Mon, 26 Aug 2019 14:24:22 +0000 (17:24 +0300)]
Fix sporadic test
kaniini [Mon, 26 Aug 2019 14:01:51 +0000 (14:01 +0000)]
Merge branch 'disable-rate-limiter' into 'develop'
Disable rate limiter by default
Closes #1217
See merge request pleroma/pleroma!1601
Egor Kislitsyn [Mon, 26 Aug 2019 13:36:44 +0000 (20:36 +0700)]
Disable rate limiter by default
Egor Kislitsyn [Mon, 26 Aug 2019 12:34:43 +0000 (19:34 +0700)]
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
Egor Kislitsyn [Mon, 26 Aug 2019 12:32:47 +0000 (19:32 +0700)]
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
Egor Kislitsyn [Mon, 26 Aug 2019 12:37:54 +0000 (19:37 +0700)]
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
Egor Kislitsyn [Mon, 26 Aug 2019 12:16:40 +0000 (19:16 +0700)]
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
Egor Kislitsyn [Mon, 26 Aug 2019 11:59:57 +0000 (18:59 +0700)]
Add validation in Pleroma.List.create/2
kaniini [Sun, 25 Aug 2019 19:43:27 +0000 (19:43 +0000)]
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
kaniini [Sun, 25 Aug 2019 19:39:37 +0000 (19:39 +0000)]
Merge branch 'feature/moderation-log' into 'develop'
Log admin/moderator actions
See merge request pleroma/pleroma!1582
Maxim Filippov [Sun, 25 Aug 2019 19:39:37 +0000 (19:39 +0000)]
Log admin/moderator actions
kaniini [Sun, 25 Aug 2019 19:35:28 +0000 (19:35 +0000)]
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
kPherox [Sun, 25 Aug 2019 17:00:41 +0000 (02:00 +0900)]
Update test for custom profile fields
lain [Sun, 25 Aug 2019 16:12:13 +0000 (16:12 +0000)]
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
rinpatch [Sun, 25 Aug 2019 08:09:18 +0000 (08:09 +0000)]
Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'
HttpRequestMock: Log non-implemented mock responses
Closes #1088
See merge request pleroma/pleroma!1416
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:55:29 +0000 (08:55 +0200)]
HttpRequestMock: Remove useless `error = error`
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:48:38 +0000 (08:48 +0200)]
user_test.exs: fix rel=me tests
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:03:25 +0000 (08:03 +0200)]
Implement missing mocks for rel=me
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 05:33:46 +0000 (07:33 +0200)]
HttpRequestMock: Improve non-implemented error message
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 05:10:22 +0000 (07:10 +0200)]
HttpRequestMock: Log mock errors as warnings
kPherox [Sat, 24 Aug 2019 16:28:38 +0000 (01:28 +0900)]
Change to use attachment only when fields do not exist
lain [Sat, 24 Aug 2019 16:04:19 +0000 (16:04 +0000)]
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
kaniini [Sat, 24 Aug 2019 16:01:57 +0000 (16:01 +0000)]
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
lain [Sat, 24 Aug 2019 15:33:17 +0000 (15:33 +0000)]
Update CHANGELOG.md
lain [Sat, 24 Aug 2019 15:28:19 +0000 (17:28 +0200)]
Activity expiration: Fix docs.
lain [Sat, 24 Aug 2019 15:22:48 +0000 (17:22 +0200)]
Activity Expiration: Switch to 'expires_in' system.
lain [Sat, 24 Aug 2019 15:22:26 +0000 (17:22 +0200)]
ActivityExpirationWorker: Fix merge issues.
Maksim Pechnikov [Sat, 24 Aug 2019 14:41:53 +0000 (17:41 +0300)]
update tests
Maksim Pechnikov [Sat, 24 Aug 2019 14:17:17 +0000 (17:17 +0300)]
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
lain [Sat, 24 Aug 2019 13:48:33 +0000 (15:48 +0200)]
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
Maksim Pechnikov [Fri, 23 Aug 2019 18:17:14 +0000 (21:17 +0300)]
add tests
kaniini [Fri, 23 Aug 2019 21:28:52 +0000 (21:28 +0000)]
Merge branch 'fix-default-config-account_field' into 'develop'
Fix default config of account fields length
See merge request pleroma/pleroma!1593
aries [Fri, 23 Aug 2019 21:28:52 +0000 (21:28 +0000)]
Fix default config of account fields length
kaniini [Fri, 23 Aug 2019 01:41:18 +0000 (01:41 +0000)]
Merge branch 'fix/add-likes-index-objects' into 'develop'
Add an index on object likes
See merge request pleroma/pleroma!1592
rinpatch [Fri, 23 Aug 2019 00:17:20 +0000 (03:17 +0300)]
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.
Maksim Pechnikov [Thu, 22 Aug 2019 19:39:06 +0000 (22:39 +0300)]
fix /inbox for Relay
Maksim Pechnikov [Thu, 22 Aug 2019 18:32:40 +0000 (21:32 +0300)]
fix test
Maksim Pechnikov [Thu, 22 Aug 2019 18:13:03 +0000 (21:13 +0300)]
Merge branch 'develop' into issue/1177
feld [Thu, 22 Aug 2019 17:37:01 +0000 (17:37 +0000)]
Merge branch 'support/tests' into 'develop'
fixed clear config after test
See merge request pleroma/pleroma!1588
lain [Thu, 22 Aug 2019 10:20:50 +0000 (10:20 +0000)]
Merge branch 'improve-ap-routes-rate-limit' into 'develop'
Improve AP routes rate limit
See merge request pleroma/pleroma!1590
Egor Kislitsyn [Thu, 22 Aug 2019 09:03:43 +0000 (16:03 +0700)]
Improve AP routes rate limit
Maksim Pechnikov [Thu, 22 Aug 2019 03:57:55 +0000 (06:57 +0300)]
fixed unfollow for relay actor
Sachin Joshi [Wed, 21 Aug 2019 18:30:00 +0000 (00:15 +0545)]
remove old user create and delete routes for admin
Maksim Pechnikov [Wed, 21 Aug 2019 18:24:35 +0000 (21:24 +0300)]
fixed clear config after test
lain [Wed, 21 Aug 2019 16:45:20 +0000 (16:45 +0000)]
Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes
See merge request pleroma/pleroma!1586
kaniini [Tue, 20 Aug 2019 20:28:54 +0000 (20:28 +0000)]
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
Ariadne Conill [Tue, 20 Aug 2019 20:19:23 +0000 (20:19 +0000)]
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
lain [Tue, 20 Aug 2019 19:34:47 +0000 (19:34 +0000)]
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
Egor Kislitsyn [Tue, 20 Aug 2019 15:10:36 +0000 (22:10 +0700)]
Add `:ap_routes` rate limit
lain [Tue, 20 Aug 2019 12:55:51 +0000 (12:55 +0000)]
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
Egor Kislitsyn [Tue, 20 Aug 2019 12:50:50 +0000 (19:50 +0700)]
Update CHANGELOG
lain [Tue, 20 Aug 2019 12:44:14 +0000 (12:44 +0000)]
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
Maxim Filippov [Mon, 19 Aug 2019 17:36:25 +0000 (20:36 +0300)]
Refactor check_actor_is_active
lain [Mon, 19 Aug 2019 17:05:30 +0000 (17:05 +0000)]
Merge branch 'fix/reverse-proxy-body-too-large' into 'develop'
Reverse Proxy max_body_size is incorrect
See merge request pleroma/pleroma!1581
lain [Mon, 19 Aug 2019 17:00:59 +0000 (17:00 +0000)]
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
lain [Mon, 19 Aug 2019 16:10:00 +0000 (16:10 +0000)]
Merge branch 'tests/database-digest-tests' into 'develop'
Add more tests for Database tasks and DigestEmailWorker
See merge request pleroma/pleroma!1577
Sergey Suprunenko [Mon, 19 Aug 2019 16:10:00 +0000 (16:10 +0000)]
Add more tests for Database tasks and DigestEmailWorker
lain [Mon, 19 Aug 2019 15:34:29 +0000 (15:34 +0000)]
Merge branch 'support/test_helpers' into 'develop'
added test helpers to clear config after tests
See merge request pleroma/pleroma!1547
Maksim [Mon, 19 Aug 2019 15:34:29 +0000 (15:34 +0000)]
added test helpers to clear config after tests
lain [Mon, 19 Aug 2019 14:36:10 +0000 (14:36 +0000)]
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
Maksim Pechnikov [Mon, 19 Aug 2019 10:31:56 +0000 (13:31 +0300)]
removes duplicates from relay subscription list
kaniini [Sun, 18 Aug 2019 22:33:51 +0000 (22:33 +0000)]
Merge branch 'chore/fix-ap-muted-tests' into 'develop'
tests: activitypub: fix muted thread tests
See merge request pleroma/pleroma!1584
Ariadne Conill [Sun, 18 Aug 2019 22:21:31 +0000 (22:21 +0000)]
tests: activitypub: fix typo
kaniini [Sun, 18 Aug 2019 21:59:22 +0000 (21:59 +0000)]
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
kaniini [Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)]
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
Sadposter [Sun, 18 Aug 2019 21:54:40 +0000 (22:54 +0100)]
use commonAPI in tests
Sadposter [Sun, 18 Aug 2019 19:29:31 +0000 (20:29 +0100)]
clear follow requests when blocking a user
Mark Felder [Fri, 16 Aug 2019 15:28:07 +0000 (10:28 -0500)]
Add changelog entry too
Mark Felder [Fri, 16 Aug 2019 15:00:18 +0000 (10:00 -0500)]
Formatting
Maksim Pechnikov [Fri, 16 Aug 2019 12:58:42 +0000 (15:58 +0300)]
fixed User.unfollow with synchronization external user
lain [Fri, 16 Aug 2019 12:55:33 +0000 (12:55 +0000)]
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
Egor Kislitsyn [Fri, 16 Aug 2019 11:32:25 +0000 (18:32 +0700)]
Add configurable colors and logo for the digest template
Mark Felder [Thu, 15 Aug 2019 20:34:41 +0000 (15:34 -0500)]
max_body_size -> max_body_length, as it should be
rinpatch [Thu, 15 Aug 2019 17:51:30 +0000 (17:51 +0000)]
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
Fix OAuth cleanup worker unconditionally starting
See merge request pleroma/pleroma!1578
rinpatch [Thu, 15 Aug 2019 17:36:20 +0000 (20:36 +0300)]
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
kaniini [Thu, 15 Aug 2019 17:34:16 +0000 (17:34 +0000)]
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
lain [Thu, 15 Aug 2019 15:51:11 +0000 (15:51 +0000)]
Merge branch 'feature/parallel-rendering' into 'develop'
Parallelize template rendering
See merge request pleroma/pleroma!1576
rinpatch [Thu, 15 Aug 2019 14:41:26 +0000 (17:41 +0300)]
Parallelize template rendering
rinpatch [Thu, 15 Aug 2019 14:37:30 +0000 (17:37 +0300)]
Hide muted theads from home/public timelines unless `with_muted` is set
lain [Thu, 15 Aug 2019 14:06:27 +0000 (14:06 +0000)]
Merge branch 'cache-follow-state' into 'develop'
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
Maxim Filippov [Wed, 14 Aug 2019 22:45:32 +0000 (22:45 +0000)]
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
Maxim Filippov [Wed, 14 Aug 2019 22:42:43 +0000 (01:42 +0300)]
Fix CHANGELOG entry
Maxim Filippov [Wed, 14 Aug 2019 22:35:29 +0000 (01:35 +0300)]
Do not check if actor is active when deleting a user
projects / akkoma / log