Ivan Tashkinov [Tue, 17 Sep 2019 13:16:11 +0000 (16:16 +0300)]
[#1260] Rate-limiting for create authentication and related requests.
Haelwenn [Mon, 16 Sep 2019 15:11:05 +0000 (15:11 +0000)]
Merge branch 'update-fields-limit' into 'develop'
Set `account_field_value_length` limit to 2048 by default
Closes #1249
See merge request pleroma/pleroma!1678
Egor Kislitsyn [Mon, 16 Sep 2019 14:48:01 +0000 (21:48 +0700)]
Set `account_field_value_length` limit to 2048 by default
rinpatch [Mon, 16 Sep 2019 10:59:44 +0000 (10:59 +0000)]
Merge branch 'fix/develop' into 'develop'
Add "Streamer refactoring" back to `develop`
See merge request pleroma/pleroma!1675
Egor Kislitsyn [Mon, 16 Sep 2019 10:03:37 +0000 (17:03 +0700)]
Revert "Merge branch 'revert-
4fabf83a' into 'develop'"
This reverts commit
fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to
4fabf83ad01352442906d79187aeab4c777f4df8.
rinpatch [Mon, 16 Sep 2019 10:34:03 +0000 (10:34 +0000)]
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'
Fix signed fetch inclusion publisher test
See merge request pleroma/pleroma!1676
rinpatch [Mon, 16 Sep 2019 10:23:06 +0000 (13:23 +0300)]
Fix signed fetch inclusion publisher test
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
kaniini [Mon, 16 Sep 2019 09:09:32 +0000 (09:09 +0000)]
Merge branch 'revert-
4fabf83a' into 'develop'
Revert "Merge branch 'streamer-refactoring' into 'develop'"
See merge request pleroma/pleroma!1674
kaniini [Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)]
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
kaniini [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Merge branch 'streamer-refactoring' into 'develop'
Streamer refactoring
See merge request pleroma/pleroma!1653
Steven Fuchs [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Streamer refactoring
kaniini [Mon, 16 Sep 2019 07:39:58 +0000 (07:39 +0000)]
Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
kaniini [Mon, 16 Sep 2019 07:37:54 +0000 (07:37 +0000)]
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
kaniini [Mon, 16 Sep 2019 07:36:57 +0000 (07:36 +0000)]
Merge branch 'fix/race-in-tests' into 'develop'
Fix a race condition in tests
See merge request pleroma/pleroma!1673
Egor Kislitsyn [Mon, 16 Sep 2019 05:55:05 +0000 (12:55 +0700)]
Fix a race condition in tests
rinpatch [Sun, 15 Sep 2019 20:22:17 +0000 (20:22 +0000)]
Merge branch '1149-oban-job-queue' into 'develop'
[#1149] `oban`-based job & retry queues
Closes #1149
See merge request pleroma/pleroma!1518
Maksim Pechnikov [Sun, 15 Sep 2019 11:53:58 +0000 (14:53 +0300)]
added prepare html for RichMedia.Parser
Ivan Tashkinov [Sun, 15 Sep 2019 07:15:57 +0000 (10:15 +0300)]
[#1149] Reinstated docs/config.md changes.
Ivan Tashkinov [Sun, 15 Sep 2019 07:12:24 +0000 (10:12 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
rinpatch [Sat, 14 Sep 2019 17:26:35 +0000 (17:26 +0000)]
Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
rinpatch [Sat, 14 Sep 2019 16:39:42 +0000 (16:39 +0000)]
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
Ivan Tashkinov [Sat, 14 Sep 2019 13:28:59 +0000 (16:28 +0300)]
[#1149] Rewritten readme as config/description.exs.
Ivan Tashkinov [Sat, 14 Sep 2019 13:11:44 +0000 (16:11 +0300)]
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
rinpatch [Sat, 14 Sep 2019 12:36:08 +0000 (12:36 +0000)]
Merge branch 'fix-tests' into 'develop'
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
Egor Kislitsyn [Sat, 14 Sep 2019 12:31:20 +0000 (19:31 +0700)]
Fix `Activity.all_by_actor_and_id/2` test
rinpatch [Sat, 14 Sep 2019 11:44:34 +0000 (11:44 +0000)]
Merge branch 'security/fav-reblog-access-control' into 'develop'
Mastodon API: Respect post privacy in favourited/reblogged endpoints
See merge request pleroma/pleroma!1667
rinpatch [Sat, 14 Sep 2019 10:50:08 +0000 (10:50 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Sat, 14 Sep 2019 10:46:35 +0000 (10:46 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Fri, 13 Sep 2019 22:50:15 +0000 (01:50 +0300)]
Mastodon API: Respect post privacy in favourited/reblogged endpoints
lain [Fri, 13 Sep 2019 17:07:14 +0000 (17:07 +0000)]
Merge branch 'capture-test-errors' into 'develop'
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
lain [Fri, 13 Sep 2019 17:06:38 +0000 (17:06 +0000)]
Merge branch 'refactor/add_link_headers' into 'develop'
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
rinpatch [Fri, 13 Sep 2019 16:42:53 +0000 (19:42 +0300)]
Merge branch 'develop' into feature/delivery-tracking
rinpatch [Fri, 13 Sep 2019 16:28:35 +0000 (19:28 +0300)]
Disallow NULLs in deliveries
Alex S [Fri, 13 Sep 2019 16:13:04 +0000 (19:13 +0300)]
don't track generated_config.md
Alex S [Fri, 13 Sep 2019 16:03:39 +0000 (19:03 +0300)]
config.md back
Alex S [Fri, 13 Sep 2019 16:02:42 +0000 (19:02 +0300)]
markdown generation to the new file
stwf [Fri, 13 Sep 2019 15:46:41 +0000 (11:46 -0400)]
Capture test error messages where appropriate
rinpatch [Fri, 13 Sep 2019 15:25:15 +0000 (15:25 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 15:23:26 +0000 (15:23 +0000)]
Apply suggestion to lib/pleroma/delivery.ex
rinpatch [Fri, 13 Sep 2019 15:23:03 +0000 (15:23 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
lain [Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)]
Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
Haelwenn [Fri, 13 Sep 2019 12:46:16 +0000 (12:46 +0000)]
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
rinpatch [Fri, 13 Sep 2019 12:36:24 +0000 (12:36 +0000)]
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
rinpatch [Fri, 13 Sep 2019 10:09:56 +0000 (10:09 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 10:09:46 +0000 (10:09 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 09:06:31 +0000 (12:06 +0300)]
Remove unused functions and fix credo issues
rinpatch [Fri, 13 Sep 2019 08:36:49 +0000 (11:36 +0300)]
Use delivery info when federating deletes
Egor Kislitsyn [Wed, 28 Aug 2019 07:50:58 +0000 (14:50 +0700)]
Add a note about compatibility with Mastodon
Egor Kislitsyn [Fri, 13 Sep 2019 06:09:35 +0000 (13:09 +0700)]
Add email change endpoint
Egor Kislitsyn [Tue, 3 Sep 2019 14:33:02 +0000 (21:33 +0700)]
Add more tests for Pleroma.Activity
Egor Kislitsyn [Tue, 3 Sep 2019 14:58:30 +0000 (21:58 +0700)]
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
kaniini [Fri, 13 Sep 2019 03:31:16 +0000 (03:31 +0000)]
Merge branch 'fix/admin-api-docs' into 'develop'
Fix admin api docs for creating users
See merge request pleroma/pleroma!1660
Angelina Filippova [Fri, 13 Sep 2019 03:31:16 +0000 (03:31 +0000)]
Fix admin api docs for creating users
Haelwenn [Thu, 12 Sep 2019 20:21:56 +0000 (20:21 +0000)]
Merge branch 'fix/error-log-double-quotes' into 'develop'
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
rinpatch [Thu, 12 Sep 2019 19:40:53 +0000 (22:40 +0300)]
Parse http signature for request to objects/activities
rinpatch [Thu, 12 Sep 2019 19:10:15 +0000 (22:10 +0300)]
Put the cache with the right key when using a tracking function
rinpatch [Thu, 12 Sep 2019 18:37:36 +0000 (21:37 +0300)]
Track object/create activity fetches
Mark Felder [Thu, 12 Sep 2019 17:29:08 +0000 (12:29 -0500)]
Fix associated test as well
Mark Felder [Wed, 11 Sep 2019 21:16:09 +0000 (16:16 -0500)]
Fix double quotes in error logs
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/
6288a14b-0623-40fc-a26a-
0d358f8a11ca"", error: nil
kaniini [Wed, 11 Sep 2019 20:47:25 +0000 (20:47 +0000)]
Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses
See merge request pleroma/pleroma!1655
rinpatch [Wed, 11 Sep 2019 20:04:01 +0000 (23:04 +0300)]
Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/
3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)
Haelwenn [Wed, 11 Sep 2019 17:47:19 +0000 (17:47 +0000)]
Merge branch 'patch-5' into 'develop'
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
lain [Wed, 11 Sep 2019 11:21:03 +0000 (11:21 +0000)]
Merge branch 'fix/oom-parallel-rendering' into 'develop'
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
rinpatch [Tue, 10 Sep 2019 20:08:15 +0000 (23:08 +0300)]
Add extended benchmark
Alex S [Wed, 11 Sep 2019 06:32:58 +0000 (09:32 +0300)]
web_cache_ttl description
Alex S [Tue, 3 Sep 2019 17:11:32 +0000 (20:11 +0300)]
refactoring
Alex S [Tue, 3 Sep 2019 17:06:22 +0000 (20:06 +0300)]
little refactor
Alex S [Tue, 3 Sep 2019 16:22:25 +0000 (19:22 +0300)]
some changes
Alex S [Tue, 3 Sep 2019 09:32:00 +0000 (12:32 +0300)]
placeholder for config.md
Alex S [Tue, 3 Sep 2019 09:31:43 +0000 (12:31 +0300)]
little fix
Alex S [Tue, 3 Sep 2019 09:30:44 +0000 (12:30 +0300)]
bump ex_doc version
Alex S [Tue, 3 Sep 2019 08:56:21 +0000 (11:56 +0300)]
formatting
Alex S [Tue, 3 Sep 2019 06:45:54 +0000 (09:45 +0300)]
don't add behaviour to suggestions
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:16 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:02 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs
Alex S [Fri, 30 Aug 2019 17:14:18 +0000 (20:14 +0300)]
little fix
Alex S [Fri, 30 Aug 2019 16:59:13 +0000 (19:59 +0300)]
typo fix
Alex S [Fri, 30 Aug 2019 16:14:01 +0000 (19:14 +0300)]
some changes
Alex S [Fri, 30 Aug 2019 11:27:55 +0000 (14:27 +0300)]
fix
Alex S [Fri, 30 Aug 2019 11:09:07 +0000 (14:09 +0300)]
changelog
Alex S [Fri, 30 Aug 2019 11:04:21 +0000 (14:04 +0300)]
expanding regex sigils to use modifiers
Alex S [Fri, 30 Aug 2019 10:22:21 +0000 (13:22 +0300)]
mix docs generates config.md
Alex S [Fri, 30 Aug 2019 10:21:48 +0000 (13:21 +0300)]
description formatters
Alex S [Fri, 30 Aug 2019 10:20:09 +0000 (13:20 +0300)]
description.exs
Alex S [Fri, 30 Aug 2019 09:00:36 +0000 (12:00 +0300)]
deleting old config.md file
rinpatch [Tue, 10 Sep 2019 19:01:45 +0000 (22:01 +0300)]
Revert "Parallelize template rendering"
This reverts commit
1ad71592adb47762287aec8c36d0fca565c38362.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
lain [Tue, 10 Sep 2019 18:53:41 +0000 (18:53 +0000)]
Merge branch 'fix/tests' into 'develop'
Fix tests for `Activity.all_by_ids_with_object/1`
See merge request pleroma/pleroma!1652
Egor Kislitsyn [Tue, 10 Sep 2019 18:08:37 +0000 (01:08 +0700)]
Fix `Activity.all_by_ids_with_object/1` test
lain [Tue, 10 Sep 2019 17:04:12 +0000 (17:04 +0000)]
Merge branch 'statuses-by-ids' into 'develop'
Add an endpoint to get multiple statuses by IDs
Closes #1240
See merge request pleroma/pleroma!1621
Egor Kislitsyn [Tue, 3 Sep 2019 09:58:33 +0000 (16:58 +0700)]
Add note about limit to the doc
Egor Kislitsyn [Tue, 3 Sep 2019 09:23:03 +0000 (16:23 +0700)]
Add an endpoint to get multiple statuses by IDs
feld [Mon, 9 Sep 2019 18:53:09 +0000 (18:53 +0000)]
Merge branch 'cache-plug' into 'develop'
Add Pleroma.Plugs.Cache
Closes #1174
See merge request pleroma/pleroma!1612
minibikini [Mon, 9 Sep 2019 18:53:08 +0000 (18:53 +0000)]
Add Pleroma.Plugs.Cache
feld [Mon, 9 Sep 2019 18:39:44 +0000 (18:39 +0000)]
Merge branch 'update-changelog' into 'develop'
Update CHANGELOG (add a note about !1649)
See merge request pleroma/pleroma!1650
Egor Kislitsyn [Mon, 9 Sep 2019 18:30:02 +0000 (01:30 +0700)]
Update CHANGELOG (add a note about !1649)
feld [Mon, 9 Sep 2019 18:21:29 +0000 (18:21 +0000)]
Merge branch 'fix/read-inbox' into 'develop'
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
Egor Kislitsyn [Mon, 9 Sep 2019 18:11:57 +0000 (01:11 +0700)]
Fix `ActivityPubController.read_inbox/2`
Ivan Tashkinov [Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
shadowfacts [Sat, 7 Sep 2019 19:50:45 +0000 (19:50 +0000)]
Mastodon API: URI encode hashtag name in generated URLs
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
kaniini [Fri, 6 Sep 2019 23:25:30 +0000 (23:25 +0000)]
Merge branch 'chore/query-optimization' into 'develop'
chore: query optimization
Closes #1224
See merge request pleroma/pleroma!1640