akkoma
4 years agoRemove `/statusnet/config`
Egor Kislitsyn [Mon, 29 Jun 2020 13:00:37 +0000 (17:00 +0400)]
Remove `/statusnet/config`

4 years agoFix warning
Egor Kislitsyn [Mon, 29 Jun 2020 12:29:51 +0000 (16:29 +0400)]
Fix warning

4 years agoMerge branch 'develop' into remove-twitter-api
Egor Kislitsyn [Mon, 29 Jun 2020 12:09:49 +0000 (16:09 +0400)]
Merge branch 'develop' into remove-twitter-api

4 years agoMerge branch 'avatar-removing' into 'develop'
lain [Mon, 29 Jun 2020 11:16:30 +0000 (11:16 +0000)]
Merge branch 'avatar-removing' into 'develop'

UpdateCredentialsTest: Add test for removing profile images.

See merge request pleroma/pleroma!2701

4 years agoUpdateCredentialsTest: Add test for removing profile images.
lain [Mon, 29 Jun 2020 10:40:23 +0000 (12:40 +0200)]
UpdateCredentialsTest: Add test for removing profile images.

4 years agoMerge branch '1031-parent-visible' into 'develop'
lain [Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)]
Merge branch '1031-parent-visible' into 'develop'

Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679

4 years agoMerge branch 'openapi/schema-account-pleromafields' into 'develop'
lain [Mon, 29 Jun 2020 08:32:56 +0000 (08:32 +0000)]
Merge branch 'openapi/schema-account-pleromafields' into 'develop'

ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses

See merge request pleroma/pleroma!2700

4 years agoApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 01:31:33 +0000 (03:31 +0200)]
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses

4 years agoMerge branch 'docs/mastoapi-account-fields' into 'develop'
Haelwenn [Mon, 29 Jun 2020 00:56:02 +0000 (00:56 +0000)]
Merge branch 'docs/mastoapi-account-fields' into 'develop'

differences_in_mastoapi_responses: Update account fields

See merge request pleroma/pleroma!2699

4 years agodifferences_in_mastoapi_responses: Update account fields
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 00:39:26 +0000 (02:39 +0200)]
differences_in_mastoapi_responses: Update account fields

4 years agoMerge branch 'reduce-preloading-defaults' into 'develop'
lain [Sat, 27 Jun 2020 10:40:29 +0000 (10:40 +0000)]
Merge branch 'reduce-preloading-defaults' into 'develop'

Config: Reduce default preloaders to configuration endpoints.

See merge request pleroma/pleroma!2697

4 years agoConfig: Reduce default preloaders to configuration endpoints.
lain [Sat, 27 Jun 2020 10:18:37 +0000 (12:18 +0200)]
Config: Reduce default preloaders to configuration endpoints.

Fetching the timeline is a bit heavy to do by default.

4 years agoMerge branch 'fix/fetcher-transmogrifier-error' into 'develop'
lain [Sat, 27 Jun 2020 09:41:35 +0000 (09:41 +0000)]
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'

object/fetcher: Pass full Transmogrifier error

See merge request pleroma/pleroma!2696

4 years agoobject/fetcher: Pass full Transmogrifier error
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 18:10:47 +0000 (20:10 +0200)]
object/fetcher: Pass full Transmogrifier error

4 years agoMerge branch 'block-handling' into 'develop'
Haelwenn [Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)]
Merge branch 'block-handling' into 'develop'

Handle blocks with the pipeline

See merge request pleroma/pleroma!2685

4 years agoMerge branch '1258-anti-link-spam-exemption' into 'develop'
Haelwenn [Fri, 26 Jun 2020 16:59:46 +0000 (16:59 +0000)]
Merge branch '1258-anti-link-spam-exemption' into 'develop'

AntiSpamLinkPolicy: Exempt local users.

Closes #1258

See merge request pleroma/pleroma!2686

4 years agoMerge branch 'fix-chats' into 'develop'
lain [Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)]
Merge branch 'fix-chats' into 'develop'

Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691

4 years agoNodeinfo: Add chat information back in.
lain [Fri, 26 Jun 2020 11:04:15 +0000 (13:04 +0200)]
Nodeinfo: Add chat information back in.

4 years agoUser: Don't unfollow on block when the relevant setting is set.
lain [Fri, 26 Jun 2020 10:06:00 +0000 (12:06 +0200)]
User: Don't unfollow on block when the relevant setting is set.

