akkoma
4 years agoremoving retry option and changing some logger messages levels
Alexander Strizhakov [Wed, 19 Feb 2020 09:19:03 +0000 (12:19 +0300)]
removing retry option and changing some logger messages levels

4 years agoSpelling was wrong in test as well
Mark Felder [Tue, 18 Feb 2020 15:30:18 +0000 (09:30 -0600)]
Spelling was wrong in test as well

4 years agoSpelling
Mark Felder [Tue, 18 Feb 2020 15:18:09 +0000 (09:18 -0600)]
Spelling

4 years agoImprove changelog message
Mark Felder [Tue, 18 Feb 2020 15:12:46 +0000 (09:12 -0600)]
Improve changelog message

4 years agoMerge branch 'develop' into gun
Mark Felder [Tue, 18 Feb 2020 15:06:27 +0000 (09:06 -0600)]
Merge branch 'develop' into gun

4 years agoMerge branch 'fix/status-view/expires_at' into 'develop'
lain [Tue, 18 Feb 2020 14:56:59 +0000 (14:56 +0000)]
Merge branch 'fix/status-view/expires_at' into 'develop'

Fix `status.expires_at` type

Closes #1573

See merge request pleroma/pleroma!2222

4 years agoMerge branch 'chore/standardize-mrf-behavior' into 'develop'
lain [Tue, 18 Feb 2020 14:36:10 +0000 (14:36 +0000)]
Merge branch 'chore/standardize-mrf-behavior' into 'develop'

Standardize @behaviour usage in MRFs

See merge request pleroma/pleroma!2212

4 years agoMerge branch 'need-reboot-flag' into 'develop'
lain [Tue, 18 Feb 2020 14:32:03 +0000 (14:32 +0000)]
Merge branch 'need-reboot-flag' into 'develop'

need_reboot flag for adminFE

See merge request pleroma/pleroma!2188

4 years agoAdd a test
Egor Kislitsyn [Tue, 18 Feb 2020 13:09:50 +0000 (17:09 +0400)]
Add a test

4 years agoMerge branch 'chore/floki-update' into 'develop'
lain [Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)]
Merge branch 'chore/floki-update' into 'develop'

Update floki to 0.25

See merge request pleroma/pleroma!2217

4 years agoFix `status.expires_at` type
Egor Kislitsyn [Tue, 18 Feb 2020 10:52:11 +0000 (14:52 +0400)]
Fix `status.expires_at` type

4 years agoadding gun adapter
Alexander Strizhakov [Tue, 11 Feb 2020 07:12:57 +0000 (10:12 +0300)]
adding gun adapter

4 years agoMerge branch 'update/admin-fe-20200217' into 'develop'
feld [Mon, 17 Feb 2020 22:22:53 +0000 (22:22 +0000)]
Merge branch 'update/admin-fe-20200217' into 'develop'

Update adminFE build

See merge request pleroma/pleroma!2221

4 years agoUpdate adminFE build
Mark Felder [Mon, 17 Feb 2020 21:50:45 +0000 (15:50 -0600)]
Update adminFE build

4 years agoMerge branch 'develop' into chore/floki-update
Mark Felder [Mon, 17 Feb 2020 20:13:05 +0000 (14:13 -0600)]
Merge branch 'develop' into chore/floki-update

4 years agoMerge branch 'upgrade_crypto' into 'develop'
rinpatch [Mon, 17 Feb 2020 11:13:37 +0000 (11:13 +0000)]
Merge branch 'upgrade_crypto' into 'develop'

Update plug_crypto

See merge request pleroma/pleroma!2219

4 years agoUpdate plug_crypto
lain [Mon, 17 Feb 2020 10:41:14 +0000 (11:41 +0100)]
Update plug_crypto

4 years agoMerge branch 'feat/git-attributes-elixir' into 'develop'
rinpatch [Mon, 17 Feb 2020 10:34:32 +0000 (10:34 +0000)]
Merge branch 'feat/git-attributes-elixir' into 'develop'

.gitattributes: use native support for elixir definitions

See merge request pleroma/pleroma!2218

