Maksim Pechnikov [Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)]
Merge branch 'develop' into issue/1383
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
rinpatch [Sun, 9 Feb 2020 00:27:29 +0000 (03:27 +0300)]
Fix email mix task on OTP releases
Closes pleroma#1548
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
rinpatch [Fri, 7 Feb 2020 16:21:55 +0000 (19:21 +0300)]
Actually fix upload limit on OTP releases
Closes #1109
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
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
Lain Soykaf [Fri, 7 Feb 2020 15:57:46 +0000 (16:57 +0100)]
Questions: Add timezone to `closed` property
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
Egor Kislitsyn [Fri, 7 Feb 2020 12:17:34 +0000 (16:17 +0400)]
Add User.get_follow_state/2
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
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
Alexander Strizhakov [Fri, 7 Feb 2020 07:48:10 +0000 (10:48 +0300)]
fix
Lain Soykaf [Thu, 6 Feb 2020 17:09:57 +0000 (18:09 +0100)]
EmojiReactions: Rename to EmojiReacts
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
Mark Felder [Thu, 6 Feb 2020 16:59:41 +0000 (10:59 -0600)]
Update FE bundle
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
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
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
Egor Kislitsyn [Thu, 6 Feb 2020 14:03:53 +0000 (18:03 +0400)]
Update CHANGELOG
Egor Kislitsyn [Thu, 6 Feb 2020 12:47:15 +0000 (16:47 +0400)]
Cancellation of a follow request for a remote user
rinpatch [Thu, 6 Feb 2020 12:04:21 +0000 (15:04 +0300)]
Merge branch 'develop' into fix/dymamic-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)
Alexander Strizhakov [Thu, 6 Feb 2020 10:15:23 +0000 (13:15 +0300)]
description change
Alexander Strizhakov [Wed, 5 Feb 2020 16:05:20 +0000 (19:05 +0300)]
dropdown type
Alexander Strizhakov [Wed, 5 Feb 2020 14:06:01 +0000 (17:06 +0300)]
removing confusing error
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
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
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
Alexander Strizhakov [Wed, 5 Feb 2020 18:28:05 +0000 (18:28 +0000)]
Apply suggestion to CHANGELOG.md
Alexander Strizhakov [Wed, 5 Feb 2020 17:36:21 +0000 (20:36 +0300)]
removing migrate_from_db endpoint from admin api
Egor Kislitsyn [Wed, 5 Feb 2020 17:13:56 +0000 (21:13 +0400)]
Remove AutoLinker `scheme` option from the config
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
Egor Kislitsyn [Tue, 4 Feb 2020 16:35:32 +0000 (20:35 +0400)]
Add support for cancellation of a follow request
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
Lain Soykaf [Tue, 4 Feb 2020 15:22:13 +0000 (16:22 +0100)]
Add cheatsheet entry
Maksim Pechnikov [Mon, 3 Feb 2020 18:42:36 +0000 (21:42 +0300)]
Merge branch 'develop' into issue/1383
rinpatch [Sun, 2 Feb 2020 11:55:06 +0000 (14:55 +0300)]
fix not being able to pin polls
rinpatch [Thu, 30 Jan 2020 16:47:57 +0000 (19:47 +0300)]
mastodon API: do not sanitize html in non-html fields
Roman Chvanikov [Thu, 30 Jan 2020 22:20:37 +0000 (01:20 +0300)]
Make attachments cleanup optional
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
rinpatch [Thu, 30 Jan 2020 19:16:55 +0000 (22:16 +0300)]
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
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
lain [Thu, 30 Jan 2020 18:28:28 +0000 (18:28 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md
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
lain [Thu, 30 Jan 2020 15:26:45 +0000 (16:26 +0100)]
Emoji Reactions: Add fixtures
lain [Thu, 30 Jan 2020 15:07:37 +0000 (16:07 +0100)]
Emoji Reactions: Actually use the validation.
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
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
feld [Thu, 30 Jan 2020 14:09:41 +0000 (14:09 +0000)]
Update emoji_api_controller.ex
feld [Thu, 30 Jan 2020 14:07:41 +0000 (14:07 +0000)]
Update http_security_plug.ex
rinpatch [Thu, 30 Jan 2020 13:24:24 +0000 (13:24 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md
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
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.
rinpatch [Wed, 29 Jan 2020 20:59:00 +0000 (23:59 +0300)]
cheatsheet: improve rate limiter docs and add new limiters
rinpatch [Wed, 29 Jan 2020 20:58:15 +0000 (23:58 +0300)]
config.exs: Re-enable rate limiter and enable remote ip
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
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
Roman Chvanikov [Wed, 29 Jan 2020 15:53:25 +0000 (18:53 +0300)]
Update confusing changelog message for attachments cleanup
Egor Kislitsyn [Wed, 29 Jan 2020 14:53:43 +0000 (18:53 +0400)]
Fix credo warning
Egor Kislitsyn [Wed, 29 Jan 2020 14:43:23 +0000 (18:43 +0400)]
Make the warning more scarier
Alexander Strizhakov [Wed, 29 Jan 2020 10:51:17 +0000 (13:51 +0300)]
emoji api error on not writable dir
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
lain [Wed, 29 Jan 2020 10:50:49 +0000 (11:50 +0100)]
Streamer Tests: code readability improvements
lain [Wed, 29 Jan 2020 10:43:36 +0000 (11:43 +0100)]
Emoji Reactions: Correctly handle deleted users
lain [Wed, 29 Jan 2020 10:40:57 +0000 (11:40 +0100)]
Emoji Reactions: Document changes
lain [Wed, 29 Jan 2020 10:39:06 +0000 (11:39 +0100)]
Emoji Reactions: Add `reacted` field to emoji reactions
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
Alexander Strizhakov [Wed, 29 Jan 2020 08:13:34 +0000 (11:13 +0300)]
title parse improvement
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
Maksim Pechnikov [Tue, 28 Jan 2020 17:34:13 +0000 (20:34 +0300)]
Merge branch 'develop' into issue/1383
lain [Tue, 28 Jan 2020 17:37:03 +0000 (18:37 +0100)]
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
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
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
Alexander Strizhakov [Tue, 28 Jan 2020 16:29:27 +0000 (19:29 +0300)]
meta tag parser respect first title header
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
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
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
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
lain [Tue, 28 Jan 2020 15:42:05 +0000 (15:42 +0000)]
Update streamer_test.exs
lain [Tue, 28 Jan 2020 15:40:44 +0000 (16:40 +0100)]
Streamer: Correctly handle reblog mutes
Egor Kislitsyn [Tue, 28 Jan 2020 14:04:13 +0000 (18:04 +0400)]
Warn if HTTPSecurityPlug is disabled
Alexander Strizhakov [Tue, 28 Jan 2020 15:02:11 +0000 (18:02 +0300)]
filename and test fixes
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
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
Egor Kislitsyn [Tue, 28 Jan 2020 14:23:59 +0000 (18:23 +0400)]
Fix compatibility with Elixir v1.10
Roman Chvanikov [Tue, 28 Jan 2020 14:22:24 +0000 (17:22 +0300)]
Add test for custom base_url when deleting an attachment
Roman Chvanikov [Tue, 28 Jan 2020 14:07:46 +0000 (17:07 +0300)]
Fix base_url string trimming
Roman Chvanikov [Tue, 28 Jan 2020 13:52:20 +0000 (16:52 +0300)]
Add logging
lain [Tue, 28 Jan 2020 13:40:40 +0000 (14:40 +0100)]
Remove `whole_db` parameter everywhere, it's not used anymore
lain [Tue, 28 Jan 2020 13:38:49 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
Roman Chvanikov [Tue, 28 Jan 2020 13:38:44 +0000 (16:38 +0300)]
Fix __MODULE__ usage
Alexander Strizhakov [Tue, 28 Jan 2020 13:32:33 +0000 (16:32 +0300)]
path fix
Alexander Strizhakov [Tue, 28 Jan 2020 13:29:48 +0000 (13:29 +0000)]
Apply suggestion to mix.lock
Alexander Strizhakov [Tue, 28 Jan 2020 13:29:44 +0000 (13:29 +0000)]
Apply suggestion to mix.exs
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
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
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)
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
projects / akkoma / log