akkoma
4 years agoTest that unapproved users can never log in regardless of admin settings
Alex Gleason [Fri, 17 Jul 2020 17:26:52 +0000 (12:26 -0500)]
Test that unapproved users can never log in regardless of admin settings

4 years agoFully delete users with status :approval_pending
Alex Gleason [Fri, 17 Jul 2020 17:19:41 +0000 (12:19 -0500)]
Fully delete users with status :approval_pending

4 years agoSanitize `reason` param in POST /api/v1/accounts
Alex Gleason [Fri, 17 Jul 2020 01:25:53 +0000 (20:25 -0500)]
Sanitize `reason` param in POST /api/v1/accounts

4 years agoSquash User approval migrations
Alex Gleason [Wed, 15 Jul 2020 22:08:46 +0000 (17:08 -0500)]
Squash User approval migrations

4 years agoUse `approval_required` in /api/v1/instance
Alex Gleason [Wed, 15 Jul 2020 22:04:30 +0000 (17:04 -0500)]
Use `approval_required` in /api/v1/instance

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 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 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 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 '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 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 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 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

4 years agoMerge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
Haelwenn [Fri, 10 Jul 2020 09:22:14 +0000 (09:22 +0000)]
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'

Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`

Closes admin-fe#107 and #1788

See merge request pleroma/pleroma!2554

4 years agoMerge branch 'mix-tasks-improvement' into 'develop'
lain [Fri, 10 Jul 2020 08:58:44 +0000 (08:58 +0000)]
Merge branch 'mix-tasks-improvement' into 'develop'

Mix tasks improvement

See merge request pleroma/pleroma!2723

4 years agoMerge branch 'cluster-test-ci' into 'develop'
lain [Fri, 10 Jul 2020 08:56:12 +0000 (08:56 +0000)]
Merge branch 'cluster-test-ci' into 'develop'

RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743

4 years agoMerge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
Haelwenn [Fri, 10 Jul 2020 08:55:15 +0000 (08:55 +0000)]
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'

# Conflicts:
#   CHANGELOG.md

4 years agoMerge branch 'user-search-nickname-rank-boost' into 'develop'
Haelwenn [Fri, 10 Jul 2020 08:49:14 +0000 (08:49 +0000)]
Merge branch 'user-search-nickname-rank-boost' into 'develop'

Improved search results for localized nickname match

See merge request pleroma/pleroma!2733

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Fri, 10 Jul 2020 08:45:39 +0000 (08:45 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!2739

4 years agoTranslated using Weblate (Italian)
Ben Is [Wed, 8 Jul 2020 00:00:40 +0000 (00:00 +0000)]
Translated using Weblate (Italian)

Currently translated at 100.0% (106 of 106 strings)

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

4 years agoTranslated using Weblate (Polish)
Ben Is [Wed, 8 Jul 2020 22:51:39 +0000 (22:51 +0000)]
Translated using Weblate (Polish)

Currently translated at 66.0% (70 of 106 strings)

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

4 years agoMerge branch 'prometheus-update' into 'develop'
Haelwenn [Fri, 10 Jul 2020 08:27:41 +0000 (08:27 +0000)]
Merge branch 'prometheus-update' into 'develop'

prometheus update for OTP 23

See merge request pleroma/pleroma!2746

4 years agoprometheus update for OTP 23
Alexander Strizhakov [Fri, 10 Jul 2020 07:35:59 +0000 (10:35 +0300)]
prometheus update for OTP 23

4 years agodocs and descriptions for s3 settings
Alexander Strizhakov [Fri, 10 Jul 2020 06:16:53 +0000 (09:16 +0300)]
docs and descriptions for s3 settings

4 years agoUpdate type for :replace settings
Angelina Filippova [Fri, 10 Jul 2020 00:32:53 +0000 (03:32 +0300)]
Update type for :replace settings

4 years agoUpdate type for :groups setting
Angelina Filippova [Fri, 10 Jul 2020 00:07:55 +0000 (03:07 +0300)]
Update type for :groups setting

4 years agoRe-enable the federated tests, increase timeout
stwf [Wed, 8 Jul 2020 19:56:03 +0000 (15:56 -0400)]
Re-enable the federated tests, increase timeout

4 years agoMerge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'
feld [Thu, 9 Jul 2020 17:23:15 +0000 (17:23 +0000)]
Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'

Add AdminFE reports URL to report emails

Closes #1926

See merge request pleroma/pleroma!2742

4 years agouser: Add support for custom emojis in profile fields
Haelwenn (lanodan) Monnier [Thu, 9 Jul 2020 17:07:07 +0000 (19:07 +0200)]
user: Add support for custom emojis in profile fields

4 years agoAdd AdminFE reports URL to report emails
Mark Felder [Thu, 9 Jul 2020 16:55:40 +0000 (11:55 -0500)]
Add AdminFE reports URL to report emails

4 years agocleap up
Alexander Strizhakov [Thu, 9 Jul 2020 16:13:16 +0000 (19:13 +0300)]
cleap up

4 years agoMerge branch 'chore/use-the-alias' into 'develop'
feld [Thu, 9 Jul 2020 16:08:34 +0000 (16:08 +0000)]
Merge branch 'chore/use-the-alias' into 'develop'

Use the Pleroma.Config alias

See merge request pleroma/pleroma!2740

4 years agofix for info after tag/untag user
Alexander Strizhakov [Thu, 9 Jul 2020 15:59:48 +0000 (18:59 +0300)]
fix for info after tag/untag user

4 years agofix for user revoke invite task
Alexander Strizhakov [Thu, 9 Jul 2020 15:59:15 +0000 (18:59 +0300)]
fix for user revoke invite task

4 years agoUse the Pleroma.Config alias
Mark Felder [Thu, 9 Jul 2020 15:53:51 +0000 (10:53 -0500)]
Use the Pleroma.Config alias

4 years agoMerge branch 'fix/csp-for-captcha' into 'develop'
feld [Thu, 9 Jul 2020 14:33:24 +0000 (14:33 +0000)]
Merge branch 'fix/csp-for-captcha' into 'develop'

Add Captcha endpoint to CSP headers when MediaProxy is enabled.

See merge request pleroma/pleroma!2718

4 years agoMerge branch 'develop' into fix/csp-for-captcha
Mark Felder [Thu, 9 Jul 2020 14:08:59 +0000 (09:08 -0500)]
Merge branch 'develop' into fix/csp-for-captcha

4 years agoMerge branch '1723-token-fixes' into 'develop'
lain [Thu, 9 Jul 2020 13:10:05 +0000 (13:10 +0000)]
Merge branch '1723-token-fixes' into 'develop'

AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694

4 years agoMerge branch 'features/favicons' into 'develop'
lain [Thu, 9 Jul 2020 13:09:31 +0000 (13:09 +0000)]
Merge branch 'features/favicons' into 'develop'

Add support for remote favicons

See merge request pleroma/pleroma!2261

4 years agoMerge branch '1925-muting-reblogs' into 'develop'
Haelwenn [Thu, 9 Jul 2020 12:10:26 +0000 (12:10 +0000)]
Merge branch '1925-muting-reblogs' into 'develop'

AccountController: Fix muting / unmuting reblogs.

Closes #1925

See merge request pleroma/pleroma!2732

4 years agoAdmin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404...
eugenijm [Mon, 18 May 2020 19:56:09 +0000 (22:56 +0300)]
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`