4 years ago.gitattributes: use native support for elixir definitions
rinpatch [Mon, 17 Feb 2020 10:19:04 +0000 (13:19 +0300)]
.gitattributes: use native support for elixir definitions

see https://github.com/elixir-lang/elixir/pull/9823

4 years agoUse floki's new APIs for parsing fragments
rinpatch [Sat, 15 Feb 2020 22:55:26 +0000 (01:55 +0300)]
Use floki's new APIs for parsing fragments

4 years agoMerge branch 'bugfix/link-preview-site_name' into 'develop'
lain [Sat, 15 Feb 2020 12:56:32 +0000 (12:56 +0000)]
Merge branch 'bugfix/link-preview-site_name' into 'develop'

MastodonAPI.StatusView: Do not use site_name

See merge request pleroma/pleroma!2216

4 years agoMastodonAPI.StatusView: Do not use site_name
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 23:35:46 +0000 (00:35 +0100)]
MastodonAPI.StatusView: Do not use site_name

site_name allow to spoof the origin of the domain and so hacks like:

<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">

4 years agoMerge branch 'chores/deps-to-hexpm' into 'develop'
rinpatch [Fri, 14 Feb 2020 18:25:54 +0000 (18:25 +0000)]
Merge branch 'chores/deps-to-hexpm' into 'develop'

Move ex_syslogger & recon to hexpm, update dependencies

See merge request pleroma/pleroma!2213

4 years agoUpdate all dependencies
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:15:59 +0000 (19:15 +0100)]
Update all dependencies

Upgraded:
  db_connection 2.2.0 => 2.2.1
  earmark 1.4.2 => 1.4.3
  ecto 3.3.1 => 3.3.3
  ecto_sql 3.3.2 => 3.3.4
  esshd 0.1.0 => 0.1.1
  ex_doc 0.21.2 => 0.21.3
  excoveralls 0.12.1 => 0.12.2
  gettext 0.17.1 => 0.17.4
  html_entities 0.5.0 => 0.5.1
  httpoison 1.6.1 => 1.6.2
  joken 2.1.0 => 2.2.0
  jose 1.9.0 => 1.10.1
  nimble_parsec 0.5.1 => 0.5.3
  phoenix 1.4.10 => 1.4.13
  phoenix_ecto 4.0.0 => 4.1.0
  phoenix_html 2.13.3 => 2.14.0
  plug_cowboy 2.1.0 => 2.1.2
  plug_crypto 1.1.0 => 1.1.1
  prometheus 4.4.1 => 4.5.0
  tesla 1.3.0 => 1.3.2

4 years agomix.exs: Move ex_syslogger and recon to hexpm
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:08:37 +0000 (19:08 +0100)]
mix.exs: Move ex_syslogger and recon to hexpm

4 years agoMerge branch 'update/ferd/recon' into 'develop'
Haelwenn [Fri, 14 Feb 2020 17:58:26 +0000 (17:58 +0000)]
Merge branch 'update/ferd/recon' into 'develop'

Update ferd/recon

See merge request pleroma/pleroma!2211

4 years agoStandardize @behaviour usage in MRFs
Mark Felder [Fri, 14 Feb 2020 17:02:24 +0000 (11:02 -0600)]
Standardize @behaviour usage in MRFs

4 years agoUpdate ferd/recon, requested by @tk to support an AMPQ library he's
Mark Felder [Fri, 14 Feb 2020 16:16:12 +0000 (10:16 -0600)]
Update ferd/recon, requested by @tk to support an AMPQ library he's
integrating with an MRF.

Upstream changelog:

2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)

4 years agoMerge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
rinpatch [Thu, 13 Feb 2020 18:08:43 +0000 (18:08 +0000)]
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'

NodeInfo: Fix federating status not being reported when MRF transparency is disabled

Closes #1568

See merge request pleroma/pleroma!2206

4 years agoMerge branch 'fix/rename-no_attachment_links-setting' into 'develop'
lain [Thu, 13 Feb 2020 17:17:43 +0000 (17:17 +0000)]
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'

Fix the confusingly named and inverted logic of "no_attachment_links"

See merge request pleroma/pleroma!2202