4 years agoBlockValidator: Restore old behavior for incoming blocks.
lain [Fri, 26 Jun 2020 09:58:40 +0000 (11:58 +0200)]
BlockValidator: Restore old behavior for incoming blocks.

4 years agoMerge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
Haelwenn [Fri, 26 Jun 2020 03:48:25 +0000 (03:48 +0000)]
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'

nodeinfo: Fix MRF transparency

See merge request pleroma/pleroma!2689

4 years agonodeinfo: Fix MRF transparency
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 03:33:59 +0000 (05:33 +0200)]
nodeinfo: Fix MRF transparency

4 years agoMerge branch 'preload-data' into 'develop'
feld [Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)]
Merge branch 'preload-data' into 'develop'

Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381

4 years agoMerge branch 'mastoapi-omitted' into 'develop'
feld [Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)]
Merge branch 'mastoapi-omitted' into 'develop'

MastoAPI differences: Document not implemented features

See merge request pleroma/pleroma!2687

4 years agoMerge branch 'update/admin-fe-20200625' into 'develop'
feld [Thu, 25 Jun 2020 20:09:19 +0000 (20:09 +0000)]
Merge branch 'update/admin-fe-20200625' into 'develop'

Update AdminFE build

See merge request pleroma/pleroma!2688

4 years agoUpdate AdminFE build
Mark Felder [Thu, 25 Jun 2020 19:55:00 +0000 (14:55 -0500)]
Update AdminFE build

4 years agoMastoAPI differences: Document not implemented features
Alex Gleason [Thu, 25 Jun 2020 17:32:06 +0000 (12:32 -0500)]
MastoAPI differences: Document not implemented features

4 years agoMerge branch 'chore/remove-reference-to-distsn' into 'develop'
lain [Thu, 25 Jun 2020 10:42:57 +0000 (10:42 +0000)]
Merge branch 'chore/remove-reference-to-distsn' into 'develop'

Remove reference to defunct distsn.org

See merge request pleroma/pleroma!2675

4 years agoAntiSpamLinkPolicy: Exempt local users.
lain [Thu, 25 Jun 2020 10:40:39 +0000 (12:40 +0200)]
AntiSpamLinkPolicy: Exempt local users.

4 years agoApply suggestion to config/description.exs
lain [Thu, 25 Jun 2020 10:17:16 +0000 (10:17 +0000)]
Apply suggestion to config/description.exs

4 years agoMerge branch 'issue/1872-ex_aws' into 'develop'
lain [Thu, 25 Jun 2020 10:14:19 +0000 (10:14 +0000)]
Merge branch 'issue/1872-ex_aws' into 'develop'