4 years agoMerge branch 'follow-pipeline' into 'develop'
Haelwenn [Thu, 9 Jul 2020 10:32:24 +0000 (10:32 +0000)]
Merge branch 'follow-pipeline' into 'develop'

Handle `Follow` activities with the pipeline

See merge request pleroma/pleroma!2734

4 years agoMerge branch 'patch-2' into 'develop'
Haelwenn [Thu, 9 Jul 2020 09:50:08 +0000 (09:50 +0000)]
Merge branch 'patch-2' into 'develop'

fix wide2x emojis within nicknames

See merge request pleroma/pleroma!2737

4 years agoMerge branch 'patch-1' into 'develop'
lain [Thu, 9 Jul 2020 09:42:39 +0000 (09:42 +0000)]
Merge branch 'patch-1' into 'develop'

added link to changelog, removed repetition

See merge request pleroma/pleroma!2736

4 years agoMerge branch 'bugfix/status-deletion' into 'develop'
lain [Thu, 9 Jul 2020 09:37:52 +0000 (09:37 +0000)]
Merge branch 'bugfix/status-deletion' into 'develop'

#1920 fix activity deletion

See merge request pleroma/pleroma!2721

4 years ago[static-fe] limit according to- and within- existing ruleset
Dym Sohin [Thu, 9 Jul 2020 09:37:50 +0000 (09:37 +0000)]
[static-fe] limit according to- and within- existing ruleset