akkoma
4 years agoStatusController: Ignore nil scheduled_at parameters.
lain [Wed, 22 Apr 2020 12:26:19 +0000 (14:26 +0200)]
StatusController: Ignore nil scheduled_at parameters.

4 years agoMerge branch 'docs/debian-packages' into 'develop'
lain [Wed, 22 Apr 2020 12:10:27 +0000 (12:10 +0000)]
Merge branch 'docs/debian-packages' into 'develop'

debian_based_*.md: Use erlang-nox metapackage

See merge request pleroma/pleroma!2268

4 years agoApply suggestion to docs/installation/debian_based_en.md
lain [Wed, 22 Apr 2020 12:10:20 +0000 (12:10 +0000)]
Apply suggestion to docs/installation/debian_based_en.md

4 years agoMerge branch 'openapi/custom-emojis' into 'develop'
lain [Tue, 21 Apr 2020 10:13:50 +0000 (10:13 +0000)]
Merge branch 'openapi/custom-emojis' into 'develop'

Add OpenAPI spec for CustomEmojiController

See merge request pleroma/pleroma!2375

4 years agoMerge branch 'accept-deletes' into 'develop'
rinpatch [Mon, 20 Apr 2020 18:30:01 +0000 (18:30 +0000)]
Merge branch 'accept-deletes' into 'develop'

Always accept deletions through SimplePolicy, add :reject_deletes group

See merge request pleroma/pleroma!2371

4 years agoMerge branch 'router-cleanup' into 'develop'
rinpatch [Mon, 20 Apr 2020 18:29:03 +0000 (18:29 +0000)]
Merge branch 'router-cleanup' into 'develop'

Cleanup and DRY the Router

See merge request pleroma/pleroma!2406

4 years agoMerge remote-tracking branch 'upstream/develop' into accept-deletes
Alex Gleason [Mon, 20 Apr 2020 15:13:56 +0000 (10:13 -0500)]
Merge remote-tracking branch 'upstream/develop' into accept-deletes

4 years agoAdd :reject_deletes option to SimplePolicy
Alex Gleason [Mon, 13 Apr 2020 18:48:32 +0000 (13:48 -0500)]
Add :reject_deletes option to SimplePolicy

4 years agoMerge branch 'cleanup-subscription-controller' into 'develop'
lain [Mon, 20 Apr 2020 13:01:17 +0000 (13:01 +0000)]
Merge branch 'cleanup-subscription-controller' into 'develop'

Cleanup SubscriptionController

See merge request pleroma/pleroma!2393