4 years agoMerge branch 'chore/fast-sanitize-bump-back' into 'develop'
rinpatch [Thu, 13 Feb 2020 16:55:36 +0000 (16:55 +0000)]
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'

deps: update back fast sanitize

See merge request pleroma/pleroma!2205

4 years agoNodeInfo: Fix federating status not being reported when MRF
rinpatch [Thu, 13 Feb 2020 16:53:39 +0000 (19:53 +0300)]
NodeInfo: Fix federating status not being reported when MRF
transparency is disabled

Closes #1568

4 years agodeps: update back fast sanitize
rinpatch [Thu, 13 Feb 2020 16:47:39 +0000 (19:47 +0300)]
deps: update back fast sanitize

it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution

4 years agoMerge branch 'develop' into 'fix/rename-no_attachment_links-setting'
feld [Thu, 13 Feb 2020 14:37:55 +0000 (14:37 +0000)]
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'

# Conflicts:
#   config/description.exs

4 years agoMerge branch 'chore/config-descriptions' into 'develop'
feld [Thu, 13 Feb 2020 14:20:30 +0000 (14:20 +0000)]
Merge branch 'chore/config-descriptions' into 'develop'

Improve config descriptions

See merge request pleroma/pleroma!2201

4 years agoMerge branch 'fix/status_expires_in_validation' into 'develop'
feld [Thu, 13 Feb 2020 14:03:59 +0000 (14:03 +0000)]
Merge branch 'fix/status_expires_in_validation' into 'develop'

Fix `status.expires_in` validation

See merge request pleroma/pleroma!2203

4 years agoFormatting
Mark Felder [Thu, 13 Feb 2020 14:02:33 +0000 (08:02 -0600)]
Formatting

4 years agoFormatting
Mark Felder [Thu, 13 Feb 2020 14:01:39 +0000 (08:01 -0600)]
Formatting

4 years agoUpdate description.exs
feld [Thu, 13 Feb 2020 14:00:33 +0000 (14:00 +0000)]
Update description.exs

4 years agoApply suggestion to config/description.exs
feld [Thu, 13 Feb 2020 13:59:47 +0000 (13:59 +0000)]
Apply suggestion to config/description.exs

4 years agoFix `status.expires_in` validation
Egor Kislitsyn [Wed, 12 Feb 2020 15:43:07 +0000 (19:43 +0400)]
Fix `status.expires_in` validation

4 years agoFix the confusingly named and inverted logic of "no_attachment_links"
Mark Felder [Tue, 11 Feb 2020 21:39:19 +0000 (15:39 -0600)]
Fix the confusingly named and inverted logic of "no_attachment_links"
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.

4 years agoFirst round at cleaning up descriptions
Mark Felder [Tue, 11 Feb 2020 21:21:36 +0000 (15:21 -0600)]
First round at cleaning up descriptions

4 years agoMerge branch 'restore-twitter-api-tests' into 'develop'
feld [Tue, 11 Feb 2020 21:08:37 +0000 (21:08 +0000)]
Merge branch 'restore-twitter-api-tests' into 'develop'

Restore TwitterAPI tests

Closes #1257

See merge request pleroma/pleroma!2200

4 years agoRestore TwitterAPI tests
Egor Kislitsyn [Tue, 11 Feb 2020 20:51:05 +0000 (00:51 +0400)]
Restore TwitterAPI tests

4 years agoMerge branch 'update/admin-fe-20200211' into 'develop'
feld [Tue, 11 Feb 2020 20:08:28 +0000 (20:08 +0000)]
Merge branch 'update/admin-fe-20200211' into 'develop'

Update AdminFE build

See merge request pleroma/pleroma!2198

4 years agoMerge branch 'revert-3fee859b' into 'develop'
lain [Tue, 11 Feb 2020 17:09:48 +0000 (17:09 +0000)]
Merge branch 'revert-3fee859b' into 'develop'

Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"

See merge request pleroma/pleroma!2199

4 years agoRevert "Merge branch 'feat/floki-fasthtml' into 'develop'"
feld [Tue, 11 Feb 2020 16:55:18 +0000 (16:55 +0000)]
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"

