akkoma
4 years agoFix MRF documentation
Egor Kislitsyn [Fri, 7 Feb 2020 18:17:08 +0000 (22:17 +0400)]
Fix MRF documentation

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

4 years agoMerge branch 'fix/unpinnable-polls' into 'develop'
rinpatch [Wed, 5 Feb 2020 21:04:16 +0000 (21:04 +0000)]
Merge branch 'fix/unpinnable-polls' into 'develop'

fix not being able to pin polls

See merge request pleroma/pleroma!2172

4 years agoMerge branch 'removing-admin-api-endpoint' into 'develop'
rinpatch [Wed, 5 Feb 2020 21:03:56 +0000 (21:03 +0000)]
Merge branch 'removing-admin-api-endpoint' into 'develop'

Removing migrate_from_db endpoint from admin api

See merge request pleroma/pleroma!2177

4 years agoMerge branch 'remove-linker-scheme-option' into 'develop'
feld [Wed, 5 Feb 2020 20:32:45 +0000 (20:32 +0000)]
Merge branch 'remove-linker-scheme-option' into 'develop'

Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176

4 years agoApply suggestion to CHANGELOG.md
Alexander Strizhakov [Wed, 5 Feb 2020 18:28:05 +0000 (18:28 +0000)]
Apply suggestion to CHANGELOG.md

4 years agoremoving migrate_from_db endpoint from admin api
Alexander Strizhakov [Wed, 5 Feb 2020 17:36:21 +0000 (20:36 +0300)]
removing migrate_from_db endpoint from admin api

4 years agoRemove AutoLinker `scheme` option from the config
Egor Kislitsyn [Wed, 5 Feb 2020 17:13:56 +0000 (21:13 +0400)]
Remove AutoLinker `scheme` option from the config

4 years agoMerge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
rinpatch [Wed, 5 Feb 2020 16:59:21 +0000 (16:59 +0000)]
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'

Restarting pleroma from outside application

See merge request pleroma/pleroma!2144

4 years agoMerge branch 'feature/make_attachments_cleanup_optional' into 'develop'
lain [Tue, 4 Feb 2020 15:29:26 +0000 (15:29 +0000)]
Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'

Make attachments cleanup optional

See merge request pleroma/pleroma!2170

4 years agoAdd cheatsheet entry
Lain Soykaf [Tue, 4 Feb 2020 15:22:13 +0000 (16:22 +0100)]
Add cheatsheet entry

4 years agofix not being able to pin polls
rinpatch [Sun, 2 Feb 2020 11:55:06 +0000 (14:55 +0300)]
fix not being able to pin polls

4 years agomastodon API: do not sanitize html in non-html fields
rinpatch [Thu, 30 Jan 2020 16:47:57 +0000 (19:47 +0300)]
mastodon API: do not sanitize html in non-html fields

4 years agoMake attachments cleanup optional
Roman Chvanikov [Thu, 30 Jan 2020 22:20:37 +0000 (01:20 +0300)]
Make attachments cleanup optional

4 years agoMerge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
rinpatch [Thu, 30 Jan 2020 19:24:04 +0000 (19:24 +0000)]
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'

Disable rate limiter for socket/localhost

Closes #1380

See merge request pleroma/pleroma!2064

4 years agoMerge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
rinpatch [Thu, 30 Jan 2020 19:16:55 +0000 (22:16 +0300)]
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost

4 years agoMerge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
lain [Thu, 30 Jan 2020 18:47:44 +0000 (18:47 +0000)]
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'

Re-enable rate limiter and enable remote ip

See merge request pleroma/pleroma!2164