4 years agoMerge branch 'fix-object_age_policy' into 'develop'
lain [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Merge branch 'fix-object_age_policy' into 'develop'

Fix ObjectAgePolicy

See merge request pleroma/pleroma!2404

4 years agoFix ObjectAgePolicyTest
Ilja [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Fix ObjectAgePolicyTest

The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests

4 years agoMerge branch 'mrf-docs-update' into 'develop'
lain [Mon, 20 Apr 2020 12:57:45 +0000 (12:57 +0000)]
Merge branch 'mrf-docs-update' into 'develop'

Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370

4 years agoCleanup and DRY the Router
Egor Kislitsyn [Mon, 20 Apr 2020 12:38:00 +0000 (16:38 +0400)]
Cleanup and DRY the Router

4 years agoMerge branch '1559-follow-request-notifications' into 'develop'
rinpatch [Sun, 19 Apr 2020 21:45:20 +0000 (21:45 +0000)]
Merge branch '1559-follow-request-notifications' into 'develop'

[#1559] Support for "follow_request" notifications

Closes #1559

See merge request pleroma/pleroma!2354

4 years agoMerge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
rinpatch [Sun, 19 Apr 2020 21:44:25 +0000 (21:44 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'

mix.exs: Do not bail out when .git doesn’t exists

See merge request pleroma/pleroma!2405

4 years agomix.exs: Do not bail out when .git doesn’t exists
Haelwenn (lanodan) Monnier [Sun, 19 Apr 2020 18:23:48 +0000 (20:23 +0200)]
mix.exs: Do not bail out when .git doesn’t exists

4 years agoMerge branch 'bugfix/1697-user_emoji_miration' into 'develop'
Haelwenn [Sat, 18 Apr 2020 06:59:23 +0000 (06:59 +0000)]
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403

4 years agoApply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
Haelwenn [Fri, 17 Apr 2020 22:48:40 +0000 (22:48 +0000)]
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs

4 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
Haelwenn [Fri, 17 Apr 2020 22:48:37 +0000 (22:48 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex

4 years agomigrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Haelwenn (lanodan) Monnier [Fri, 17 Apr 2020 21:55:56 +0000 (23:55 +0200)]
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

4 years agoMerge branch '1682-basic-auth-permissions-fix' into 'develop'
rinpatch [Fri, 17 Apr 2020 20:47:43 +0000 (20:47 +0000)]
Merge branch '1682-basic-auth-permissions-fix' into 'develop'

[#1682] Fixed Basic Auth permissions issue

Closes #1682

See merge request pleroma/pleroma!2401

4 years agoMerge branch 'update/pleroma-fe-20200417' into 'develop'
Haelwenn [Fri, 17 Apr 2020 19:21:34 +0000 (19:21 +0000)]
Merge branch 'update/pleroma-fe-20200417' into 'develop'

pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

See merge request pleroma/pleroma!2402

4 years agopleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
Mark Felder [Fri, 17 Apr 2020 18:22:25 +0000 (13:22 -0500)]
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

4 years ago[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when...
Ivan Tashkinov [Fri, 17 Apr 2020 18:21:10 +0000 (21:21 +0300)]
[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.

4 years agoMerge branch 'sideeffects-test' into 'develop'
rinpatch [Fri, 17 Apr 2020 14:03:04 +0000 (14:03 +0000)]
Merge branch 'sideeffects-test' into 'develop'

SideEffects: Test for notification creation.

See merge request pleroma/pleroma!2399

4 years agoSideEffects: Test for notification creation.
lain [Fri, 17 Apr 2020 13:50:15 +0000 (15:50 +0200)]
SideEffects: Test for notification creation.

4 years agoMerge branch 'bugfix/1695-user_emoji_miration' into 'develop'
rinpatch [Fri, 17 Apr 2020 13:40:25 +0000 (13:40 +0000)]
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifi...
Ivan Tashkinov [Fri, 17 Apr 2020 13:23:58 +0000 (16:23 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications

# Conflicts:
# CHANGELOG.md

4 years agomigrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Haelwenn (lanodan) Monnier [Fri, 17 Apr 2020 12:32:15 +0000 (14:32 +0200)]
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

4 years agoMerge branch 'sync-changelog' into 'develop'
Haelwenn [Fri, 17 Apr 2020 09:39:29 +0000 (09:39 +0000)]
Merge branch 'sync-changelog' into 'develop'

Move changelog entries to unreleased section

See merge request pleroma/pleroma!2397

4 years agomove changelogs entries to unreleased section
Alexander Strizhakov [Fri, 17 Apr 2020 09:33:11 +0000 (12:33 +0300)]
move changelogs entries to unreleased section

4 years agoMerge branch 'feature/1584-client-captcha-options' into 'develop'
Haelwenn [Fri, 17 Apr 2020 09:19:35 +0000 (09:19 +0000)]
Merge branch 'feature/1584-client-captcha-options' into 'develop'

Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252

4 years agoMerge branch 'fix/1694-transfer-task-fix' into 'develop'
Haelwenn [Fri, 17 Apr 2020 09:02:10 +0000 (09:02 +0000)]
Merge branch 'fix/1694-transfer-task-fix' into 'develop'

Fix for logger configuration

Closes #1694

See merge request pleroma/pleroma!2396

4 years agoMerge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
Haelwenn [Fri, 17 Apr 2020 08:55:46 +0000 (08:55 +0000)]
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'

Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373

4 years agofix for logger configuration
Alexander Strizhakov [Fri, 17 Apr 2020 05:42:48 +0000 (08:42 +0300)]
fix for logger configuration

4 years agoMerge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
rinpatch [Thu, 16 Apr 2020 21:58:57 +0000 (21:58 +0000)]
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'

Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349

4 years agoMerge branch 'fix/1691-feed-render' into 'develop'
rinpatch [Thu, 16 Apr 2020 18:38:58 +0000 (18:38 +0000)]
Merge branch 'fix/1691-feed-render' into 'develop'

Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395

4 years agoMerge branch 'features/remove-user-source_data' into 'develop'
rinpatch [Thu, 16 Apr 2020 18:37:56 +0000 (18:37 +0000)]
Merge branch 'features/remove-user-source_data' into 'develop'

User: remove source_data

Closes #820

See merge request pleroma/pleroma!2339

4 years agoMerge branch 'develop' into features/remove-user-source_data
rinpatch [Thu, 16 Apr 2020 18:28:52 +0000 (21:28 +0300)]
Merge branch 'develop' into features/remove-user-source_data

4 years agofix for use of published from different entities
Alexander Strizhakov [Thu, 16 Apr 2020 15:05:36 +0000 (18:05 +0300)]
fix for use of published from different entities

4 years agoMerge branch 'refactor/remove-upgrade-changeset' into 'develop'
rinpatch [Thu, 16 Apr 2020 14:59:11 +0000 (14:59 +0000)]
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'

Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368

4 years agouser: remove blank?
rinpatch [Thu, 16 Apr 2020 14:54:57 +0000 (17:54 +0300)]
user: remove blank?

4 years agoadded need_reboot endpoint to admin api
Alexander Strizhakov [Mon, 13 Apr 2020 11:07:23 +0000 (14:07 +0300)]
added need_reboot endpoint to admin api

4 years agoMerge branch 'small-fix-rewrite_policy' into 'develop'
lain [Thu, 16 Apr 2020 09:38:24 +0000 (09:38 +0000)]
Merge branch 'small-fix-rewrite_policy' into 'develop'

small fix in the rewrite_policy example

See merge request pleroma/pleroma!2391

4 years agoCleanup SubscriptionController
Egor Kislitsyn [Wed, 15 Apr 2020 18:59:25 +0000 (22:59 +0400)]
Cleanup SubscriptionController

4 years ago[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called...
Ivan Tashkinov [Wed, 15 Apr 2020 18:19:16 +0000 (21:19 +0300)]
[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.

4 years agosmall fix in the rewrite_policy example
Ilja [Wed, 15 Apr 2020 17:03:27 +0000 (19:03 +0200)]
small fix in the rewrite_policy example

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth...
Ivan Tashkinov [Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement

4 years agoMerge branch 'fix/1659-rate-limiter' into 'develop'
Haelwenn [Wed, 15 Apr 2020 15:26:55 +0000 (15:26 +0000)]
Merge branch 'fix/1659-rate-limiter' into 'develop'

remote_ip plug adds remote_ip_found flag

Closes #1659

See merge request pleroma/pleroma!2390

4 years agoremote_ip plug adds remote_ip_found flag
Alexander Strizhakov [Wed, 15 Apr 2020 12:27:34 +0000 (15:27 +0300)]
remote_ip plug adds remote_ip_found flag

4 years agoMerge branch 'uploads-csp-changes' into 'develop'
rinpatch [Wed, 15 Apr 2020 10:15:15 +0000 (10:15 +0000)]
Merge branch 'uploads-csp-changes' into 'develop'

Uploads: Sandbox them in the CSP.

See merge request pleroma/pleroma!2389

4 years agoUploads: Sandbox them in the CSP.
lain [Wed, 15 Apr 2020 10:05:22 +0000 (12:05 +0200)]
Uploads: Sandbox them in the CSP.

4 years agoMerge branch 'fix/openapi-form-mimetype' into 'develop'
rinpatch [Tue, 14 Apr 2020 22:01:24 +0000 (22:01 +0000)]
Merge branch 'fix/openapi-form-mimetype' into 'develop'

openapi: add application/x-www-form-urlencoded to body types

Closes #1683

See merge request pleroma/pleroma!2387

4 years agoopenapi: add application/x-www-form-urlencoded to body types
rinpatch [Tue, 14 Apr 2020 21:49:21 +0000 (00:49 +0300)]
openapi: add application/x-www-form-urlencoded to body types

Closes #1683

4 years agoMerge branch 'fix/richmedia-oban-error' into 'develop'
feld [Tue, 14 Apr 2020 17:05:17 +0000 (17:05 +0000)]
Merge branch 'fix/richmedia-oban-error' into 'develop'

Attempt at fixing Oban not receiving :ok from RichMediaHelper job

Closes #1684

See merge request pleroma/pleroma!2377

4 years agoFix Oban not receiving :ok from RichMediaHelper job
Mark Felder [Tue, 14 Apr 2020 16:43:53 +0000 (11:43 -0500)]
Fix Oban not receiving :ok from RichMediaHelper job

4 years agoMerge branch 'revert-60cc7d6c' into 'develop'
lain [Tue, 14 Apr 2020 16:32:34 +0000 (16:32 +0000)]
Merge branch 'revert-60cc7d6c' into 'develop'

Revert "Merge branch 'issue/1276' into 'develop'"

See merge request pleroma/pleroma!2384

4 years agoRevert "Merge branch 'issue/1276' into 'develop'"
lain [Tue, 14 Apr 2020 16:32:22 +0000 (16:32 +0000)]
Revert "Merge branch 'issue/1276' into 'develop'"

This reverts merge request !1877

4 years agoMerge branch 'revert-13a7105b' into 'develop'
lain [Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)]
Merge branch 'revert-13a7105b' into 'develop'

Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383

4 years agoRevert "Merge branch 'marker-update-fix' into 'develop'"
lain [Tue, 14 Apr 2020 16:31:30 +0000 (16:31 +0000)]
Revert "Merge branch 'marker-update-fix' into 'develop'"

This reverts merge request !2380

4 years agoMerge branch 'logger-configuration' into 'develop'
feld [Tue, 14 Apr 2020 15:11:25 +0000 (15:11 +0000)]
Merge branch 'logger-configuration' into 'develop'

Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365

4 years agoMerge branch 'marker-update-fix' into 'develop'
lain [Tue, 14 Apr 2020 13:17:44 +0000 (13:17 +0000)]
Merge branch 'marker-update-fix' into 'develop'

Marker update migration: Don't try to update virtual field.

See merge request pleroma/pleroma!2380

4 years agoMerge branch 'chore/spelling' into 'develop'
lain [Tue, 14 Apr 2020 13:07:57 +0000 (13:07 +0000)]
Merge branch 'chore/spelling' into 'develop'

Fix spelling in log message

See merge request pleroma/pleroma!2378

4 years agoMarker update migration: Don't try to update virtual field.
lain [Tue, 14 Apr 2020 13:06:09 +0000 (15:06 +0200)]
Marker update migration: Don't try to update virtual field.

4 years agoMerge branch 'fix/issue_1679' into 'develop'
lain [Tue, 14 Apr 2020 11:08:33 +0000 (11:08 +0000)]
Merge branch 'fix/issue_1679' into 'develop'

[#1679] fixed  logs

See merge request pleroma/pleroma!2379

4 years agoMerge branch 'issue/1276' into 'develop'
Haelwenn [Tue, 14 Apr 2020 06:38:56 +0000 (06:38 +0000)]
Merge branch 'issue/1276' into 'develop'

[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877

4 years agofix logger message
Maksim Pechnikov [Tue, 14 Apr 2020 05:43:47 +0000 (08:43 +0300)]
fix logger message

4 years agoFix spelling
Mark Felder [Mon, 13 Apr 2020 22:04:43 +0000 (17:04 -0500)]
Fix spelling

4 years agoMerge branch 'openapi/domain-blocks' into 'develop'
rinpatch [Mon, 13 Apr 2020 20:04:49 +0000 (20:04 +0000)]
Merge branch 'openapi/domain-blocks' into 'develop'

Add OpenAPI spec for DomainBlockController

See merge request pleroma/pleroma!2376

4 years agoAdd OpenAPI spec for DomainBlockController
Egor Kislitsyn [Mon, 13 Apr 2020 18:44:52 +0000 (22:44 +0400)]
Add OpenAPI spec for DomainBlockController

4 years agoMerge branch 'develop' into issue/1276
Maksim Pechnikov [Mon, 13 Apr 2020 18:19:27 +0000 (21:19 +0300)]
Merge branch 'develop' into issue/1276

4 years agoAdd OpenAPI spec for CustomEmojiController
Egor Kislitsyn [Mon, 13 Apr 2020 17:21:04 +0000 (21:21 +0400)]
Add OpenAPI spec for CustomEmojiController

4 years agoMerge branch 'output-of-relationships-in-statuses' into 'develop'
rinpatch [Mon, 13 Apr 2020 13:05:40 +0000 (13:05 +0000)]
Merge branch 'output-of-relationships-in-statuses' into 'develop'

Ability to control the output of AccountView.pleroma.relationship in statuses / notifications

See merge request pleroma/pleroma!2342

4 years ago[#2342] Removed description.exs entry for temporary configuration option.
Ivan Tashkinov [Mon, 13 Apr 2020 12:38:50 +0000 (15:38 +0300)]
[#2342] Removed description.exs entry for temporary configuration option.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:51 +0000 (09:16 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses

4 years ago[#2342] Removed changelog entry for temporary configuration option.
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:35 +0000 (09:16 +0300)]
[#2342] Removed changelog entry for temporary configuration option.

4 years agochangelog entry
Alexander Strizhakov [Mon, 13 Apr 2020 05:59:06 +0000 (08:59 +0300)]
changelog entry

4 years agofix for logger configuration through admin-fe
Alexander Strizhakov [Fri, 10 Apr 2020 11:42:52 +0000 (14:42 +0300)]
fix for logger configuration through admin-fe

4 years agoAlways accept deletions through SimplePolicy
Alex Gleason [Mon, 13 Apr 2020 01:26:35 +0000 (20:26 -0500)]
Always accept deletions through SimplePolicy

4 years agoExpand MRF SimplePolicy docs
Alex Gleason [Sun, 12 Apr 2020 23:46:47 +0000 (18:46 -0500)]
Expand MRF SimplePolicy docs

4 years agoMerge branch 'fix/mix-tasks-failing-otp' into 'develop'
rinpatch [Sun, 12 Apr 2020 16:00:15 +0000 (16:00 +0000)]
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'

Fix mix tasks failing on OTP releases

Closes #1678

See merge request pleroma/pleroma!2369

4 years agoFix mix tasks failing on OTP releases
rinpatch [Sun, 12 Apr 2020 15:49:31 +0000 (18:49 +0300)]
Fix mix tasks failing on OTP releases

No idea why this was even added.
Closes #1678

4 years agoMerge branch 'following-relationships-optimizations' into 'develop'
rinpatch [Sat, 11 Apr 2020 19:46:04 +0000 (19:46 +0000)]
Merge branch 'following-relationships-optimizations' into 'develop'

FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332

4 years agoRemove User.upgrade_changeset in favor of remote_user_creation
rinpatch [Sat, 11 Apr 2020 18:44:52 +0000 (21:44 +0300)]
Remove User.upgrade_changeset in favor of remote_user_creation

The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).

Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.

I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.

4 years agoMerge branch 'support/update_oban' into 'develop'
rinpatch [Sat, 11 Apr 2020 10:04:02 +0000 (10:04 +0000)]
Merge branch 'support/update_oban' into 'develop'

[#1555] updated the Oban package

See merge request pleroma/pleroma!2346

4 years agofix Oban migration
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:50 +0000 (21:27 +0300)]
fix Oban migration

4 years agoMerge branch 'develop' into support/update_oban
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:41 +0000 (21:27 +0300)]
Merge branch 'develop' into support/update_oban

4 years agoMerge branch 'chore/changelog-organization' into 'develop'
feld [Fri, 10 Apr 2020 16:56:41 +0000 (16:56 +0000)]
Merge branch 'chore/changelog-organization' into 'develop'

Add a section for changelog entries that pertain to the next patch release.

See merge request pleroma/pleroma!2366

4 years agoAdd a section for changelog entries that pertain to the next patch release.
Mark Felder [Fri, 10 Apr 2020 16:37:02 +0000 (11:37 -0500)]
Add a section for changelog entries that pertain to the next patch release.

This will make it easier to keep changelogs synced between develop and stable branches.

4 years agoMerge branch 'fix/support-conversations-pagination' into 'develop'
Haelwenn [Fri, 10 Apr 2020 12:12:49 +0000 (12:12 +0000)]
Merge branch 'fix/support-conversations-pagination' into 'develop'

Support pagination in conversations

See merge request pleroma/pleroma!2329

4 years agoMerge branch 'develop' into fix/support-conversations-pagination
Egor Kislitsyn [Fri, 10 Apr 2020 10:18:57 +0000 (14:18 +0400)]
Merge branch 'develop' into fix/support-conversations-pagination

4 years agoMerge branch 'chore/fix-changelog' into 'develop'
Haelwenn [Fri, 10 Apr 2020 05:15:11 +0000 (05:15 +0000)]
Merge branch 'chore/fix-changelog' into 'develop'

Chore/fix changelog

See merge request pleroma/pleroma!2364

4 years agoMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
Haelwenn [Fri, 10 Apr 2020 04:31:13 +0000 (04:31 +0000)]
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'

bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316

4 years agoUser: remove source_data
Haelwenn (lanodan) Monnier [Mon, 6 Apr 2020 08:59:35 +0000 (10:59 +0200)]
User: remove source_data

4 years agoRemove User.fields/1
Haelwenn (lanodan) Monnier [Mon, 6 Apr 2020 08:44:48 +0000 (10:44 +0200)]
Remove User.fields/1

4 years agoprofile emojis in User.emoji instead of source_data
Haelwenn (lanodan) Monnier [Fri, 3 Apr 2020 11:03:32 +0000 (13:03 +0200)]
profile emojis in User.emoji instead of source_data

4 years agoUser: Move inbox & shared_inbox to own fields
Haelwenn (lanodan) Monnier [Wed, 1 Apr 2020 05:47:07 +0000 (07:47 +0200)]
User: Move inbox & shared_inbox to own fields

4 years agoformatter: Use user.uri instead of user.source_data.uri
Haelwenn (lanodan) Monnier [Wed, 1 Apr 2020 05:15:38 +0000 (07:15 +0200)]
formatter: Use user.uri instead of user.source_data.uri

4 years agoTypes.URI: New
Haelwenn (lanodan) Monnier [Thu, 9 Apr 2020 11:01:35 +0000 (13:01 +0200)]
Types.URI: New

4 years agoUser: Move public_key from source_data to own field
Haelwenn (lanodan) Monnier [Wed, 1 Apr 2020 04:58:48 +0000 (06:58 +0200)]
User: Move public_key from source_data to own field