akkoma
4 years agoConnection pool: check that there actually is a result
rinpatch [Wed, 6 May 2020 18:51:10 +0000 (21:51 +0300)]
Connection pool: check that there actually is a result

Sometimes connections died before being released to the pool, resulting
in MatchErrors

4 years agoConnection Pool: don't enforce pool limits if no new connection needs to be opened
rinpatch [Wed, 6 May 2020 18:41:34 +0000 (21:41 +0300)]
Connection Pool: don't enforce pool limits if no new connection needs to be opened

4 years agoRefactor gun pooling and simplify adapter option insertion
rinpatch [Tue, 5 May 2020 22:51:10 +0000 (01:51 +0300)]
Refactor gun pooling and simplify adapter option insertion

This patch refactors gun pooling to use Elixir process registry and
simplifies adapter option insertion.

Having the pool use process registry instead of a GenServer has a number of advantages:
- Simpler code: the initial implementation adds about half the lines of code it deletes
- Concurrency: unlike a GenServer, ETS-based registry can handle multiple checkout/checkin
requests at the same time
- Precise and easy idle connection clousure: current proposal for closing idle connections in
the GenServer-based pool needs to filter through all connections once a minute and compare their
last active time with closing time. With Elixir process registry this can be done
by just using `Process.send_after`/`Process.cancel_timer` in the worker process.
- Lower memory footprint: In my tests `gun-memory-leak` branch uses about 290mb on peak load (250 connections)
and 235mb on idle (5-10 connections). Registry-based pool uses 210mb on idle and 240mb on peak load

4 years agoCreate Question: Add context field to create
Haelwenn (lanodan) Monnier [Thu, 2 Jul 2020 03:45:19 +0000 (05:45 +0200)]
Create Question: Add context field to create

