Ivan Tashkinov [Wed, 20 May 2020 17:26:43 +0000 (20:26 +0300)]
[#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
Ivan Tashkinov [Sat, 16 May 2020 13:14:50 +0000 (16:14 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
rinpatch [Sat, 16 May 2020 11:17:14 +0000 (11:17 +0000)]
Merge branch '1757-fix-unblocks-too' into 'develop'
CommonAPI: Unblock a user even if we don't have an activity.
Closes #1757
See merge request pleroma/pleroma!2538
lain [Sat, 16 May 2020 10:28:24 +0000 (12:28 +0200)]
CommonAPI: Unblock a user even if we don't have an activity.
lain [Fri, 15 May 2020 14:37:38 +0000 (14:37 +0000)]
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
Synchronize PleromaFE settings
See merge request pleroma/pleroma!2532
lain [Fri, 15 May 2020 14:22:59 +0000 (14:22 +0000)]
Merge branch 'fix/digest-task-otp' into 'develop'
Fix digest mix task on OTP releases
See merge request pleroma/pleroma!2526
lain [Fri, 15 May 2020 13:45:02 +0000 (13:45 +0000)]
Merge branch 'fix/database-config' into 'develop'
Returning partial chain
Closes #1772
See merge request pleroma/pleroma!2537
Alexander Strizhakov [Fri, 15 May 2020 13:16:02 +0000 (16:16 +0300)]
returning partial chain
rinpatch [Fri, 15 May 2020 11:13:08 +0000 (11:13 +0000)]
Merge branch 'openapi/nullable-request-fields' into 'develop'
[OpenAPI] Mark all not required request fields as nullable
Closes #1761
See merge request pleroma/pleroma!2536
Egor Kislitsyn [Fri, 15 May 2020 10:55:41 +0000 (14:55 +0400)]
[OpenAPI] Mark all not required request fields as nullable
rinpatch [Fri, 15 May 2020 05:06:29 +0000 (05:06 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2531
Ivan Tashkinov [Thu, 14 May 2020 17:19:56 +0000 (20:19 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Ivan Tashkinov [Thu, 14 May 2020 17:18:31 +0000 (20:18 +0300)]
[#2497] Added support for :eimp for image resizing.
Michał Sidor [Thu, 14 May 2020 11:19:12 +0000 (11:19 +0000)]
Translated using Weblate (Polish)
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Michał Sidor [Wed, 13 May 2020 16:49:25 +0000 (16:49 +0000)]
Translated using Weblate (Polish)
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Michał Sidor [Wed, 13 May 2020 16:37:17 +0000 (16:37 +0000)]
Added translation using Weblate (Polish)
rinpatch [Thu, 14 May 2020 16:07:37 +0000 (16:07 +0000)]
Merge branch 'feature/database-configuration-whitelist' into 'develop'
Database configuration whitelist
See merge request pleroma/pleroma!2522
Stephanie Wilde-Hobbs [Thu, 14 May 2020 14:56:14 +0000 (15:56 +0100)]
Add config migration disclaimer to config whitelist documentation
lain [Thu, 14 May 2020 14:36:56 +0000 (14:36 +0000)]
Merge branch 'bcrypt-auth' into 'develop'
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
Alex Gleason [Thu, 14 May 2020 13:42:27 +0000 (08:42 -0500)]
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:36:49 +0000 (12:36 +0100)]
Add Changelog entry
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:34:46 +0000 (12:34 +0100)]
Allow whitelisting whole groups
Steph [Thu, 14 May 2020 09:50:53 +0000 (09:50 +0000)]
Style fixes
lain [Thu, 14 May 2020 09:27:33 +0000 (09:27 +0000)]
Merge branch 'features/openrc-console' into 'develop'
init.d/pleroma: Add option to attach an elixir console
See merge request pleroma/pleroma!1704
lain [Thu, 14 May 2020 09:25:18 +0000 (09:25 +0000)]
Merge branch 'openapi/pleroma-api/accounts' into 'develop'
Add OpenAPI spec for PleromaAPI.AccountController
See merge request pleroma/pleroma!2528
lain [Thu, 14 May 2020 09:09:11 +0000 (09:09 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
lain [Thu, 14 May 2020 09:07:09 +0000 (09:07 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
lain [Thu, 14 May 2020 08:22:53 +0000 (08:22 +0000)]
Merge branch 'pleroma_internal' into 'develop'
Add `pleroma_internal` as an internal field
See merge request pleroma/pleroma!2533
Mark Felder [Wed, 13 May 2020 22:07:14 +0000 (17:07 -0500)]
Lint
Mark Felder [Wed, 13 May 2020 21:57:33 +0000 (16:57 -0500)]
Clarify where the Features panel is
Mark Felder [Wed, 13 May 2020 21:51:23 +0000 (16:51 -0500)]
Formatting
Mark Felder [Wed, 13 May 2020 21:49:56 +0000 (16:49 -0500)]
Add missing showFeaturesPanel setting
Mark Felder [Wed, 13 May 2020 21:45:16 +0000 (16:45 -0500)]
add postContentType setting
Mark Felder [Wed, 13 May 2020 21:40:04 +0000 (16:40 -0500)]
Add missing nsfwCensorImage option
Mark Felder [Wed, 13 May 2020 21:36:33 +0000 (16:36 -0500)]
Add missing hideSitename setting
Mark Felder [Wed, 13 May 2020 21:35:12 +0000 (16:35 -0500)]
Add hideFilteredStatuses and hideMutedPosts settings
Mark Felder [Wed, 13 May 2020 21:32:38 +0000 (16:32 -0500)]
Add greentext option
Mark Felder [Wed, 13 May 2020 21:31:15 +0000 (16:31 -0500)]
formattingOptionsEnabled no longer exists
Mark Felder [Wed, 13 May 2020 21:30:24 +0000 (16:30 -0500)]
Add disableChat option
Mark Felder [Wed, 13 May 2020 21:26:49 +0000 (16:26 -0500)]
Spelling/grammar
Mark Felder [Wed, 13 May 2020 21:24:37 +0000 (16:24 -0500)]
enableEmojiPicker is not a setting
Mark Felder [Wed, 13 May 2020 21:23:42 +0000 (16:23 -0500)]
scopeOptionsEnabled has been replaced with minimalScopesMode
Mark Felder [Wed, 13 May 2020 21:19:17 +0000 (16:19 -0500)]
Stickers setting does not exist
Mark Felder [Wed, 13 May 2020 21:18:26 +0000 (16:18 -0500)]
Alpha sort FE config descriptions
Alex Gleason [Wed, 13 May 2020 21:14:24 +0000 (16:14 -0500)]
Add `pleroma_internal` as an internal field
Mark Felder [Wed, 13 May 2020 21:03:42 +0000 (16:03 -0500)]
Synchronize suggestions with all available static/config.json settings
Mark Felder [Wed, 13 May 2020 20:57:39 +0000 (15:57 -0500)]
Sync FE static/config.json
rinpatch [Wed, 13 May 2020 16:26:34 +0000 (16:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2529
Alex Gleason [Tue, 12 May 2020 21:57:01 +0000 (16:57 -0500)]
Handle bcrypt passwords for Mastodon migration
Egor Kislitsyn [Wed, 13 May 2020 15:06:25 +0000 (19:06 +0400)]
Add OpenAPI spec for PleromaAPI.AccountController
Haelwenn (lanodan) Monnier [Mon, 11 May 2020 23:08:20 +0000 (23:08 +0000)]
Translated using Weblate (French)
Currently translated at 100.0% (90 of 90 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
lain [Wed, 13 May 2020 13:38:32 +0000 (13:38 +0000)]
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
Michael Weiss [Wed, 13 May 2020 11:08:10 +0000 (13:08 +0200)]
Fix digest mix task on OTP releases
This is based on #2191, credit belongs to @rinpatch.
lain [Wed, 13 May 2020 10:34:04 +0000 (10:34 +0000)]
Merge branch 'openapi/suggestions' into 'develop'
Add OpenAPI spec for SuggestionController
See merge request pleroma/pleroma!2525
Egor Kislitsyn [Wed, 13 May 2020 10:15:24 +0000 (14:15 +0400)]
Add OpenAPI spec for SuggestionController
lain [Wed, 13 May 2020 09:34:30 +0000 (09:34 +0000)]
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
lain [Wed, 13 May 2020 09:33:37 +0000 (09:33 +0000)]
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
Alexander Strizhakov [Wed, 13 May 2020 07:17:47 +0000 (10:17 +0300)]
ignore order
Alexander Strizhakov [Wed, 13 May 2020 06:29:41 +0000 (09:29 +0300)]
don't use async with global mocks
Alexander Strizhakov [Wed, 13 May 2020 06:20:25 +0000 (09:20 +0300)]
don't use global mocks in setup callbacks
Alexander Strizhakov [Wed, 13 May 2020 05:00:17 +0000 (08:00 +0300)]
don't run in async if tests depend on env config
Alexander Strizhakov [Tue, 12 May 2020 09:12:10 +0000 (12:12 +0300)]
correct order for publised in assert
Alexander Strizhakov [Mon, 11 May 2020 12:22:52 +0000 (15:22 +0300)]
make test fail everytime
Alexander Strizhakov [Mon, 11 May 2020 12:07:05 +0000 (15:07 +0300)]
don't run tests which change env in async
Alexander Strizhakov [Fri, 8 May 2020 15:51:16 +0000 (18:51 +0300)]
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
lain [Wed, 13 May 2020 07:45:35 +0000 (07:45 +0000)]
Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5
See merge request pleroma/pleroma!2523
Alex Gleason [Tue, 12 May 2020 21:42:24 +0000 (16:42 -0500)]
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
Egor Kislitsyn [Tue, 12 May 2020 21:59:17 +0000 (01:59 +0400)]
Fix format
minibikini [Tue, 12 May 2020 21:23:43 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:23:36 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:23:21 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:14:52 +0000 (21:14 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:12:22 +0000 (21:12 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:09:26 +0000 (21:09 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
Egor Kislitsyn [Tue, 12 May 2020 19:59:26 +0000 (23:59 +0400)]
Add OpenAPI spec for StatusController
rinpatch [Tue, 12 May 2020 20:20:19 +0000 (20:20 +0000)]
Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases
See merge request pleroma/pleroma!2520
Stephanie Wilde-Hobbs [Tue, 12 May 2020 20:07:33 +0000 (21:07 +0100)]
Filter config descriptions by config whitelist
rinpatch [Tue, 12 May 2020 20:03:21 +0000 (23:03 +0300)]
fix eldap being required for non-OTP releases
rinpatch [Tue, 12 May 2020 17:02:57 +0000 (17:02 +0000)]
Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
href [Tue, 12 May 2020 16:51:10 +0000 (18:51 +0200)]
Fix typo in test
rinpatch [Tue, 12 May 2020 16:45:46 +0000 (16:45 +0000)]
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
rinpatch [Tue, 12 May 2020 16:44:58 +0000 (16:44 +0000)]
Merge branch '1748-remote-following-follower-count' into 'develop'
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
Stephanie Wilde-Hobbs [Tue, 12 May 2020 16:12:27 +0000 (17:12 +0100)]
Add database configuration whitelist
href [Tue, 12 May 2020 16:04:47 +0000 (18:04 +0200)]
Expand and authorize streams in Streamer directly
lain [Tue, 12 May 2020 14:53:26 +0000 (14:53 +0000)]
Merge branch 'otp-version-update-suggestion' into 'develop'
Startup: suggest updating OTP when the version is too low for gun
See merge request pleroma/pleroma!2518
lain [Tue, 12 May 2020 14:35:51 +0000 (14:35 +0000)]
Merge branch '1020-honk-announces' into 'develop'
Transmogrifier: Add tests for certain announces
Closes #1020
See merge request pleroma/pleroma!2516
rinpatch [Tue, 12 May 2020 14:30:39 +0000 (17:30 +0300)]
Startup: suggest updating OTP when the version is too low for gun
I've seen quite a few people wonder what to do when presented with
this error message.
rinpatch [Tue, 12 May 2020 13:23:40 +0000 (13:23 +0000)]
Merge branch 'giving-up' into 'develop'
Give up for now and make gitlab retry failed jobs.
See merge request pleroma/pleroma!2517
lain [Tue, 12 May 2020 13:02:37 +0000 (15:02 +0200)]
Give up for now and make gitlab retry failed jobs.
lain [Tue, 12 May 2020 10:50:48 +0000 (12:50 +0200)]
Transmogrifier: Add tests for certain announces
lain [Tue, 12 May 2020 10:29:37 +0000 (12:29 +0200)]
Transmogrifier: On incoming follow accept, update follow counts.
lain [Tue, 12 May 2020 08:52:46 +0000 (10:52 +0200)]
ActivityPub: Fix non-federating blocks.
rinpatch [Mon, 11 May 2020 22:30:36 +0000 (22:30 +0000)]
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
rinpatch [Mon, 11 May 2020 22:13:08 +0000 (22:13 +0000)]
Merge branch 'migration-fix-markers' into 'develop'
Markers migration: Fix migration for very large list of markers
See merge request pleroma/pleroma!2511
rinpatch [Mon, 11 May 2020 21:52:57 +0000 (21:52 +0000)]
Merge branch 'chore/gettext-update' into 'develop'
Gettext: remove english messages and update the pot file
See merge request pleroma/pleroma!2512
rinpatch [Mon, 11 May 2020 21:40:13 +0000 (00:40 +0300)]
Gettext: remove english messages and update the pot file
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
Ivan Tashkinov [Mon, 11 May 2020 20:21:53 +0000 (23:21 +0300)]
[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
lain [Mon, 11 May 2020 20:03:29 +0000 (22:03 +0200)]
Migration: Fix typo
lain [Mon, 11 May 2020 20:00:01 +0000 (22:00 +0200)]
Migration: Enum.chunk is deprecated.
lain [Mon, 11 May 2020 19:52:47 +0000 (21:52 +0200)]
Markers migration: Fix migration for very large list of markers
projects / akkoma / log