sadposter [Sat, 9 Nov 2019 19:11:33 +0000 (19:11 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Sat, 9 Nov 2019 19:10:22 +0000 (19:10 +0000)]
fe
rinpatch [Fri, 8 Nov 2019 23:08:03 +0000 (23:08 +0000)]
Merge branch 'chore/update-fe' into 'develop'
Bump pleroma-fe bundle to
044c9ad0562af059dd961d50961a3880fca9c642
See merge request pleroma/pleroma!1956
rinpatch [Fri, 8 Nov 2019 22:47:32 +0000 (01:47 +0300)]
rinpatch [Fri, 8 Nov 2019 21:12:23 +0000 (21:12 +0000)]
Merge branch 'bugfix/containment-no-id' into 'develop'
object containment: handle all cases where ID is invalid (missing, nil, non-string)
Closes #1387
See merge request pleroma/pleroma!1955
Ariadne Conill [Fri, 8 Nov 2019 20:51:28 +0000 (14:51 -0600)]
object containment: handle all cases where ID is invalid (missing, nil, non-string)
rinpatch [Fri, 8 Nov 2019 20:02:25 +0000 (20:02 +0000)]
Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'
Bump fast_sanitize
See merge request pleroma/pleroma!1953
rinpatch [Fri, 8 Nov 2019 19:22:39 +0000 (22:22 +0300)]
Bump fast_sanitize
Fixes build fails on freebsd
kaniini [Fri, 8 Nov 2019 19:08:39 +0000 (19:08 +0000)]
Merge branch 'chore/add-multifetch' into 'develop'
nodeinfo: add multifetch feature (ref pleroma-fe!977).
See merge request pleroma/pleroma!1952
Ariadne Conill [Fri, 8 Nov 2019 18:48:28 +0000 (12:48 -0600)]
nodeinfo: add multifetch feature (ref pleroma-fe!977).
rinpatch [Fri, 8 Nov 2019 17:01:07 +0000 (17:01 +0000)]
Merge branch 'chore/bump-fast-sanitize-again' into 'develop'
Bump fast_sanitize to 0.1.2
See merge request pleroma/pleroma!1951
rinpatch [Fri, 8 Nov 2019 16:40:13 +0000 (19:40 +0300)]
Bump fast_sanitize to 0.1.2
Fixes build issues on macOS
rinpatch [Thu, 7 Nov 2019 23:32:25 +0000 (23:32 +0000)]
Merge branch 'chore/bump-fast-sanitize' into 'develop'
Bump fast_sanitize to 0.1.1
Closes #1378
See merge request pleroma/pleroma!1949
rinpatch [Thu, 7 Nov 2019 21:14:53 +0000 (00:14 +0300)]
Bump fast_sanitize to 0.1.1
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
kaniini [Thu, 7 Nov 2019 15:13:20 +0000 (15:13 +0000)]
Merge branch 'recipients-filter' into 'develop'
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
See merge request pleroma/pleroma!1948
eugenijm [Thu, 7 Nov 2019 00:00:21 +0000 (03:00 +0300)]
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
rinpatch [Wed, 6 Nov 2019 23:01:04 +0000 (23:01 +0000)]
Merge branch 'fix/unwrapped-object-return' into 'develop'
Fetcher: fix local check returning unwrapped object
See merge request pleroma/pleroma!1947
rinpatch [Wed, 6 Nov 2019 22:40:55 +0000 (01:40 +0300)]
Fetcher: fix local check returning unwrapped object
This resulted in error messages about failed refetches being logged.
rinpatch [Wed, 6 Nov 2019 14:47:34 +0000 (14:47 +0000)]
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Closes #1385
See merge request pleroma/pleroma!1944
rinpatch [Wed, 6 Nov 2019 14:39:46 +0000 (14:39 +0000)]
Merge branch 'changelog-cleanup' into 'develop'
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md
See merge request pleroma/pleroma!1945
rinpatch [Wed, 6 Nov 2019 14:31:32 +0000 (14:31 +0000)]
Merge branch 'fix/saner-static-cache-control' into 'develop'
Set better Cache-Control header for static content
Closes #1382
See merge request pleroma/pleroma!1943
rinpatch [Wed, 6 Nov 2019 14:22:23 +0000 (17:22 +0300)]
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Ivan Tashkinov [Wed, 6 Nov 2019 14:19:32 +0000 (17:19 +0300)]
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
rinpatch [Wed, 6 Nov 2019 13:41:19 +0000 (16:41 +0300)]
Set better Cache-Control header for static content
Closes #1382
feld [Wed, 6 Nov 2019 12:24:41 +0000 (12:24 +0000)]
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
rinpatch [Wed, 6 Nov 2019 11:20:34 +0000 (11:20 +0000)]
Merge branch 'fix/object-reinject-set-cache' into 'develop'
Object Fetcher: set cache after reinjecting
See merge request pleroma/pleroma!1942
rinpatch [Wed, 6 Nov 2019 11:00:03 +0000 (14:00 +0300)]
Object Fetcher: set cache after reinjecting
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
Haelwenn [Wed, 6 Nov 2019 01:13:20 +0000 (01:13 +0000)]
Merge branch 'ci/remove-docs-build' into 'develop'
CI: Remove the docs-build job
See merge request pleroma/pleroma!1941
rinpatch [Tue, 5 Nov 2019 20:45:07 +0000 (23:45 +0300)]
CI: Remove the docs-build job
The artifacts it produces were no longer used since we switched to
mkdocs.
rinpatch [Tue, 5 Nov 2019 10:01:29 +0000 (10:01 +0000)]
Merge branch 'chore/bump-htmlentities' into 'develop'
Bump HtmlEntities to 0.5
See merge request pleroma/pleroma!1939
rinpatch [Tue, 5 Nov 2019 09:37:25 +0000 (12:37 +0300)]
Bump HtmlEntities to 0.5
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
Maxim Filippov [Tue, 5 Nov 2019 01:36:47 +0000 (11:36 +1000)]
Merge branch 'develop' into feature/multiple-users-force-password-reset
sadposter [Mon, 4 Nov 2019 18:20:19 +0000 (18:20 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Mon, 4 Nov 2019 16:28:55 +0000 (16:28 +0000)]
Merge branch 'failing-search-fixes' into 'develop'
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
lain [Mon, 4 Nov 2019 15:59:36 +0000 (15:59 +0000)]
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'
Add `pleroma.direct_conversation_id` to the `conversation` event payload
See merge request pleroma/pleroma!1925
lain [Mon, 4 Nov 2019 15:57:41 +0000 (16:57 +0100)]
User Search: Remove superfluous setweight and random test.
The test tested for a behavior that isn't actually enforced anymore.
eugenijm [Thu, 31 Oct 2019 00:44:27 +0000 (03:44 +0300)]
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
lain [Mon, 4 Nov 2019 15:19:29 +0000 (15:19 +0000)]
Merge branch 'transmogrifier-test-errors' into 'develop'
capture test log where errors are expected
See merge request pleroma/pleroma!1915
lain [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
Merge branch 'missing-tesla-mocks' into 'develop'
add missing tesla mocks
See merge request pleroma/pleroma!1879
Steven Fuchs [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
add missing tesla mocks
kaniini [Mon, 4 Nov 2019 14:52:56 +0000 (14:52 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'
mix: update fast_sanitize dependency to
1af67547
Closes #1372
See merge request pleroma/pleroma!1934
Ariadne Conill [Mon, 4 Nov 2019 14:38:14 +0000 (08:38 -0600)]
mix: update fast_sanitize dependency to
1af67547
kaniini [Mon, 4 Nov 2019 14:24:21 +0000 (14:24 +0000)]
Merge branch 'faster-user-deactivation' into 'develop'
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
lain [Mon, 4 Nov 2019 14:11:44 +0000 (14:11 +0000)]
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
lain [Mon, 4 Nov 2019 13:36:54 +0000 (14:36 +0100)]
User: Don't pull remote users follower count immediately after deactivating.
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
kaniini [Sun, 3 Nov 2019 22:00:50 +0000 (22:00 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'
update fast sanitize dependency
See merge request pleroma/pleroma!1932
Ariadne Conill [Sun, 3 Nov 2019 21:41:30 +0000 (15:41 -0600)]
update fast sanitize dependency
rinpatch [Sun, 3 Nov 2019 17:09:57 +0000 (17:09 +0000)]
Merge branch 'bugfix/streamer-follows' into 'develop'
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
kaniini [Sun, 3 Nov 2019 16:19:27 +0000 (16:19 +0000)]
Merge branch 'feature/omit-relay-user' into 'develop'
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
kaniini [Sun, 3 Nov 2019 16:18:19 +0000 (16:18 +0000)]
Merge branch 'feature/fast_sanitize' into 'develop'
Switching to FastSanitize
See merge request pleroma/pleroma!1916
Ariadne Conill [Sun, 3 Nov 2019 15:05:12 +0000 (09:05 -0600)]
streamer: use direct object for filter checks when there is no valid child object in an activity
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
Haelwenn [Sat, 2 Nov 2019 15:07:47 +0000 (15:07 +0000)]
Merge branch 'fix/migration-schema' into 'develop'
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
rinpatch [Fri, 1 Nov 2019 17:58:24 +0000 (20:58 +0300)]
Bump fast_sanitize version
kaniini [Fri, 1 Nov 2019 17:56:20 +0000 (17:56 +0000)]
Merge branch 'fix/moderation-log-crash' into 'develop'
Fix moderation log crash
Closes #1345
See merge request pleroma/pleroma!1929
Maxim Filippov [Fri, 1 Nov 2019 17:26:52 +0000 (20:26 +0300)]
Update docs
Maxim Filippov [Fri, 1 Nov 2019 17:25:41 +0000 (17:25 +0000)]
Apply suggestion to CHANGELOG.md
Maxim Filippov [Fri, 1 Nov 2019 16:13:29 +0000 (19:13 +0300)]
Fix moderation log crash
Maxim Filippov [Fri, 1 Nov 2019 15:45:47 +0000 (18:45 +0300)]
Force password reset for multiple users
Maxim Filippov [Fri, 1 Nov 2019 12:14:43 +0000 (15:14 +0300)]
Undo dialyzer fix
kaniini [Fri, 1 Nov 2019 12:06:44 +0000 (12:06 +0000)]
Merge branch 'fix-recipients-from-activity' into 'develop'
Fix duplicate recipients from activity
See merge request pleroma/pleroma!1921
lain [Thu, 31 Oct 2019 13:34:57 +0000 (13:34 +0000)]
Merge branch 'refactor/db-add-defaults' into 'develop'
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
Maxim Filippov [Thu, 31 Oct 2019 12:34:49 +0000 (15:34 +0300)]
Fix count
Maxim Filippov [Wed, 30 Oct 2019 23:26:02 +0000 (02:26 +0300)]
AdminAPI: Omit relay user from users list
Maxim Filippov [Wed, 30 Oct 2019 23:25:15 +0000 (02:25 +0300)]
Fix "the call ... will never return" warning
Mark Felder [Wed, 30 Oct 2019 22:57:08 +0000 (17:57 -0500)]
Bump fast_sanitize dependency so this builds on more than just Linux
Mark Felder [Wed, 30 Oct 2019 22:51:15 +0000 (17:51 -0500)]
Merge branch 'develop' into feature/fast_sanitize
Roman Chvanikov [Wed, 30 Oct 2019 15:34:14 +0000 (18:34 +0300)]
Remove following column from the migrations
kPherox [Wed, 30 Oct 2019 11:14:07 +0000 (20:14 +0900)]
Update test for get_recipients_from_activity
rinpatch [Wed, 30 Oct 2019 10:59:25 +0000 (10:59 +0000)]
Merge branch 'fix/blocked-follows' into 'develop'
Add a migration to fix blocked follows
Closes #1359
See merge request pleroma/pleroma!1922
rinpatch [Wed, 30 Oct 2019 09:59:14 +0000 (12:59 +0300)]
Fix bookmark migration using a query with a schema
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
sadposter [Wed, 30 Oct 2019 09:26:23 +0000 (09:26 +0000)]
tos
Egor Kislitsyn [Wed, 30 Oct 2019 08:52:37 +0000 (15:52 +0700)]
Add a migration to fix blocked follows
kPherox [Wed, 30 Oct 2019 06:40:25 +0000 (15:40 +0900)]
Fix duplicate recipients
rinpatch [Wed, 30 Oct 2019 06:20:13 +0000 (09:20 +0300)]
Rip out the rest of htmlsanitizeex
rinpatch [Tue, 29 Oct 2019 17:58:54 +0000 (20:58 +0300)]
Remove commented-out code
rinpatch [Tue, 29 Oct 2019 17:49:32 +0000 (20:49 +0300)]
Fix XSS emoji test
rinpatch [Tue, 29 Oct 2019 14:17:09 +0000 (14:17 +0000)]
Merge branch 'fix/migrations-same-module-name' into 'develop'
Fix two migrations sharing the same module name
See merge request pleroma/pleroma!1919
rinpatch [Tue, 29 Oct 2019 14:00:03 +0000 (17:00 +0300)]
Bump fast_sanitize dependency
rinpatch [Tue, 29 Oct 2019 13:56:24 +0000 (16:56 +0300)]
Fix two migrations sharing the same module name
This makes ecto execute only the latter one.
sadposter [Tue, 29 Oct 2019 13:12:38 +0000 (13:12 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
rinpatch [Tue, 29 Oct 2019 11:24:07 +0000 (11:24 +0000)]
Merge branch 'fix-follow-requests' into 'develop'
FIx follow requests
Closes #1357
See merge request pleroma/pleroma!1918
sadposter [Tue, 29 Oct 2019 11:01:50 +0000 (11:01 +0000)]
fe
sadposter [Tue, 29 Oct 2019 10:47:37 +0000 (10:47 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
kPherox [Tue, 29 Oct 2019 10:16:34 +0000 (19:16 +0900)]
Migrate missing follow requests
rinpatch [Tue, 29 Oct 2019 10:05:20 +0000 (13:05 +0300)]
Bump fast_sanitize version
kPherox [Tue, 29 Oct 2019 09:46:22 +0000 (18:46 +0900)]
Add test follow activity for locked account
kPherox [Tue, 29 Oct 2019 08:12:49 +0000 (17:12 +0900)]
Add pending to handle incoming for Follow activity
rinpatch [Mon, 28 Oct 2019 22:21:00 +0000 (01:21 +0300)]
Add fast_sanitize to dependencies
rinpatch [Mon, 28 Oct 2019 22:18:08 +0000 (01:18 +0300)]
Switch from HtmlSanitizeEx to FastSanitize
rinpatch [Mon, 28 Oct 2019 22:16:57 +0000 (01:16 +0300)]
Ensure myhtmlex is started before swarm
Otherwise swarm is going to attempt resizing the cluster and timeout
rinpatch [Mon, 28 Oct 2019 22:16:22 +0000 (01:16 +0300)]
Blacklist myhtmlex nodes from swarm
rinpatch [Mon, 28 Oct 2019 22:15:28 +0000 (01:15 +0300)]
Use the default scrubber before mediaproxy transformation
stwf [Mon, 28 Oct 2019 16:51:58 +0000 (12:51 -0400)]
capture where errors are expected
Roman Chvanikov [Mon, 28 Oct 2019 16:17:50 +0000 (19:17 +0300)]
Move setDefaultsToTables to past to run before notNull migrations
Roman Chvanikov [Mon, 28 Oct 2019 16:16:19 +0000 (19:16 +0300)]
Complete defaults
lain [Mon, 28 Oct 2019 08:05:14 +0000 (08:05 +0000)]
Merge branch 'fix/migration' into 'develop'
Fix `SetNotNullForUsers` migration
See merge request pleroma/pleroma!1913
Egor Kislitsyn [Mon, 28 Oct 2019 07:45:50 +0000 (14:45 +0700)]
Fix `SetNotNullForUsers` migration
lain [Mon, 28 Oct 2019 07:27:45 +0000 (07:27 +0000)]
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
Roman Chvanikov [Sun, 27 Oct 2019 16:29:35 +0000 (19:29 +0300)]
Add migration
Maxim Filippov [Sun, 27 Oct 2019 13:33:58 +0000 (16:33 +0300)]
Fix report parsing
projects / akkoma / log