4 years agoApply suggestion to docs/configuration/cheatsheet.md
lain [Thu, 30 Jan 2020 18:28:28 +0000 (18:28 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md

4 years agoMerge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'
lain [Thu, 30 Jan 2020 18:27:13 +0000 (18:27 +0000)]
Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'

Emoji Reactions: Actually use the validation.

See merge request pleroma/pleroma!2166

4 years agoEmoji Reactions: Add fixtures
lain [Thu, 30 Jan 2020 15:26:45 +0000 (16:26 +0100)]
Emoji Reactions: Add fixtures

4 years agoEmoji Reactions: Actually use the validation.
lain [Thu, 30 Jan 2020 15:07:37 +0000 (16:07 +0100)]
Emoji Reactions: Actually use the validation.

4 years agoMerge branch 'emoji-api-errors' into 'develop'
feld [Thu, 30 Jan 2020 14:13:40 +0000 (14:13 +0000)]
Merge branch 'emoji-api-errors' into 'develop'

Emoji api error if emoji dir is not writable

Closes admin-fe#62

See merge request pleroma/pleroma!2161

4 years agoMerge branch 'http-security-warning' into 'develop'
feld [Thu, 30 Jan 2020 14:11:29 +0000 (14:11 +0000)]
Merge branch 'http-security-warning' into 'develop'

Warn if HTTPSecurityPlug is disabled

Closes #1528

See merge request pleroma/pleroma!2155

4 years agoUpdate emoji_api_controller.ex
feld [Thu, 30 Jan 2020 14:09:41 +0000 (14:09 +0000)]
Update emoji_api_controller.ex

4 years agoUpdate http_security_plug.ex
feld [Thu, 30 Jan 2020 14:07:41 +0000 (14:07 +0000)]
Update http_security_plug.ex

4 years agoApply suggestion to docs/configuration/cheatsheet.md
rinpatch [Thu, 30 Jan 2020 13:24:24 +0000 (13:24 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md

4 years agoMerge branch 'emoji-reactions-reacted' into 'develop'
rinpatch [Thu, 30 Jan 2020 13:16:04 +0000 (13:16 +0000)]
Merge branch 'emoji-reactions-reacted' into 'develop'

Emoji reactions: Add `reacted` field

See merge request pleroma/pleroma!2160

4 years agoRemoteIp: only trust X-Forwarded-For
rinpatch [Wed, 29 Jan 2020 20:59:27 +0000 (23:59 +0300)]
RemoteIp: only trust X-Forwarded-For

Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.

4 years agocheatsheet: improve rate limiter docs and add new limiters
rinpatch [Wed, 29 Jan 2020 20:59:00 +0000 (23:59 +0300)]
cheatsheet: improve rate limiter docs and add new limiters

4 years agoconfig.exs: Re-enable rate limiter and enable remote ip
rinpatch [Wed, 29 Jan 2020 20:58:15 +0000 (23:58 +0300)]
config.exs: Re-enable rate limiter and enable remote ip

4 years agoMerge branch 'fix-streaming-reblog' into 'develop'
Haelwenn [Wed, 29 Jan 2020 20:21:32 +0000 (20:21 +0000)]
Merge branch 'fix-streaming-reblog' into 'develop'

Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156

4 years agoMerge branch 'changelog-update' into 'develop'
lain [Wed, 29 Jan 2020 16:32:06 +0000 (16:32 +0000)]
Merge branch 'changelog-update' into 'develop'

Update confusing changelog message for attachments cleanup

See merge request pleroma/pleroma!2163

4 years agoUpdate confusing changelog message for attachments cleanup
Roman Chvanikov [Wed, 29 Jan 2020 15:53:25 +0000 (18:53 +0300)]
Update confusing changelog message for attachments cleanup

4 years agoFix credo warning
Egor Kislitsyn [Wed, 29 Jan 2020 14:53:43 +0000 (18:53 +0400)]
Fix credo warning

4 years agoMake the warning more scarier
Egor Kislitsyn [Wed, 29 Jan 2020 14:43:23 +0000 (18:43 +0400)]
Make the warning more scarier

4 years agoemoji api error on not writable dir
Alexander Strizhakov [Wed, 29 Jan 2020 10:51:17 +0000 (13:51 +0300)]
emoji api error on not writable dir

4 years agoMerge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix...
lain [Wed, 29 Jan 2020 10:52:24 +0000 (11:52 +0100)]
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog

4 years agoStreamer Tests: code readability improvements
lain [Wed, 29 Jan 2020 10:50:49 +0000 (11:50 +0100)]
Streamer Tests: code readability improvements

4 years agoEmoji Reactions: Correctly handle deleted users
lain [Wed, 29 Jan 2020 10:43:36 +0000 (11:43 +0100)]
Emoji Reactions: Correctly handle deleted users

4 years agoEmoji Reactions: Document changes
lain [Wed, 29 Jan 2020 10:40:57 +0000 (11:40 +0100)]
Emoji Reactions: Document changes

4 years agoEmoji Reactions: Add `reacted` field to emoji reactions
lain [Wed, 29 Jan 2020 10:39:06 +0000 (11:39 +0100)]
Emoji Reactions: Add `reacted` field to emoji reactions

4 years agoMerge branch 'meta-tags-parser' into 'develop'
lain [Wed, 29 Jan 2020 10:07:26 +0000 (10:07 +0000)]
Merge branch 'meta-tags-parser' into 'develop'

Title parsing improvement

See merge request pleroma/pleroma!2159

4 years agotitle parse improvement
Alexander Strizhakov [Wed, 29 Jan 2020 08:13:34 +0000 (11:13 +0300)]
title parse improvement

4 years agoMerge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'
lain [Tue, 28 Jan 2020 17:39:32 +0000 (17:39 +0000)]
Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'

Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9

See merge request pleroma/pleroma!2158

4 years agoUpdate frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
lain [Tue, 28 Jan 2020 17:37:03 +0000 (18:37 +0100)]
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9

4 years agoMerge branch 'linkify-test-expansion' into 'develop'
lain [Tue, 28 Jan 2020 16:51:29 +0000 (16:51 +0000)]
Merge branch 'linkify-test-expansion' into 'develop'

Formatter: Add a test for domain / username clashes

See merge request pleroma/pleroma!2151

4 years agoMerge branch 'features/task-test-email' into 'develop'
lain [Tue, 28 Jan 2020 16:42:57 +0000 (16:42 +0000)]
Merge branch 'features/task-test-email' into 'develop'

Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118

4 years agoMerge branch 'fix/1524-link_preview' into 'develop'
lain [Tue, 28 Jan 2020 16:38:14 +0000 (16:38 +0000)]
Merge branch 'fix/1524-link_preview' into 'develop'

Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157

4 years agometa tag parser respect first title header
Alexander Strizhakov [Tue, 28 Jan 2020 16:29:27 +0000 (19:29 +0300)]
meta tag parser respect first title header

4 years agoMerge branch 'feature/tag_feed' into 'develop'
lain [Tue, 28 Jan 2020 16:14:23 +0000 (16:14 +0000)]
Merge branch 'feature/tag_feed' into 'develop'

[#1452] Atom feeds for hashtags

See merge request pleroma/pleroma!2040

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
lain [Tue, 28 Jan 2020 16:06:36 +0000 (17:06 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed

4 years agoMerge branch 'whole-db-removal' into 'develop'
Haelwenn [Tue, 28 Jan 2020 15:51:45 +0000 (15:51 +0000)]
Merge branch 'whole-db-removal' into 'develop'

Remove `whole_db` parameter everywhere, it's not used anymore

See merge request pleroma/pleroma!2152

4 years agoCreate pleroma.email mix task
Haelwenn (lanodan) Monnier [Mon, 20 Jan 2020 12:23:21 +0000 (13:23 +0100)]
Create pleroma.email mix task

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
4 years agoUpdate streamer_test.exs
lain [Tue, 28 Jan 2020 15:42:05 +0000 (15:42 +0000)]
Update streamer_test.exs

4 years agoStreamer: Correctly handle reblog mutes
lain [Tue, 28 Jan 2020 15:40:44 +0000 (16:40 +0100)]
Streamer: Correctly handle reblog mutes

4 years agoWarn if HTTPSecurityPlug is disabled
Egor Kislitsyn [Tue, 28 Jan 2020 14:04:13 +0000 (18:04 +0400)]
Warn if HTTPSecurityPlug is disabled

4 years agofilename and test fixes
Alexander Strizhakov [Tue, 28 Jan 2020 15:02:11 +0000 (18:02 +0300)]
filename and test fixes

4 years agoMerge branch 'fix/attachments-cleanup' into 'develop'
feld [Tue, 28 Jan 2020 14:52:57 +0000 (14:52 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'

Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154

4 years agoMerge branch 'fix-elixir-v1.10' into 'develop'
lain [Tue, 28 Jan 2020 14:30:34 +0000 (14:30 +0000)]
Merge branch 'fix-elixir-v1.10' into 'develop'

Fix compatibility with Elixir v1.10

See merge request pleroma/pleroma!2153

4 years agoFix compatibility with Elixir v1.10
Egor Kislitsyn [Tue, 28 Jan 2020 14:23:59 +0000 (18:23 +0400)]
Fix compatibility with Elixir v1.10

4 years agoAdd test for custom base_url when deleting an attachment
Roman Chvanikov [Tue, 28 Jan 2020 14:22:24 +0000 (17:22 +0300)]
Add test for custom base_url when deleting an attachment

4 years agoFix base_url string trimming
Roman Chvanikov [Tue, 28 Jan 2020 14:07:46 +0000 (17:07 +0300)]
Fix base_url string trimming

4 years agoAdd logging
Roman Chvanikov [Tue, 28 Jan 2020 13:52:20 +0000 (16:52 +0300)]
Add logging

4 years agoRemove `whole_db` parameter everywhere, it's not used anymore
lain [Tue, 28 Jan 2020 13:40:40 +0000 (14:40 +0100)]
Remove `whole_db` parameter everywhere, it's not used anymore

4 years agoApply suggestion to lib/pleroma/web/feed/tag_controller.ex
lain [Tue, 28 Jan 2020 13:38:49 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex

4 years agoFix __MODULE__ usage
Roman Chvanikov [Tue, 28 Jan 2020 13:38:44 +0000 (16:38 +0300)]
Fix __MODULE__ usage

4 years agopath fix
Alexander Strizhakov [Tue, 28 Jan 2020 13:32:33 +0000 (16:32 +0300)]
path fix

4 years agoApply suggestion to mix.lock
Alexander Strizhakov [Tue, 28 Jan 2020 13:29:48 +0000 (13:29 +0000)]
Apply suggestion to mix.lock

4 years agoApply suggestion to mix.exs
Alexander Strizhakov [Tue, 28 Jan 2020 13:29:44 +0000 (13:29 +0000)]
Apply suggestion to mix.exs

4 years agoMerge branch 'translation/errors-french' into 'develop'
lain [Tue, 28 Jan 2020 13:26:28 +0000 (13:26 +0000)]
Merge branch 'translation/errors-french' into 'develop'

Translation/errors french

See merge request pleroma/pleroma!1457

4 years agoMerge branch 'docs_introduction' into 'develop'
lain [Tue, 28 Jan 2020 12:57:07 +0000 (12:57 +0000)]
Merge branch 'docs_introduction' into 'develop'

DOCS General update for the "Introduction to Pleroma" section

See merge request pleroma/pleroma!2101

4 years agoDOCS General update for the "Introduction to Pleroma" section
Ilja [Tue, 28 Jan 2020 12:57:06 +0000 (12:57 +0000)]
DOCS General update for the "Introduction to Pleroma" section

* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the :smile: thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)

4 years agoMerge branch 'support/update_ecto' into 'develop'
lain [Tue, 28 Jan 2020 12:49:22 +0000 (12:49 +0000)]
Merge branch 'support/update_ecto' into 'develop'

updated ecto and fixed warning

See merge request pleroma/pleroma!2150

4 years agolike this
Alexander Strizhakov [Tue, 28 Jan 2020 12:41:45 +0000 (15:41 +0300)]
like this

4 years agoMerge branch 'fix/attachments-cleanup' into 'develop'
lain [Tue, 28 Jan 2020 12:40:00 +0000 (12:40 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'

Fix/attachments cleanup

See merge request pleroma/pleroma!2148

4 years agoFormatter: Add a test for domain / username clashes
lain [Tue, 28 Jan 2020 12:38:21 +0000 (13:38 +0100)]
Formatter: Add a test for domain / username clashes

4 years agomoving restarter application into pleroma repo
Alexander Strizhakov [Tue, 28 Jan 2020 12:19:05 +0000 (15:19 +0300)]
moving restarter application into pleroma repo

4 years agoupdate ecto
Maksim Pechnikov [Tue, 28 Jan 2020 07:43:47 +0000 (10:43 +0300)]
update ecto

4 years agoRemove unused var
Roman Chvanikov [Tue, 28 Jan 2020 00:54:54 +0000 (03:54 +0300)]
Remove unused var

4 years agoexplicitly describe perform op in AttachmentsClenupWorker
Roman Chvanikov [Tue, 28 Jan 2020 00:52:35 +0000 (03:52 +0300)]
explicitly describe perform op in AttachmentsClenupWorker

4 years agofix test
Maksim Pechnikov [Mon, 27 Jan 2020 18:20:33 +0000 (21:20 +0300)]
fix test

4 years agoMerge branch 'develop' into feature/tag_feed
Maksim Pechnikov [Mon, 27 Jan 2020 18:13:13 +0000 (21:13 +0300)]
Merge branch 'develop' into feature/tag_feed

4 years agodocs update
Alexander Strizhakov [Mon, 27 Jan 2020 16:48:20 +0000 (19:48 +0300)]
docs update

4 years agoMerge branch 'remove/suggestions-third-party-engine' into 'develop'
Haelwenn [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Merge branch 'remove/suggestions-third-party-engine' into 'develop'

Remove user recommendation by third party engine

See merge request pleroma/pleroma!2141

4 years agoRemove user recommendation by third party engine
Hakaba Hitoyo [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Remove user recommendation by third party engine

4 years agoMerge branch 'descriptions-fixes' into 'develop'
Haelwenn [Mon, 27 Jan 2020 11:45:26 +0000 (11:45 +0000)]
Merge branch 'descriptions-fixes' into 'develop'

Little fixes for descriptions.exs

See merge request pleroma/pleroma!2147

4 years agolittle fixes
Alexander Strizhakov [Mon, 27 Jan 2020 09:53:21 +0000 (12:53 +0300)]
little fixes