akkoma
5 years agodescription.exs: remove empty strings and arrays
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:57:13 +0000 (21:57 +0200)]
description.exs: remove empty strings and arrays

5 years agodocs/markdown.ex: child header as "- key (type): description"
Haelwenn (lanodan) Monnier [Tue, 17 Sep 2019 19:43:27 +0000 (21:43 +0200)]
docs/markdown.ex: child header as "- key (type): description"

5 years agoRemove [true,false] for booleans, it is implicit
Haelwenn (lanodan) Monnier [Fri, 13 Sep 2019 15:05:19 +0000 (17:05 +0200)]
Remove [true,false] for booleans, it is implicit

5 years agoMerge branch 'support/package_versions' into 'develop'
rinpatch [Tue, 17 Sep 2019 19:12:24 +0000 (19:12 +0000)]
Merge branch 'support/package_versions' into 'develop'

[#1263] fixed ecto version

See merge request pleroma/pleroma!1685

5 years agoMerge branch 'feature/return-total-for-reports' into 'develop'
rinpatch [Tue, 17 Sep 2019 19:09:56 +0000 (19:09 +0000)]
Merge branch 'feature/return-total-for-reports' into 'develop'

Admin API: Return total for reports

See merge request pleroma/pleroma!1628

5 years agofixed ecto version
Maksim Pechnikov [Tue, 17 Sep 2019 19:02:37 +0000 (22:02 +0300)]
fixed ecto version

5 years agoMerge branch 'fix-notification-warnings' into 'develop'
rinpatch [Tue, 17 Sep 2019 18:12:27 +0000 (18:12 +0000)]
Merge branch 'fix-notification-warnings' into 'develop'

Fix notification warnings

See merge request pleroma/pleroma!1683

5 years agoFix notification warnings
Steven Fuchs [Tue, 17 Sep 2019 18:12:27 +0000 (18:12 +0000)]
Fix notification warnings

5 years agoMerge branch 'fix/upgrade_user_from_ap_id' into 'develop'
Haelwenn [Tue, 17 Sep 2019 17:16:39 +0000 (17:16 +0000)]
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'

Fix `Transmogrifier.upgrade_user_from_ap_id/1`

See merge request pleroma/pleroma!1677

5 years agoMerge branch 'support/tests' into 'develop'
rinpatch [Tue, 17 Sep 2019 14:47:26 +0000 (14:47 +0000)]
Merge branch 'support/tests' into 'develop'

add tests for activity_pub/utils.ex

See merge request pleroma/pleroma!1627

5 years agoMerge branch 'eliminate-test-errors' into 'develop'
rinpatch [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
Merge branch 'eliminate-test-errors' into 'develop'

remove remaining errors from tests

See merge request pleroma/pleroma!1682

5 years agoremove remaining errors from tests
Steven Fuchs [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
remove remaining errors from tests

5 years agoMerge branch 'deps/update-oban' into 'develop'
rinpatch [Tue, 17 Sep 2019 13:55:01 +0000 (13:55 +0000)]
Merge branch 'deps/update-oban' into 'develop'

Update oban to 0.8.1

Closes #1261

See merge request pleroma/pleroma!1680

5 years agoUpdate oban to 0.8.1
rinpatch [Tue, 17 Sep 2019 10:04:43 +0000 (13:04 +0300)]
Update oban to 0.8.1

This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam

5 years agoMerge branch 'update-fields-limit' into 'develop'
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

5 years agoSet `account_field_value_length` limit to 2048 by default
Egor Kislitsyn [Mon, 16 Sep 2019 14:48:01 +0000 (21:48 +0700)]
Set `account_field_value_length` limit to 2048 by default

5 years agoFix `Transmogrifier.upgrade_user_from_ap_id/1`
Egor Kislitsyn [Mon, 16 Sep 2019 12:26:00 +0000 (19:26 +0700)]
Fix `Transmogrifier.upgrade_user_from_ap_id/1`

5 years agoMerge branch 'develop' into feature/return-total-for-reports
Maxim Filippov [Mon, 16 Sep 2019 11:40:17 +0000 (14:40 +0300)]
Merge branch 'develop' into feature/return-total-for-reports

5 years agoMerge branch 'fix/develop' into 'develop'
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

5 years agoRevert "Merge branch 'revert-4fabf83a' into 'develop'"
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.

5 years agoMerge branch 'fix/signed-fetch-inclusion-test' into 'develop'
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

5 years agoFix signed fetch inclusion publisher test
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

5 years agoMerge branch 'revert-4fabf83a' into 'develop'
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

5 years agoRevert "Merge branch 'streamer-refactoring' into 'develop'"
kaniini [Mon, 16 Sep 2019 09:09:21 +0000 (09:09 +0000)]
Revert "Merge branch 'streamer-refactoring' into 'develop'"

This reverts merge request !1653

5 years agoMerge branch 'streamer-refactoring' into 'develop'
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

5 years agoStreamer refactoring
Steven Fuchs [Mon, 16 Sep 2019 07:44:03 +0000 (07:44 +0000)]
Streamer refactoring

5 years agoMerge branch 'feature/delivery-tracking' into 'develop'
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

5 years agoMerge branch 'feature/optimize_rich_media_parser' into 'develop'
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

5 years agoMerge branch 'fix/race-in-tests' into 'develop'
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

5 years agoFix a race condition in tests
Egor Kislitsyn [Mon, 16 Sep 2019 05:55:05 +0000 (12:55 +0700)]
Fix a race condition in tests

5 years agoMerge branch '1149-oban-job-queue' into 'develop'
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

5 years agoadded prepare html for RichMedia.Parser
Maksim Pechnikov [Sun, 15 Sep 2019 11:53:58 +0000 (14:53 +0300)]
added prepare html for RichMedia.Parser

5 years agoMerge branch 'develop' into support/tests
Maksim Pechnikov [Sun, 15 Sep 2019 11:07:07 +0000 (14:07 +0300)]
Merge branch 'develop' into support/tests

5 years ago[#1149] Reinstated docs/config.md changes.
Ivan Tashkinov [Sun, 15 Sep 2019 07:15:57 +0000 (10:15 +0300)]
[#1149] Reinstated docs/config.md changes.

5 years ago[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
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

5 years agoMerge branch 'config-changes' into 'develop'
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

5 years agoMerge branch 'fix/truncate-remote-user-fields' into 'develop'
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

5 years ago[#1149] Rewritten readme as config/description.exs.
Ivan Tashkinov [Sat, 14 Sep 2019 13:28:59 +0000 (16:28 +0300)]
[#1149] Rewritten readme as config/description.exs.

5 years ago[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
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

5 years agoMerge branch 'fix-tests' into 'develop'
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

5 years agoFix `Activity.all_by_actor_and_id/2` test
Egor Kislitsyn [Sat, 14 Sep 2019 12:31:20 +0000 (19:31 +0700)]
Fix `Activity.all_by_actor_and_id/2` test

5 years agoMerge branch 'security/fav-reblog-access-control' into 'develop'
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

5 years agoApply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
rinpatch [Sat, 14 Sep 2019 10:50:08 +0000 (10:50 +0000)]
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs

5 years agoApply 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

5 years agoMastodon API: Respect post privacy in favourited/reblogged endpoints
rinpatch [Fri, 13 Sep 2019 22:50:15 +0000 (01:50 +0300)]
Mastodon API: Respect post privacy in favourited/reblogged endpoints

5 years agoMerge branch 'capture-test-errors' into 'develop'
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

5 years agoMerge branch 'refactor/add_link_headers' into 'develop'
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

5 years agoMerge branch 'develop' into feature/delivery-tracking
rinpatch [Fri, 13 Sep 2019 16:42:53 +0000 (19:42 +0300)]
Merge branch 'develop' into feature/delivery-tracking

5 years agoDisallow NULLs in deliveries
rinpatch [Fri, 13 Sep 2019 16:28:35 +0000 (19:28 +0300)]
Disallow NULLs in deliveries

5 years agodon't track generated_config.md
Alex S [Fri, 13 Sep 2019 16:13:04 +0000 (19:13 +0300)]
don't track generated_config.md

5 years agoconfig.md back
Alex S [Fri, 13 Sep 2019 16:03:39 +0000 (19:03 +0300)]
config.md back

5 years agomarkdown generation to the new file
Alex S [Fri, 13 Sep 2019 16:02:42 +0000 (19:02 +0300)]
markdown generation to the new file

5 years agoCapture test error messages where appropriate
stwf [Fri, 13 Sep 2019 15:46:41 +0000 (11:46 -0400)]
Capture test error messages where appropriate

5 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 15:25:15 +0000 (15:25 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex

5 years agoApply suggestion to lib/pleroma/delivery.ex
rinpatch [Fri, 13 Sep 2019 15:23:26 +0000 (15:23 +0000)]
Apply suggestion to lib/pleroma/delivery.ex

5 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.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

5 years agoMerge branch 'cleanup-activity' into 'develop'
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

5 years agoMerge branch 'feature/change-email' into 'develop'
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

5 years agoMerge branch 'admin-config-description' into 'develop'
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

5 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Fri, 13 Sep 2019 10:09:56 +0000 (10:09 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex

5 years agoApply 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

5 years agoRemove unused functions and fix credo issues
rinpatch [Fri, 13 Sep 2019 09:06:31 +0000 (12:06 +0300)]
Remove unused functions and fix credo issues

5 years agoUse delivery info when federating deletes
rinpatch [Fri, 13 Sep 2019 08:36:49 +0000 (11:36 +0300)]
Use delivery info when federating deletes

5 years agoAdd a note about compatibility with Mastodon
Egor Kislitsyn [Wed, 28 Aug 2019 07:50:58 +0000 (14:50 +0700)]
Add a note about compatibility with Mastodon

5 years agoAdd email change endpoint
Egor Kislitsyn [Fri, 13 Sep 2019 06:09:35 +0000 (13:09 +0700)]
Add email change endpoint

5 years agoAdd more tests for Pleroma.Activity
Egor Kislitsyn [Tue, 3 Sep 2019 14:33:02 +0000 (21:33 +0700)]
Add more tests for Pleroma.Activity

5 years agoCleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
Egor Kislitsyn [Tue, 3 Sep 2019 14:58:30 +0000 (21:58 +0700)]
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils

5 years agoMerge branch 'fix/admin-api-docs' into 'develop'
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

5 years agoFix admin api docs for creating users
Angelina Filippova [Fri, 13 Sep 2019 03:31:16 +0000 (03:31 +0000)]
Fix admin api docs for creating users

5 years agoMerge branch 'fix/error-log-double-quotes' into 'develop'
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

5 years agoParse http signature for request to objects/activities
rinpatch [Thu, 12 Sep 2019 19:40:53 +0000 (22:40 +0300)]
Parse http signature for request to objects/activities

5 years agoPut the cache with the right key when using a tracking function
rinpatch [Thu, 12 Sep 2019 19:10:15 +0000 (22:10 +0300)]
Put the cache with the right key when using a tracking function

5 years agoTrack object/create activity fetches
rinpatch [Thu, 12 Sep 2019 18:37:36 +0000 (21:37 +0300)]
Track object/create activity fetches

5 years agoFix associated test as well
Mark Felder [Thu, 12 Sep 2019 17:29:08 +0000 (12:29 -0500)]
Fix associated test as well

5 years agoFix double quotes in error logs
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

5 years agoMerge branch 'feature/jason-view-render' into 'develop'
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

5 years agoUse Jason for rendering responses
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)

5 years agoMerge branch 'patch-5' into 'develop'
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

5 years agoMerge branch 'fix/oom-parallel-rendering' into 'develop'
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

5 years agoAdd extended benchmark
rinpatch [Tue, 10 Sep 2019 20:08:15 +0000 (23:08 +0300)]
Add extended benchmark

5 years agoweb_cache_ttl description
Alex S [Wed, 11 Sep 2019 06:32:58 +0000 (09:32 +0300)]
web_cache_ttl description

5 years agorefactoring
Alex S [Tue, 3 Sep 2019 17:11:32 +0000 (20:11 +0300)]
refactoring

5 years agolittle refactor
Alex S [Tue, 3 Sep 2019 17:06:22 +0000 (20:06 +0300)]
little refactor

5 years agosome changes
Alex S [Tue, 3 Sep 2019 16:22:25 +0000 (19:22 +0300)]
some changes

5 years agoplaceholder for config.md
Alex S [Tue, 3 Sep 2019 09:32:00 +0000 (12:32 +0300)]
placeholder for config.md

5 years agolittle fix
Alex S [Tue, 3 Sep 2019 09:31:43 +0000 (12:31 +0300)]
little fix

5 years agobump ex_doc version
Alex S [Tue, 3 Sep 2019 09:30:44 +0000 (12:30 +0300)]
bump ex_doc version

5 years agoformatting
Alex S [Tue, 3 Sep 2019 08:56:21 +0000 (11:56 +0300)]
formatting

5 years agodon't add behaviour to suggestions
Alex S [Tue, 3 Sep 2019 06:45:54 +0000 (09:45 +0300)]
don't add behaviour to suggestions

5 years agoApply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:16 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs

5 years agoApply suggestion to config/description.exs
Alexander Strizhakov [Tue, 3 Sep 2019 06:45:02 +0000 (06:45 +0000)]
Apply suggestion to config/description.exs

5 years agolittle fix
Alex S [Fri, 30 Aug 2019 17:14:18 +0000 (20:14 +0300)]
little fix

5 years agotypo fix
Alex S [Fri, 30 Aug 2019 16:59:13 +0000 (19:59 +0300)]
typo fix

5 years agosome changes
Alex S [Fri, 30 Aug 2019 16:14:01 +0000 (19:14 +0300)]
some changes

5 years agofix
Alex S [Fri, 30 Aug 2019 11:27:55 +0000 (14:27 +0300)]
fix

5 years agochangelog
Alex S [Fri, 30 Aug 2019 11:09:07 +0000 (14:09 +0300)]
changelog

5 years agoexpanding regex sigils to use modifiers
Alex S [Fri, 30 Aug 2019 11:04:21 +0000 (14:04 +0300)]
expanding regex sigils to use modifiers

5 years agomix docs generates config.md
Alex S [Fri, 30 Aug 2019 10:22:21 +0000 (13:22 +0300)]
mix docs generates config.md

5 years agodescription formatters
Alex S [Fri, 30 Aug 2019 10:21:48 +0000 (13:21 +0300)]
description formatters

5 years agodescription.exs
Alex S [Fri, 30 Aug 2019 10:20:09 +0000 (13:20 +0300)]
description.exs