4 years agoQuestion: Add tests on HTML tags in options
Haelwenn (lanodan) Monnier [Thu, 2 Jul 2020 03:47:18 +0000 (05:47 +0200)]
Question: Add tests on HTML tags in options

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362
4 years ago{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
Haelwenn (lanodan) Monnier [Thu, 25 Jun 2020 22:07:43 +0000 (00:07 +0200)]
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them

4 years agoFix attachments in polls
Haelwenn (lanodan) Monnier [Tue, 23 Jun 2020 03:30:34 +0000 (05:30 +0200)]
Fix attachments in polls

4 years agoMerge branch 'tests/apc2s-update_outbox' into 'develop'
lain [Wed, 15 Jul 2020 10:12:44 +0000 (10:12 +0000)]
Merge branch 'tests/apc2s-update_outbox' into 'develop'

AP C2S tests: Make sure you can't use another user's AP id

See merge request pleroma/pleroma!2767

4 years agoFixup for EctoType module move
Haelwenn (lanodan) Monnier [Fri, 19 Jun 2020 22:23:04 +0000 (00:23 +0200)]
Fixup for EctoType module move

4 years agoQuestionValidator: Use AttachmentValidator
Haelwenn (lanodan) Monnier [Fri, 19 Jun 2020 22:07:39 +0000 (00:07 +0200)]
QuestionValidator: Use AttachmentValidator

4 years agoCreateGenericValidator: add expires_at
Haelwenn (lanodan) Monnier [Fri, 19 Jun 2020 21:43:36 +0000 (23:43 +0200)]
CreateGenericValidator: add expires_at

4 years agotransmogrifier tests: Move & enhance in specialised modules
Haelwenn (lanodan) Monnier [Fri, 19 Jun 2020 21:31:19 +0000 (23:31 +0200)]
transmogrifier tests: Move & enhance in specialised modules

4 years agoSideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
Haelwenn (lanodan) Monnier [Thu, 18 Jun 2020 02:05:42 +0000 (04:05 +0200)]
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert

4 years agoquestion_validator: remove conversation field
Haelwenn (lanodan) Monnier [Thu, 18 Jun 2020 17:54:56 +0000 (19:54 +0200)]
question_validator: remove conversation field

4 years agoquestion_validator: fix for mastodon poll expiration
Haelwenn (lanodan) Monnier [Mon, 15 Jun 2020 03:18:30 +0000 (05:18 +0200)]
question_validator: fix for mastodon poll expiration

Mastodon activities do not have a "closed" field, this could be seen on
https://pouet.it/users/lanodan_tmp/statuses/104345126997708380
which runs Mastodon 3.1.4 (SDF runs 3.1.2)

4 years agocreate_question_validator: remove validate_recipients_match
Haelwenn (lanodan) Monnier [Mon, 15 Jun 2020 00:20:18 +0000 (02:20 +0200)]
create_question_validator: remove validate_recipients_match

4 years agofetcher: Reinject Question through validator
Haelwenn (lanodan) Monnier [Sun, 14 Jun 2020 20:01:14 +0000 (22:01 +0200)]
fetcher: Reinject Question through validator

4 years agofetcher: more descriptive variable names
Haelwenn (lanodan) Monnier [Sun, 14 Jun 2020 20:24:00 +0000 (22:24 +0200)]
fetcher: more descriptive variable names

4 years agoFix multiple-choice poll detection
Haelwenn (lanodan) Monnier [Sun, 14 Jun 2020 22:30:45 +0000 (00:30 +0200)]
Fix multiple-choice poll detection

4 years agotransmogrifier_test: test date, anyOf and oneOf completely
Haelwenn (lanodan) Monnier [Sun, 14 Jun 2020 20:25:04 +0000 (22:25 +0200)]
transmogrifier_test: test date, anyOf and oneOf completely

4 years agoQuestionOptionsValidator: inline schema for replies
Haelwenn (lanodan) Monnier [Fri, 12 Jun 2020 19:22:05 +0000 (21:22 +0200)]
QuestionOptionsValidator: inline schema for replies

4 years agoAnswerValidator: Create
Haelwenn (lanodan) Monnier [Thu, 11 Jun 2020 18:43:01 +0000 (20:43 +0200)]
AnswerValidator: Create

4 years agoQuestionValidator: Create
Haelwenn (lanodan) Monnier [Thu, 11 Jun 2020 18:23:10 +0000 (20:23 +0200)]
QuestionValidator: Create

4 years agoAP C2S tests: Make sure you can't use another user's AP id
Haelwenn (lanodan) Monnier [Wed, 15 Jul 2020 07:58:35 +0000 (09:58 +0200)]
AP C2S tests: Make sure you can't use another user's AP id

4 years agoEmail admins when a new unapproved account is up for review
Alex Gleason [Wed, 15 Jul 2020 01:31:20 +0000 (20:31 -0500)]
Email admins when a new unapproved account is up for review

4 years agoMerge remote-tracking branch 'upstream/develop' into by-approval
Alex Gleason [Tue, 14 Jul 2020 23:56:40 +0000 (18:56 -0500)]
Merge remote-tracking branch 'upstream/develop' into by-approval

4 years agoAdd :approval_pending to User @type account_status
Alex Gleason [Tue, 14 Jul 2020 23:48:17 +0000 (18:48 -0500)]
Add :approval_pending to User @type account_status

4 years agoUpdate CHANGELOG.md
Alex Gleason [Tue, 14 Jul 2020 23:47:23 +0000 (18:47 -0500)]
Update CHANGELOG.md

4 years agoTest User with confirmation_pending: true, approval_pending: true
Alex Gleason [Tue, 14 Jul 2020 23:46:57 +0000 (18:46 -0500)]
Test User with confirmation_pending: true, approval_pending: true

4 years agoAdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
Alex Gleason [Tue, 14 Jul 2020 23:02:44 +0000 (18:02 -0500)]
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint

4 years agoAdminAPI: Filter users by `need_approval`
Alex Gleason [Tue, 14 Jul 2020 19:14:43 +0000 (14:14 -0500)]
AdminAPI: Filter users by `need_approval`

4 years agoAdminAPI: Return `approval_pending` with users
Alex Gleason [Tue, 14 Jul 2020 18:47:05 +0000 (13:47 -0500)]
AdminAPI: Return `approval_pending` with users

4 years agoInclude port in host for signatures
Maksim Pechnikov [Tue, 14 Jul 2020 18:44:08 +0000 (21:44 +0300)]
Include port in host for signatures

4 years agoLint and fix test to match new log message
Mark Felder [Tue, 14 Jul 2020 18:15:37 +0000 (13:15 -0500)]
Lint and fix test to match new log message

4 years agoImprove error messages
Mark Felder [Tue, 14 Jul 2020 18:12:16 +0000 (13:12 -0500)]
Improve error messages

4 years agoAdminAPI: Return `registration_reason` with users
Alex Gleason [Tue, 14 Jul 2020 18:04:57 +0000 (13:04 -0500)]
AdminAPI: Return `registration_reason` with users

4 years agoMerge branch 'feature/1922-media-proxy-whitelist' into 'develop'
feld [Tue, 14 Jul 2020 18:07:44 +0000 (18:07 +0000)]
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'

Support for hosts with scheme in MediaProxy whitelist setting

Closes #1922

See merge request pleroma/pleroma!2754

4 years agoMerge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'
feld [Tue, 14 Jul 2020 18:05:36 +0000 (18:05 +0000)]
Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'

Fix in-db configuration in dev environment

See merge request pleroma/pleroma!2764

4 years agoMerge branch '1940-admin-token-oauthless-auth' into 'develop'
feld [Tue, 14 Jul 2020 16:48:26 +0000 (16:48 +0000)]
Merge branch '1940-admin-token-oauthless-auth' into 'develop'

[#1940] Reinstated OAuth-less `admin_token` authentication

Closes #1940

See merge request pleroma/pleroma!2760

4 years ago[#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API...
Ivan Tashkinov [Tue, 14 Jul 2020 16:31:05 +0000 (19:31 +0300)]
[#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.

4 years agoClarify description and suggestion
Mark Felder [Tue, 14 Jul 2020 16:24:58 +0000 (11:24 -0500)]
Clarify description and suggestion

4 years agoMerge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
feld [Tue, 14 Jul 2020 15:17:25 +0000 (15:17 +0000)]
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'

Transmogrifier: filtering weirdness in address fields

Closes #1916

See merge request pleroma/pleroma!2762

4 years agoMerge branch 'fix/oban-2.0-in-db-config' into 'develop'
rinpatch [Tue, 14 Jul 2020 10:39:08 +0000 (10:39 +0000)]
Merge branch 'fix/oban-2.0-in-db-config' into 'develop'

Migrate in-db config after updating to Oban 2.0

See merge request pleroma/pleroma!2765

4 years agoFix in-db configuration in dev environment
rinpatch [Tue, 14 Jul 2020 08:41:30 +0000 (11:41 +0300)]
Fix in-db configuration in dev environment

Previously, in-db configuration only worked when `warnings_as_errors`
was disabled because re-compiling scrubbers on application restart
created a warning about module conflicts. This patch fixes that
by enabling `ignore_module_conflict` option of the compiler at runtime,
and enables `warnings_as_errors` in prod since there is no reason
to keep it disabled anymore.

4 years agoMigrate in-db config after updating to Oban 2.0
rinpatch [Tue, 14 Jul 2020 09:00:53 +0000 (12:00 +0300)]
Migrate in-db config after updating to Oban 2.0

4 years agoMRF Policies: Return a {:reject, reason} instead of {:reject, nil}
Haelwenn (lanodan) Monnier [Mon, 13 Jul 2020 13:47:13 +0000 (15:47 +0200)]
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}

4 years ago[#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings...
Ivan Tashkinov [Tue, 14 Jul 2020 08:58:41 +0000 (11:58 +0300)]
[#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.

4 years ago[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlu...
Ivan Tashkinov [Sun, 19 Jul 2020 18:35:57 +0000 (21:35 +0300)]
[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).

4 years agoadded generated `pleroma.env`
Maksim Pechnikov [Tue, 14 Jul 2020 04:31:21 +0000 (07:31 +0300)]
added generated  `pleroma.env`

4 years agoAccept `reason` in POST /api/v1/accounts and store in DB
Alex Gleason [Tue, 14 Jul 2020 05:22:12 +0000 (00:22 -0500)]
Accept `reason` in POST /api/v1/accounts and store in DB

4 years agoTransmogrifier: filtering weirdness in address fields
= [Mon, 13 Jul 2020 19:19:13 +0000 (22:19 +0300)]
Transmogrifier: filtering weirdness in address fields

4 years agoMerge branch 'develop' into refactor/notification_settings
Mark Felder [Mon, 13 Jul 2020 18:32:21 +0000 (13:32 -0500)]
Merge branch 'develop' into refactor/notification_settings

4 years agoMerge branch 'config-behaviours-runtime' into 'develop'
feld [Mon, 13 Jul 2020 15:45:25 +0000 (15:45 +0000)]
Merge branch 'config-behaviours-runtime' into 'develop'

Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request pleroma/pleroma!2755

4 years agoMerge branch 'features/profile-fields-emojo' into 'develop'
feld [Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)]
Merge branch 'features/profile-fields-emojo' into 'develop'

user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741

4 years agoMerge branch 'chore/improve-database-config-docs' into 'develop'
feld [Mon, 13 Jul 2020 15:42:20 +0000 (15:42 +0000)]
Merge branch 'chore/improve-database-config-docs' into 'develop'

Improve database config migration and add documentation

See merge request pleroma/pleroma!2756

4 years agoMerge branch 'fix/mediaproxy-cache-settings-types' into 'develop'
feld [Mon, 13 Jul 2020 15:38:56 +0000 (15:38 +0000)]
Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'

Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http

See merge request pleroma/pleroma!2735

4 years agoLint
Mark Felder [Mon, 13 Jul 2020 15:32:17 +0000 (10:32 -0500)]
Lint

4 years agoShow examples for both OTP and source
Mark Felder [Mon, 13 Jul 2020 14:56:05 +0000 (09:56 -0500)]
Show examples for both OTP and source

4 years agoPick up env for both source and OTP installs
Mark Felder [Mon, 13 Jul 2020 13:39:56 +0000 (08:39 -0500)]
Pick up env for both source and OTP installs

4 years agoUse Logger.info for {:reject, reason}
Haelwenn (lanodan) Monnier [Mon, 13 Jul 2020 12:23:03 +0000 (14:23 +0200)]
Use Logger.info for {:reject, reason}

4 years agoTransmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
Haelwenn (lanodan) Monnier [Mon, 13 Jul 2020 12:27:25 +0000 (14:27 +0200)]
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post

4 years agoMerge branch '1937-renaming' into 'develop'
Haelwenn [Mon, 13 Jul 2020 12:06:43 +0000 (12:06 +0000)]
Merge branch '1937-renaming' into 'develop'

ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748

4 years agoMake a user unapproved when registering with `account_approval_required` on
Alex Gleason [Mon, 13 Jul 2020 02:31:13 +0000 (21:31 -0500)]
Make a user unapproved when registering with `account_approval_required` on

4 years agoPrevent unapproved users from logging in
Alex Gleason [Mon, 13 Jul 2020 01:15:27 +0000 (20:15 -0500)]
Prevent unapproved users from logging in

4 years agoAdd `account_approval_required` instance setting
Alex Gleason [Mon, 13 Jul 2020 01:14:57 +0000 (20:14 -0500)]
Add `account_approval_required` instance setting

4 years agoAdd `approval_pending` field to User
Alex Gleason [Mon, 13 Jul 2020 00:11:30 +0000 (19:11 -0500)]
Add `approval_pending` field to User

4 years agoStill allow passing the arg, but fallback to MIX_ENV
Mark Felder [Sun, 12 Jul 2020 15:59:12 +0000 (10:59 -0500)]
Still allow passing the arg, but fallback to MIX_ENV

4 years agoMake the query more precise
Mark Felder [Sun, 12 Jul 2020 15:43:24 +0000 (10:43 -0500)]
Make the query more precise

4 years agoImprove database config migration and add documentation
Mark Felder [Sun, 12 Jul 2020 15:38:07 +0000 (10:38 -0500)]
Improve database config migration and add documentation

4 years agoConfig/Docs: Expand behaviour suggestions at runtime
href [Sun, 12 Jul 2020 15:23:33 +0000 (17:23 +0200)]
Config/Docs: Expand behaviour suggestions at runtime

4 years agoMediaProxy whitelist setting now supports hosts with scheme
Alexander Strizhakov [Sat, 11 Jul 2020 07:36:36 +0000 (10:36 +0300)]
MediaProxy whitelist setting now supports hosts with scheme

added deprecation warning about using bare domains

4 years agoUpdate types in MRF Keyword group
Angelina Filippova [Sat, 11 Jul 2020 22:38:16 +0000 (01:38 +0300)]
Update types in MRF Keyword group

4 years agoCheck if mogrify available before calling it
Roman Chvanikov [Sat, 11 Jul 2020 15:22:03 +0000 (18:22 +0300)]
Check if mogrify available before calling it

4 years agoRemove Logger requirement
Roman Chvanikov [Sat, 11 Jul 2020 15:15:51 +0000 (18:15 +0300)]
Remove Logger requirement

4 years agoError in Filter.Exiftool if exiftool not found
Roman Chvanikov [Sat, 11 Jul 2020 15:11:23 +0000 (18:11 +0300)]
Error in Filter.Exiftool if exiftool not found

4 years agoOne can not simply call application modules from mix.exs
Roman Chvanikov [Sat, 11 Jul 2020 13:09:46 +0000 (16:09 +0300)]
One can not simply call application modules from mix.exs

4 years agoAdd Pleroma.Utils.command_available?/1 and use where appropriate
Roman Chvanikov [Sat, 11 Jul 2020 12:48:45 +0000 (15:48 +0300)]
Add Pleroma.Utils.command_available?/1 and use where appropriate

4 years agoMerge branch 'feature/upload-filter-exiftool' into 'develop'
lain [Sat, 11 Jul 2020 11:31:44 +0000 (11:31 +0000)]
Merge branch 'feature/upload-filter-exiftool' into 'develop'

Add Pleroma.Upload.Filter.Exiftool

Closes #1935

See merge request pleroma/pleroma!2744

4 years agoMerge branch 'patch-3' into 'develop'
lain [Sat, 11 Jul 2020 11:30:02 +0000 (11:30 +0000)]
Merge branch 'patch-3' into 'develop'

docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths

See merge request pleroma/pleroma!2752

4 years agodocs: API: fix update_credentials endpoints path, clarify update/verify_credentials...
Alibek Omarov [Sat, 11 Jul 2020 11:02:13 +0000 (11:02 +0000)]
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths

4 years agofix reset confirmation email in admin section
Maksim Pechnikov [Sat, 11 Jul 2020 04:20:35 +0000 (07:20 +0300)]
fix reset confirmation email in admin section

4 years agoRemove :regex from types
Angelina Filippova [Sat, 11 Jul 2020 01:32:44 +0000 (04:32 +0300)]
Remove :regex from types

4 years agoUpdate types for :params, :match_actor and :replace settings
Angelina Filippova [Sat, 11 Jul 2020 01:17:21 +0000 (04:17 +0300)]
Update types for :params, :match_actor and :replace settings

4 years agoRemove unused @types
Mark Felder [Fri, 10 Jul 2020 22:08:54 +0000 (17:08 -0500)]
Remove unused @types

4 years agoAdd a moduledoc
Mark Felder [Fri, 10 Jul 2020 22:07:28 +0000 (17:07 -0500)]
Add a moduledoc

4 years agoSupport Exiftool for stripping EXIF data
Mark Felder [Fri, 10 Jul 2020 21:46:26 +0000 (16:46 -0500)]
Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.

4 years agoMerge branch 'issue/1790-updated-oban' into 'develop'
feld [Fri, 10 Jul 2020 17:39:46 +0000 (17:39 +0000)]
Merge branch 'issue/1790-updated-oban' into 'develop'

[#1790] updated oban to 2.0.0

See merge request pleroma/pleroma!2674

4 years agoMerge branch 'fix/1924-s3-descriptions' into 'develop'
feld [Fri, 10 Jul 2020 16:42:35 +0000 (16:42 +0000)]
Merge branch 'fix/1924-s3-descriptions' into 'develop'

docs and descriptions for s3 settings

Closes #1924

See merge request pleroma/pleroma!2745

4 years agoMerge branch 'chore/should-document-that' into 'develop'
feld [Fri, 10 Jul 2020 16:38:05 +0000 (16:38 +0000)]
Merge branch 'chore/should-document-that' into 'develop'

Probably worth documenting the MediaProxy fix

See merge request pleroma/pleroma!2750

4 years agoMerge branch 'develop' into issue/1790-updated-oban
Mark Felder [Fri, 10 Jul 2020 16:34:53 +0000 (11:34 -0500)]
Merge branch 'develop' into issue/1790-updated-oban

4 years agoSwitch to the official Oban 2.0.0 release
Mark Felder [Fri, 10 Jul 2020 16:33:08 +0000 (11:33 -0500)]
Switch to the official Oban 2.0.0 release

4 years agoProbably worth documenting the MediaProxy fix
Mark Felder [Fri, 10 Jul 2020 16:22:29 +0000 (11:22 -0500)]
Probably worth documenting the MediaProxy fix

4 years agoMerge branch 'proxy-range-and-chunk' into 'develop'
feld [Fri, 10 Jul 2020 16:18:28 +0000 (16:18 +0000)]
Merge branch 'proxy-range-and-chunk' into 'develop'

ReverseProxy: Streaming and disable encoding if Range

Closes #1860 and #1823

See merge request pleroma/pleroma!2749

4 years agoCredo line length complaint
Mark Felder [Fri, 10 Jul 2020 16:04:19 +0000 (11:04 -0500)]
Credo line length complaint

4 years agoReverseProxy: Streaming and disable encoding if Range
href [Fri, 10 Jul 2020 15:10:48 +0000 (17:10 +0200)]
ReverseProxy: Streaming and disable encoding if Range

Fixes #1823
Fixes #1860

4 years agoActivityPub: Don't rename a clashing nickname with the same ap id.
lain [Fri, 10 Jul 2020 12:10:44 +0000 (14:10 +0200)]
ActivityPub: Don't rename a clashing nickname with the same ap id.

4 years agoMerge branch 'chat-federation-information' into 'develop'
lain [Fri, 10 Jul 2020 10:37:42 +0000 (10:37 +0000)]
Merge branch 'chat-federation-information' into 'develop'

Add an `accepts_chat_messages` to user, expose in api and federation

See merge request pleroma/pleroma!2716

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation...
lain [Fri, 10 Jul 2020 10:26:53 +0000 (12:26 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information

4 years agoMerge branch 'bump-fe-2020-07-10' into 'develop'
lain [Fri, 10 Jul 2020 09:45:10 +0000 (09:45 +0000)]
Merge branch 'bump-fe-2020-07-10' into 'develop'

Update frontend

See merge request pleroma/pleroma!2747

4 years agoUpdate frontend
lain [Fri, 10 Jul 2020 09:41:10 +0000 (11:41 +0200)]
Update frontend