[#1872] use Pleroma.HTTP for ExAws.S3

See merge request pleroma/pleroma!2683

4 years agoBlocking: Don't federate if the options is set.
lain [Thu, 25 Jun 2020 10:03:14 +0000 (12:03 +0200)]
Blocking: Don't federate if the options is set.

4 years agoActivityPub: Remove `block`.
lain [Thu, 25 Jun 2020 09:51:33 +0000 (11:51 +0200)]
ActivityPub: Remove `block`.

4 years agoAccountController: Extract blocking to CommonAPI.
lain [Thu, 25 Jun 2020 09:44:04 +0000 (11:44 +0200)]
AccountController: Extract blocking to CommonAPI.

4 years agoTransmogrifier: Switch to pipeline for Blocks.
lain [Thu, 25 Jun 2020 09:33:54 +0000 (11:33 +0200)]
Transmogrifier: Switch to pipeline for Blocks.

4 years agoObjectValidator: Basic `Block` support.
lain [Thu, 25 Jun 2020 09:13:35 +0000 (11:13 +0200)]
ObjectValidator: Basic `Block` support.

4 years agoTransmogrifier Test: Extract block handling.
lain [Thu, 25 Jun 2020 08:54:00 +0000 (10:54 +0200)]
Transmogrifier Test: Extract block handling.

4 years agoMerge branch 'fix/following-request-from-deactivated' into 'develop'
lain [Thu, 25 Jun 2020 06:50:44 +0000 (06:50 +0000)]
Merge branch 'fix/following-request-from-deactivated' into 'develop'

Filter outstanding follower requests from deactivated accounts

Closes #1771

See merge request pleroma/pleroma!2682

4 years agoadded wrapper Pleroma.HTTP for ExAws.S3
Maksim Pechnikov [Thu, 25 Jun 2020 04:12:29 +0000 (07:12 +0300)]
added wrapper Pleroma.HTTP for ExAws.S3

4 years agoFilter outstanding follower requests from deactivated accounts
Mark Felder [Wed, 24 Jun 2020 22:18:53 +0000 (17:18 -0500)]
Filter outstanding follower requests from deactivated accounts

4 years agoMerge branch 'fix-emoji-pagination' into 'develop'
lain [Wed, 24 Jun 2020 15:23:20 +0000 (15:23 +0000)]
Merge branch 'fix-emoji-pagination' into 'develop'

Fix for emoji pagination in pack show

See merge request pleroma/pleroma!2681

4 years agofix for emoji pagination in pack show
Alexander Strizhakov [Wed, 24 Jun 2020 15:06:30 +0000 (18:06 +0300)]
fix for emoji pagination in pack show

4 years agoStatus schema: Add parent_visible.
lain [Wed, 24 Jun 2020 12:33:00 +0000 (14:33 +0200)]
Status schema: Add parent_visible.

4 years agoChangelog: Put info under API header.
lain [Wed, 24 Jun 2020 12:30:12 +0000 (14:30 +0200)]
Changelog: Put info under API header.

4 years agoChangelog: Add info about parent_visible field
lain [Wed, 24 Jun 2020 11:32:14 +0000 (13:32 +0200)]
Changelog: Add info about parent_visible field

4 years agoDocs: Document added parent_visible field.
lain [Wed, 24 Jun 2020 11:31:42 +0000 (13:31 +0200)]
Docs: Document added parent_visible field.

4 years agoStatusView: Add pleroma.parent_visible
lain [Wed, 24 Jun 2020 11:29:08 +0000 (13:29 +0200)]
StatusView: Add pleroma.parent_visible

4 years agoMerge branch 'feature/admin-api-status-count-per-instance' into 'develop'
lain [Wed, 24 Jun 2020 10:42:07 +0000 (10:42 +0000)]
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'

admin api status count per instance

See merge request pleroma/pleroma!2500

4 years agoMerge branch 'issue/1872-updated-tzdata' into 'develop'
lain [Wed, 24 Jun 2020 09:00:17 +0000 (09:00 +0000)]
Merge branch 'issue/1872-updated-tzdata' into 'develop'

[#1872] use Pleroma.HTTP for Tzdata

See merge request pleroma/pleroma!2678

4 years agoApply suggestion to test/http/tzdata_test.exs
lain [Wed, 24 Jun 2020 08:50:33 +0000 (08:50 +0000)]
Apply suggestion to test/http/tzdata_test.exs

4 years agoadded wrapper Pleroma.HTTP for Tzdata.HTTPClient
Maksim Pechnikov [Wed, 24 Jun 2020 06:12:32 +0000 (09:12 +0300)]
added wrapper Pleroma.HTTP for Tzdata.HTTPClient

4 years agoMerge branch 'moving-mrf-namespace-migration-fix' into 'develop'
feld [Tue, 23 Jun 2020 18:51:37 +0000 (18:51 +0000)]
Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'

Moving to mrf namespace migration fix

See merge request pleroma/pleroma!2676

4 years agoMerge branch 'update-validator' into 'develop'
lain [Tue, 23 Jun 2020 18:10:33 +0000 (18:10 +0000)]
Merge branch 'update-validator' into 'develop'

Update validator

See merge request pleroma/pleroma!2668

4 years agoMerge develop
Roman Chvanikov [Tue, 23 Jun 2020 17:56:55 +0000 (20:56 +0300)]
Merge develop

4 years agomoving to mrf namespace migration fix
Alexander Strizhakov [Tue, 23 Jun 2020 17:18:27 +0000 (20:18 +0300)]
moving to mrf namespace migration fix

4 years agoMerge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Haelwenn [Tue, 23 Jun 2020 16:38:27 +0000 (16:38 +0000)]
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'

Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320

4 years agoRemove reference to defunct distsn.org
Mark Felder [Tue, 23 Jun 2020 16:17:26 +0000 (11:17 -0500)]
Remove reference to defunct distsn.org

4 years agoMerge branch 'issue/1798' into 'develop'
lain [Tue, 23 Jun 2020 10:54:15 +0000 (10:54 +0000)]
Merge branch 'issue/1798' into 'develop'

[#1798] fixed migration the settings to DB

See merge request pleroma/pleroma!2655

4 years agoObjectValidator: Clarify type of object.
lain [Tue, 23 Jun 2020 10:37:05 +0000 (12:37 +0200)]
ObjectValidator: Clarify type of object.

4 years agoMerge branch 'fix_1586_provide_index_md' into 'develop'
lain [Tue, 23 Jun 2020 10:06:47 +0000 (10:06 +0000)]
Merge branch 'fix_1586_provide_index_md' into 'develop'

Fix 1586 provide index md

See merge request pleroma/pleroma!2669

4 years agoActivityPubControllerTest: Capture error log
lain [Tue, 23 Jun 2020 10:04:51 +0000 (12:04 +0200)]
ActivityPubControllerTest: Capture error log

4 years agoActivityPubControllerTest: Testing changes.
lain [Tue, 23 Jun 2020 09:43:20 +0000 (11:43 +0200)]
ActivityPubControllerTest: Testing changes.

4 years agoAn act of desperation.
lain [Tue, 23 Jun 2020 09:03:32 +0000 (11:03 +0200)]
An act of desperation.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
lain [Tue, 23 Jun 2020 08:17:12 +0000 (10:17 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator

4 years agofix tests
Maksim Pechnikov [Tue, 23 Jun 2020 06:08:24 +0000 (09:08 +0300)]
fix tests

4 years agoadded tests
Maksim Pechnikov [Tue, 23 Jun 2020 03:56:17 +0000 (06:56 +0300)]
added tests

4 years agoMerge branch '@doc/apc2s-upload-media' into 'develop'
Haelwenn [Tue, 23 Jun 2020 03:04:27 +0000 (03:04 +0000)]
Merge branch '@doc/apc2s-upload-media' into 'develop'

ActivityPubController: Update upload_media @doc

See merge request pleroma/pleroma!2673

4 years agoActivityPubController: Update upload_media @doc
Haelwenn (lanodan) Monnier [Tue, 23 Jun 2020 02:42:44 +0000 (04:42 +0200)]
ActivityPubController: Update upload_media @doc

Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810

4 years agoMerge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Haelwenn [Tue, 23 Jun 2020 01:55:33 +0000 (01:55 +0000)]
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'

Add missing default config value for :instance, instance_thumbnail

See merge request pleroma/pleroma!2672

4 years agoDo not need a function to provide fallback value with default defined in config.exs
Mark Felder [Mon, 22 Jun 2020 22:39:02 +0000 (17:39 -0500)]
Do not need a function to provide fallback value with default defined in config.exs

4 years agoAdd missing default config value for :instance, instance_thumbnail
Mark Felder [Mon, 22 Jun 2020 22:35:02 +0000 (17:35 -0500)]
Add missing default config value for :instance, instance_thumbnail

Follows up on b7fc61e17b

4 years agoMerge branch 'warning/mastofe-settings-blob' into 'develop'
Haelwenn [Mon, 22 Jun 2020 21:59:21 +0000 (21:59 +0000)]
Merge branch 'warning/mastofe-settings-blob' into 'develop'

Add warning against parsing/reusing MastoFE settings blob

See merge request pleroma/pleroma!2671

4 years agoAdd warning against parsing/reusing MastoFE settings blob
Haelwenn (lanodan) Monnier [Mon, 22 Jun 2020 21:45:29 +0000 (23:45 +0200)]
Add warning against parsing/reusing MastoFE settings blob

4 years agoMerge branch 'add-muted-to-notifications' into 'develop'
lain [Mon, 22 Jun 2020 15:40:09 +0000 (15:40 +0000)]
Merge branch 'add-muted-to-notifications' into 'develop'

Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670

4 years agoUpdate NotificationOperation spec
Egor Kislitsyn [Mon, 22 Jun 2020 15:18:33 +0000 (19:18 +0400)]
Update NotificationOperation spec

4 years agoAdd `is_muted` to notifications
Egor Kislitsyn [Mon, 22 Jun 2020 15:03:04 +0000 (19:03 +0400)]
Add `is_muted` to notifications

4 years agoadded verify RUM settings before start app
Maksim Pechnikov [Mon, 22 Jun 2020 14:27:49 +0000 (17:27 +0300)]
added verify RUM settings before start app

4 years agoMerge branch 'feature/1739-account-endpoints' into 'develop'
lain [Mon, 22 Jun 2020 12:37:10 +0000 (12:37 +0000)]
Merge branch 'feature/1739-account-endpoints' into 'develop'

account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488

4 years agoMerge branch 'docs_use_include_for_install_further_reading' into 'develop'
lain [Mon, 22 Jun 2020 12:35:00 +0000 (12:35 +0000)]
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'

Add include for the "Further reading" section

See merge request pleroma/pleroma!2667

4 years agoMerge branch 'fix/1825-admin-api-error-codes' into 'develop'
lain [Mon, 22 Jun 2020 12:25:12 +0000 (12:25 +0000)]
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'

Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
lain [Mon, 22 Jun 2020 12:23:45 +0000 (12:23 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!2661

4 years agoRemoved a space that was too much
Ilja [Mon, 22 Jun 2020 12:22:23 +0000 (14:22 +0200)]
Removed a space that was too much

4 years agoI forgot to git add some files, oops (should be squashed with MR)
Ilja [Mon, 22 Jun 2020 12:18:55 +0000 (14:18 +0200)]
I forgot to git add some files, oops (should be squashed with MR)

4 years agoFix 1586 Docs: provide a index.md
Ilja [Mon, 22 Jun 2020 12:13:30 +0000 (14:13 +0200)]
Fix 1586 Docs: provide a index.md

* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links

4 years agoCredo fixes
lain [Mon, 22 Jun 2020 12:02:29 +0000 (14:02 +0200)]
Credo fixes

4 years agoActivityPub: Remove `update` and switch to pipeline.
lain [Mon, 22 Jun 2020 11:59:45 +0000 (13:59 +0200)]
ActivityPub: Remove `update` and switch to pipeline.

4 years agoTranslated using Weblate (Italian)
Ben Is [Fri, 19 Jun 2020 14:35:01 +0000 (14:35 +0000)]
Translated using Weblate (Italian)

Currently translated at 0.9% (1 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/

4 years agoAdded translation using Weblate (Italian)
Ben Is [Fri, 19 Jun 2020 14:33:58 +0000 (14:33 +0000)]
Added translation using Weblate (Italian)

4 years agoMerge branch '1865-media-only' into 'develop'
rinpatch [Mon, 22 Jun 2020 11:34:07 +0000 (11:34 +0000)]
Merge branch '1865-media-only' into 'develop'

Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"

Closes #1865

See merge request pleroma/pleroma!2650

4 years agoUpdate Handling Test: Fix for re-used update ids.
lain [Mon, 22 Jun 2020 11:23:21 +0000 (13:23 +0200)]
Update Handling Test: Fix for re-used update ids.

4 years agoTransmogrifier: Handle `Update` with the pipeline.
lain [Mon, 22 Jun 2020 11:16:05 +0000 (13:16 +0200)]
Transmogrifier: Handle `Update` with the pipeline.

4 years agoSideEffects: Handle user updating.
lain [Mon, 22 Jun 2020 11:15:37 +0000 (13:15 +0200)]
SideEffects: Handle user updating.

4 years agoMerge branch '1883-mrf-chat' into 'develop'
rinpatch [Mon, 22 Jun 2020 10:00:13 +0000 (10:00 +0000)]
Merge branch '1883-mrf-chat' into 'develop'

HellthreadPolicy: Restrict to Notes and Articles.

Closes #1883

See merge request pleroma/pleroma!2666

4 years agoAdd include for the "Further reading" section
Ilja [Mon, 22 Jun 2020 09:41:22 +0000 (11:41 +0200)]
Add include for the "Further reading" section

* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit

4 years agoMerge branch 'feature/1854-emoji-pagination' into 'develop'
lain [Mon, 22 Jun 2020 08:41:09 +0000 (08:41 +0000)]
Merge branch 'feature/1854-emoji-pagination' into 'develop'

Emoji and packs pagination

Closes #1854

See merge request pleroma/pleroma!2658

4 years agoHellthreadPolicy: Restrict to Notes and Articles.
lain [Mon, 22 Jun 2020 08:35:11 +0000 (10:35 +0200)]
HellthreadPolicy: Restrict to Notes and Articles.

4 years agoMerge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
lain [Sat, 20 Jun 2020 16:22:01 +0000 (16:22 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'

mix.exs: version git-less (part 2, MacOS-compat)

See merge request pleroma/pleroma!2420

4 years agoApply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Alexander Strizhakov [Sat, 20 Jun 2020 10:59:08 +0000 (10:59 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex

4 years agoproper error codes for error in adminFE
Alexander Strizhakov [Sat, 20 Jun 2020 10:53:57 +0000 (13:53 +0300)]
proper error codes for error in adminFE

4 years agoMerge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
lain [Sat, 20 Jun 2020 09:57:12 +0000 (09:57 +0000)]
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'

Support 'bot' field in account update_credentials

Closes #1600 and #1467

See merge request pleroma/pleroma!2662