lain
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
lain
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01:00
lain
21716aa594
Merge branch 'release/1.1.4' into 'stable'
...
Release/1.1.4 - user.info fix plus NOT NULL for user.info
See merge request pleroma/pleroma!1927
2019-11-05 12:02:45 +00:00
rinpatch
f11eebc183
Merge branch 'chore/bump-htmlentities' into 'develop'
...
Bump HtmlEntities to 0.5
See merge request pleroma/pleroma!1939
2019-11-05 10:01:29 +00:00
rinpatch
9d3b12a658
Bump HtmlEntities to 0.5
...
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
2019-11-05 12:37:25 +03:00
Maksim Pechnikov
e52955c961
update following_relationship.ex
2019-11-05 10:50:03 +03:00
Maksim Pechnikov
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
lain
b7de4ad082
Apply suggestion to CHANGELOG.md
2019-11-04 17:31:08 +00:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
lain
4388255eed
Migrations: Don't copy over mutes unless there actually are some.
2019-11-04 18:13:37 +01:00
rinpatch
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
2019-11-04 16:28:55 +00:00
lain
478eb5944d
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
2019-11-04 15:59:36 +00:00
lain
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id
to the conversation
stream event payload.
2019-11-04 18:36:16 +03:00
Ariadne Conill
6a151e7c7f
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
2019-11-04 16:25:05 +01:00
lain
a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
2019-11-04 15:19:29 +00:00
lain
f7f69356bd
Merge branch 'missing-tesla-mocks' into 'develop'
...
add missing tesla mocks
See merge request pleroma/pleroma!1879
2019-11-04 15:18:32 +00:00
Steven Fuchs
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
kaniini
bec6d02f30
Merge branch 'chore/update-fast-sanitize' into 'develop'
...
mix: update fast_sanitize dependency to 1af67547
Closes #1372
See merge request pleroma/pleroma!1934
2019-11-04 14:52:56 +00:00
Ariadne Conill
203d9812f0
mix: update fast_sanitize dependency to 1af67547
2019-11-04 08:38:40 -06:00
lain
5f844fd3f2
Migrations: Add a fixup migration for the muted_notifications
...
This sets info->muted_notifications to an emtpy array if it is explicitly set
to null before. This can happen when safe_jsonb_set coalesces to a jsonb null,
which will make ecto not use the default value of [] anymore because it has been
explicitly overwritten.
2019-11-04 15:38:28 +01:00
kaniini
06cc77e6fb
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
2019-11-04 14:24:21 +00:00
lain
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
lain
0c31258616
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
2019-11-04 14:36:54 +01:00
kaniini
bab786cd93
Merge branch 'chore/update-fast-sanitize' into 'develop'
...
update fast sanitize dependency
See merge request pleroma/pleroma!1932
2019-11-03 22:00:50 +00:00
Ariadne Conill
f42f300870
update fast sanitize dependency
2019-11-03 15:41:30 -06:00
Maksim Pechnikov
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
rinpatch
8dd7c099a7
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
2019-11-03 17:09:57 +00:00
kaniini
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
kaniini
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
Ariadne Conill
4bf942583f
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
2019-11-03 09:05:12 -06:00
Haelwenn
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
rinpatch
55ef88ef95
Bump fast_sanitize version
2019-11-01 20:58:24 +03:00
kaniini
366ada7b29
Merge branch 'fix/moderation-log-crash' into 'develop'
...
Fix moderation log crash
Closes #1345
See merge request pleroma/pleroma!1929
2019-11-01 17:56:20 +00:00
Maxim Filippov
ab5c8ec9fa
Update docs
2019-11-01 20:27:16 +03:00
Maxim Filippov
10e9ba6340
Apply suggestion to CHANGELOG.md
2019-11-01 17:25:41 +00:00
Maxim Filippov
1b83a0694a
Fix moderation log crash
2019-11-01 19:13:29 +03:00
Maxim Filippov
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
rinpatch
4bab9672ed
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.
2019-11-01 16:26:27 +01:00
lain
6f5ac0819a
Tests: Fix tests failing because of info being null.
2019-11-01 14:16:00 +01:00
lain
d52f9c144f
Mixfile: Bump version.
2019-11-01 13:40:58 +01:00
lain
5b34545b64
Changelog: Add information about user.info migration.
2019-11-01 13:40:28 +01:00
lain
8ad75f9ecf
Migrations: Add migration to fill empty info fields and make them non-null.
2019-11-01 13:31:55 +01:00
Maxim Filippov
d75934b0d0
Undo dialyzer fix
2019-11-01 15:14:43 +03:00
kaniini
1a60215076
Merge branch 'fix-recipients-from-activity' into 'develop'
...
Fix duplicate recipients from activity
See merge request pleroma/pleroma!1921
2019-11-01 12:06:44 +00:00
Maksim Pechnikov
fd8099fb68
Merge branch 'develop' into issue/1276
2019-10-31 21:09:46 +03:00
Maksim Pechnikov
1b3a942a84
fix format
2019-10-31 17:38:12 +03:00