This reverts merge request !2194

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe...
Mark Felder [Tue, 11 Feb 2020 16:33:41 +0000 (10:33 -0600)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211

4 years agoUpdate AdminFE build
Mark Felder [Tue, 11 Feb 2020 16:24:38 +0000 (10:24 -0600)]
Update AdminFE build

4 years agoMerge branch 'feat/floki-fasthtml' into 'develop'
lain [Tue, 11 Feb 2020 13:22:35 +0000 (13:22 +0000)]
Merge branch 'feat/floki-fasthtml' into 'develop'

Make Floki use fast_html

See merge request pleroma/pleroma!2194

4 years agoMake Floki use fast_html
rinpatch [Mon, 10 Feb 2020 21:29:25 +0000 (00:29 +0300)]
Make Floki use fast_html

4 years agodeps: update fast_sanitize to 0.1.7
rinpatch [Mon, 10 Feb 2020 21:16:13 +0000 (00:16 +0300)]
deps: update fast_sanitize to 0.1.7

needed to get new fast_html version since 1.0.1 had an attribute parsing
bug

4 years agodeps: update floki to 0.25.0
rinpatch [Mon, 10 Feb 2020 18:52:01 +0000 (21:52 +0300)]
deps: update floki to 0.25.0

needed to make it use fast_html

4 years agoMerge branch 'uguu-uwu-notices-bulge' into 'develop'
lain [Tue, 11 Feb 2020 13:14:05 +0000 (13:14 +0000)]
Merge branch 'uguu-uwu-notices-bulge' into 'develop'

EmojiReactions: Align API endpoints

See merge request pleroma/pleroma!2183

4 years agoUpdate frontend
lain [Tue, 11 Feb 2020 12:59:04 +0000 (13:59 +0100)]
Update frontend

4 years agoMerge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
lain [Tue, 11 Feb 2020 12:58:36 +0000 (13:58 +0100)]
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge

4 years agoMerge branch 'doc/unlisted-search' into 'develop'
lain [Tue, 11 Feb 2020 11:44:33 +0000 (11:44 +0000)]
Merge branch 'doc/unlisted-search' into 'develop'

differences_in_mastoapi_responses.md: Add note about unlisted results

Closes #1164

See merge request pleroma/pleroma!2195

4 years agoMerge branch 'oban-crontab-fix' into 'develop'
lain [Tue, 11 Feb 2020 09:55:16 +0000 (09:55 +0000)]
Merge branch 'oban-crontab-fix' into 'develop'

Set oban crontab to false in tests

See merge request pleroma/pleroma!2197

4 years agoset oban crontab to false in tests
Alexander Strizhakov [Tue, 11 Feb 2020 09:19:06 +0000 (12:19 +0300)]
set oban crontab to false in tests

4 years agoMerge branch 'docs/kyclos' into 'develop'
lain [Tue, 11 Feb 2020 08:04:58 +0000 (08:04 +0000)]
Merge branch 'docs/kyclos' into 'develop'

clients.md: Add Kyclos

See merge request pleroma/pleroma!2196

4 years agoclients.md: Add Kyclos
Haelwenn (lanodan) Monnier [Tue, 11 Feb 2020 01:27:40 +0000 (02:27 +0100)]
clients.md: Add Kyclos

4 years agodifferences_in_mastoapi_responses.md: Add note about unlisted results
Haelwenn (lanodan) Monnier [Tue, 11 Feb 2020 00:58:35 +0000 (01:58 +0100)]
differences_in_mastoapi_responses.md: Add note about unlisted results

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
4 years agoMerge branch 'issue/1383' into 'develop'
rinpatch [Tue, 11 Feb 2020 00:04:06 +0000 (00:04 +0000)]
Merge branch 'issue/1383' into 'develop'

[#1383] Switch periodic jobs from quantum to oban

See merge request pleroma/pleroma!2015

4 years agoMerge branch 'docs_backup_restore' into 'develop'
Haelwenn [Mon, 10 Feb 2020 23:53:26 +0000 (23:53 +0000)]
Merge branch 'docs_backup_restore' into 'develop'

DOCS Backup/Restore/Migrate your instance

See merge request pleroma/pleroma!2107

4 years agoDOCS Backup/Restore/Migrate your instance
Ilja [Mon, 10 Feb 2020 23:53:26 +0000 (23:53 +0000)]
DOCS Backup/Restore/Migrate your instance

* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
   * I added a new step to drop and recreate an empty pleroma-database
   * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
   * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15

4 years agoMerge branch 'fix/compilation-error-docs' into 'develop'
rinpatch [Mon, 10 Feb 2020 18:25:12 +0000 (18:25 +0000)]
Merge branch 'fix/compilation-error-docs' into 'develop'

Fix a compilation error under certain circumstances

See merge request pleroma/pleroma!2193

4 years agoMerge branch 'develop' into issue/1383
Maksim Pechnikov [Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)]
Merge branch 'develop' into issue/1383

4 years agoFix a compilation error under certain circumstances
rinpatch [Mon, 10 Feb 2020 15:28:30 +0000 (18:28 +0300)]
Fix a compilation error under certain circumstances

I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.

This is due to Admin API controller needing to generate JSON description
of the config at compile time.  Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.

This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.

4 years agoMerge branch 'fix/email-task-otp' into 'develop'
rinpatch [Sun, 9 Feb 2020 12:05:32 +0000 (12:05 +0000)]
Merge branch 'fix/email-task-otp' into 'develop'

Fix email mix task on OTP releases

Closes #1548

See merge request pleroma/pleroma!2191

4 years agoFix email mix task on OTP releases
rinpatch [Sun, 9 Feb 2020 00:27:29 +0000 (03:27 +0300)]
Fix email mix task on OTP releases

Closes pleroma#1548

4 years agoMerge branch 'fix/upload-limit-otp' into 'develop'
lain [Sat, 8 Feb 2020 14:02:36 +0000 (14:02 +0000)]
Merge branch 'fix/upload-limit-otp' into 'develop'

Actually fix upload limit on OTP releases

Closes #1109

See merge request pleroma/pleroma!2185

4 years agoneed_reboot flag
Alexander Strizhakov [Sat, 8 Feb 2020 09:55:37 +0000 (12:55 +0300)]
need_reboot flag

4 years agoActually fix upload limit on OTP releases
rinpatch [Fri, 7 Feb 2020 16:21:55 +0000 (19:21 +0300)]
Actually fix upload limit on OTP releases

Closes #1109

4 years agoMerge branch 'cancel-follow-request' into 'develop'
Haelwenn [Fri, 7 Feb 2020 16:10:43 +0000 (16:10 +0000)]
Merge branch 'cancel-follow-request' into 'develop'

Add support for cancellation of a follow request

Closes #1522

See merge request pleroma/pleroma!2175

4 years agoMerge branch 'questions-timezone' into 'develop'
rinpatch [Fri, 7 Feb 2020 16:04:40 +0000 (16:04 +0000)]
Merge branch 'questions-timezone' into 'develop'

Questions: Add timezone to `closed` property

Closes #1552

See merge request pleroma/pleroma!2184

4 years agoQuestions: Add timezone to `closed` property
Lain Soykaf [Fri, 7 Feb 2020 15:57:46 +0000 (16:57 +0100)]
Questions: Add timezone to `closed` property

4 years agodeps: update plug to 1.9
rinpatch [Fri, 7 Feb 2020 15:38:36 +0000 (18:38 +0300)]
deps: update plug to 1.9

Includes functionality needed to fix upload limit not being changed at
runtime:
https://github.com/elixir-plug/plug/commit/087cd64d864696c74bf07f935e2ae31caec19a1e

4 years agoApply suggestion to docs/API/pleroma_api.md
lain [Fri, 7 Feb 2020 15:18:05 +0000 (15:18 +0000)]
Apply suggestion to docs/API/pleroma_api.md

4 years agoApply suggestion to docs/API/pleroma_api.md
lain [Fri, 7 Feb 2020 15:17:42 +0000 (15:17 +0000)]
Apply suggestion to docs/API/pleroma_api.md

4 years agoEmojiReactions: Remove old API endpoints
Lain Soykaf [Fri, 7 Feb 2020 14:01:45 +0000 (15:01 +0100)]
EmojiReactions: Remove old API endpoints

4 years agoEmojiReactions: Add docs and Changelog
Lain Soykaf [Fri, 7 Feb 2020 13:59:26 +0000 (14:59 +0100)]
EmojiReactions: Add docs and Changelog

4 years agoEmojiReactions: Add Mastodon-aligned reaction endpoints, change response
Lain Soykaf [Fri, 7 Feb 2020 13:52:13 +0000 (14:52 +0100)]
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response

4 years agoAdd User.get_follow_state/2
Egor Kislitsyn [Fri, 7 Feb 2020 12:17:34 +0000 (16:17 +0400)]
Add User.get_follow_state/2

4 years agoMerge branch 'rename_emoji_reactios' into 'develop'
rinpatch [Fri, 7 Feb 2020 10:35:37 +0000 (10:35 +0000)]
Merge branch 'rename_emoji_reactios' into 'develop'

EmojiReactions: Rename to EmojiReacts

See merge request pleroma/pleroma!2181

4 years agoMerge branch 'docs-fix' into 'develop'
rinpatch [Fri, 7 Feb 2020 10:10:34 +0000 (10:10 +0000)]
Merge branch 'docs-fix' into 'develop'

Fix for config.md

See merge request pleroma/pleroma!2182

4 years agofix
Alexander Strizhakov [Fri, 7 Feb 2020 07:48:10 +0000 (10:48 +0300)]
fix

4 years agoEmojiReactions: Rename to EmojiReacts
Lain Soykaf [Thu, 6 Feb 2020 17:09:57 +0000 (18:09 +0100)]
EmojiReactions: Rename to EmojiReacts

4 years agoMerge branch 'update/fe-bundle-20200206' into 'develop'
rinpatch [Thu, 6 Feb 2020 17:00:46 +0000 (17:00 +0000)]
Merge branch 'update/fe-bundle-20200206' into 'develop'

Update FE bundle

See merge request pleroma/pleroma!2180

4 years agoUpdate FE bundle
Mark Felder [Thu, 6 Feb 2020 16:59:41 +0000 (10:59 -0600)]
Update FE bundle

4 years agoMerge branch 'mastoapi-non-html-strings' into 'develop'
feld [Thu, 6 Feb 2020 16:08:23 +0000 (16:08 +0000)]
Merge branch 'mastoapi-non-html-strings' into 'develop'

mastodon API: do not sanitize html in non-html fields

See merge request pleroma/pleroma!2167

4 years agoMerge branch 'fix/dymamic-docs' into 'develop'
feld [Thu, 6 Feb 2020 16:03:29 +0000 (16:03 +0000)]
Merge branch 'fix/dymamic-docs' into 'develop'

Simplify in-database config docs

See merge request pleroma/pleroma!2178

4 years agoMerge branch 'config-changes' into 'develop'
feld [Thu, 6 Feb 2020 16:02:46 +0000 (16:02 +0000)]
Merge branch 'config-changes' into 'develop'

Config changes

Closes #1547

See merge request pleroma/pleroma!2174

4 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 6 Feb 2020 14:03:53 +0000 (18:03 +0400)]
Update CHANGELOG

4 years agoCancellation of a follow request for a remote user
Egor Kislitsyn [Thu, 6 Feb 2020 12:47:15 +0000 (16:47 +0400)]
Cancellation of a follow request for a remote user

4 years agoMerge branch 'develop' into fix/dymamic-docs
rinpatch [Thu, 6 Feb 2020 12:04:21 +0000 (15:04 +0300)]
Merge branch 'develop' into fix/dymamic-docs

4 years agoSimplify in-database config docs
rinpatch [Thu, 6 Feb 2020 12:00:33 +0000 (15:00 +0300)]
Simplify in-database config docs

Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore)

4 years agodescription change
Alexander Strizhakov [Thu, 6 Feb 2020 10:15:23 +0000 (13:15 +0300)]
description change

4 years agodropdown type
Alexander Strizhakov [Wed, 5 Feb 2020 16:05:20 +0000 (19:05 +0300)]
dropdown type

4 years agoremoving confusing error
Alexander Strizhakov [Wed, 5 Feb 2020 14:06:01 +0000 (17:06 +0300)]
removing confusing error