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.
lain [Sat, 24 Aug 2019 13:48:33 +0000 (15:48 +0200)]
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
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.
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
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
rinpatch [Wed, 14 Aug 2019 22:10:44 +0000 (22:10 +0000)]
Merge branch 'fix/stats-send-after' into 'develop'
Collect stats immediately after init
See merge request pleroma/pleroma!1574
rinpatch [Wed, 14 Aug 2019 22:01:13 +0000 (01:01 +0300)]
Collect stats immediately after init
rinpatch [Wed, 14 Aug 2019 21:47:30 +0000 (00:47 +0300)]
Cache follow state
rinpatch [Wed, 14 Aug 2019 21:43:02 +0000 (00:43 +0300)]
Add a task to benchmark timeline rendering
Haelwenn (lanodan) Monnier [Wed, 14 Aug 2019 20:48:44 +0000 (22:48 +0200)]
html.ex: Allow sub and sup elements by default
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
rinpatch [Wed, 14 Aug 2019 19:22:15 +0000 (19:22 +0000)]
Merge branch 'misc-otp-issues' into 'develop'
Misc OTP issues
See merge request pleroma/pleroma!1567
rinpatch [Wed, 14 Aug 2019 19:16:52 +0000 (19:16 +0000)]
Merge branch 'fix/http-signatures-post' into 'develop'
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
kaniini [Wed, 14 Aug 2019 19:05:44 +0000 (19:05 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
rinpatch [Wed, 14 Aug 2019 19:03:39 +0000 (19:03 +0000)]
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'
MRF: fix up unserializable option lists in describe implementations
See merge request pleroma/pleroma!1568
Ariadne Conill [Wed, 14 Aug 2019 19:00:48 +0000 (19:00 +0000)]
activitypub: publisher: add (request-target) to http signature when POSTing
Ariadne Conill [Wed, 14 Aug 2019 18:53:18 +0000 (18:53 +0000)]
MRF: fix up unserializable option lists in describe implementations
stwf [Wed, 14 Aug 2019 18:01:11 +0000 (14:01 -0400)]
fix formatting
stwf [Wed, 14 Aug 2019 15:59:33 +0000 (11:59 -0400)]
Implement Pleroma.Stats as GenServer
stwf [Wed, 14 Aug 2019 15:58:32 +0000 (11:58 -0400)]
streamline Streamer pings
stwf [Wed, 14 Aug 2019 15:57:50 +0000 (11:57 -0400)]
Isolate OAuth.Token.CleanWorker
stwf [Wed, 14 Aug 2019 15:55:17 +0000 (11:55 -0400)]
use default child_specs
lain [Wed, 14 Aug 2019 15:07:03 +0000 (15:07 +0000)]
Merge branch 'fix/revert-tzdata-1.8' into 'develop'
Switch to pre-1.8 version of tzdata.
Closes #1183
See merge request pleroma/pleroma!1566
lain [Wed, 14 Aug 2019 15:01:11 +0000 (17:01 +0200)]
Conversations: Load relations in one query.
rinpatch [Wed, 14 Aug 2019 14:05:21 +0000 (17:05 +0300)]
Switch to pre-1.8 version of tzdata.
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
Egor Kislitsyn [Wed, 14 Aug 2019 14:03:25 +0000 (21:03 +0700)]
Fix compatibility with Elixir 1.8
lain [Wed, 14 Aug 2019 13:56:15 +0000 (15:56 +0200)]
Conversation: Render new participation on update.
lain [Wed, 14 Aug 2019 13:55:43 +0000 (15:55 +0200)]
Conversations: Use correct oauth paths for extended api.
Egor Kislitsyn [Wed, 14 Aug 2019 13:46:05 +0000 (20:46 +0700)]
Improve digest email template
lain [Wed, 14 Aug 2019 13:30:40 +0000 (15:30 +0200)]
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
Egor Kislitsyn [Thu, 8 Aug 2019 06:20:35 +0000 (13:20 +0700)]
Increase max account fields limits
Egor Kislitsyn [Wed, 7 Aug 2019 11:48:05 +0000 (18:48 +0700)]
Limit custom fields for old remote users
Egor Kislitsyn [Wed, 7 Aug 2019 11:14:22 +0000 (18:14 +0700)]
Add `:max_remote_account_fields` config option
Egor Kislitsyn [Tue, 6 Aug 2019 11:21:25 +0000 (18:21 +0700)]
Use info.fields instead of source_data for remote users
Egor Kislitsyn [Thu, 1 Aug 2019 08:09:15 +0000 (15:09 +0700)]
Add configurable account field name length limit
Egor Kislitsyn [Tue, 30 Jul 2019 10:22:52 +0000 (17:22 +0700)]
Add configurable account field value length limit
Egor Kislitsyn [Mon, 29 Jul 2019 12:17:09 +0000 (19:17 +0700)]
Linkify custom fields values in ActivityPub.UserViewx
Egor Kislitsyn [Mon, 29 Jul 2019 12:01:15 +0000 (19:01 +0700)]
Support user attachment update in Transmogrifier
Egor [Fri, 26 Jul 2019 12:08:46 +0000 (12:08 +0000)]
Apply suggestion to CHANGELOG.md
Egor Kislitsyn [Thu, 25 Jul 2019 12:35:34 +0000 (19:35 +0700)]
Add profile custom fields to ActivityPub.UserView
Egor Kislitsyn [Thu, 25 Jul 2019 12:33:18 +0000 (19:33 +0700)]
Add custom fields to TwitterAPI.UserView
Egor Kislitsyn [Thu, 25 Jul 2019 07:34:52 +0000 (14:34 +0700)]
Update CHANGELOG
Egor Kislitsyn [Wed, 24 Jul 2019 12:48:15 +0000 (19:48 +0700)]
Fix tests
Egor Kislitsyn [Wed, 24 Jul 2019 12:26:35 +0000 (19:26 +0700)]
Add custom profile fields
rinpatch [Wed, 14 Aug 2019 02:12:09 +0000 (02:12 +0000)]
Merge branch 'backport/describe-api-changelog' into 'develop'
Backport the describe API changelog entry to develop
See merge request pleroma/pleroma!1564
Ariadne Conill [Wed, 14 Aug 2019 01:36:42 +0000 (01:36 +0000)]
update changelog to cover MRF describe API.
kaniini [Wed, 14 Aug 2019 01:04:07 +0000 (01:04 +0000)]
Merge branch 'preload-user-timelines' into 'develop'
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
kaniini [Wed, 14 Aug 2019 01:03:54 +0000 (01:03 +0000)]
Merge branch 'get-context-optimizations' into 'develop'
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
rinpatch [Wed, 14 Aug 2019 00:02:09 +0000 (03:02 +0300)]
Preload thread mutes/bookmarks in user_statuses
rinpatch [Tue, 13 Aug 2019 23:36:54 +0000 (02:36 +0300)]
Preload thread mutes/bookmarks in get_context
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
rinpatch [Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)]
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
projects / akkoma / log