Mark Felder [Thu, 13 Feb 2020 14:02:33 +0000 (08:02 -0600)]
Formatting
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.
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
Egor Kislitsyn [Tue, 11 Feb 2020 20:51:05 +0000 (00:51 +0400)]
Restore TwitterAPI tests
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
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
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
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
Mark Felder [Tue, 11 Feb 2020 16:24:38 +0000 (10:24 -0600)]
Update AdminFE build
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
rinpatch [Mon, 10 Feb 2020 21:29:25 +0000 (00:29 +0300)]
Make Floki use fast_html
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
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
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
lain [Tue, 11 Feb 2020 12:59:04 +0000 (13:59 +0100)]
Update frontend
lain [Tue, 11 Feb 2020 12:58:36 +0000 (13:58 +0100)]
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
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
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
Alexander Strizhakov [Tue, 11 Feb 2020 09:19:06 +0000 (12:19 +0300)]
set oban crontab to false in tests
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
Haelwenn (lanodan) Monnier [Tue, 11 Feb 2020 01:27:40 +0000 (02:27 +0100)]
clients.md: Add Kyclos
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
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
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
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
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
Maksim Pechnikov [Mon, 10 Feb 2020 17:49:20 +0000 (20:49 +0300)]
Merge branch 'develop' into issue/1383
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.
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
lain [Fri, 7 Feb 2020 15:18:05 +0000 (15:18 +0000)]
Apply 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
Lain Soykaf [Fri, 7 Feb 2020 14:01:45 +0000 (15:01 +0100)]
EmojiReactions: Remove old API endpoints
Lain Soykaf [Fri, 7 Feb 2020 13:59:26 +0000 (14:59 +0100)]
EmojiReactions: Add docs and Changelog
Lain Soykaf [Fri, 7 Feb 2020 13:52:13 +0000 (14:52 +0100)]
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
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
projects / akkoma / log