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
b7de4ad082
Apply suggestion to CHANGELOG.md
2019-11-04 17:31:08 +00:00
4388255eed
Migrations: Don't copy over mutes unless there actually are some.
2019-11-04 18:13:37 +01:00
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
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
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
6f5ac0819a
Tests: Fix tests failing because of info being null.
2019-11-01 14:16:00 +01:00
d52f9c144f
Mixfile: Bump version.
2019-11-01 13:40:58 +01:00
5b34545b64
Changelog: Add information about user.info migration.
2019-11-01 13:40:28 +01:00
8ad75f9ecf
Migrations: Add migration to fill empty info fields and make them non-null.
2019-11-01 13:31:55 +01:00
a43b899e94
Merge branch 'release/1.1.3' into 'stable'
...
1.1.3 release
See merge request pleroma/pleroma!1884
2019-10-25 17:08:01 +00:00
948d0d3b0b
mixfile: bump version to 1.1.3
2019-10-25 18:49:21 +03:00
3627ffc8b7
Changelog: Add 1.1.3 entry
2019-10-25 18:46:28 +03:00
ca1871fbb4
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
2019-10-25 18:44:23 +03:00
e91d5a23f4
pleroma_ctl: fix crashes due to different shift(1) behavior on dash
2019-10-25 18:32:09 +03:00
9b26d1608f
Merge branch 'release/1.1.2' into 'stable'
...
1.1.2 Release
See merge request pleroma/pleroma!1863
2019-10-18 21:44:14 +00:00
59d447d555
pleroma_ctl: Fix attempting to use RPC for config generation
2019-10-19 00:41:26 +03:00
1a063c92ab
Bump version to 1.1.2 in mix.exs
2019-10-19 00:40:23 +03:00
bb73f100b8
Merge branch 'release/1.1.1' into 'stable'
...
1.1.1 Release
See merge request pleroma/pleroma!1857
2019-10-18 12:08:03 +00:00
c00b55bc80
Add a changelog entry for user search refactoring
2019-10-18 14:57:13 +03:00
eca86330b4
Remove a failing search test due to it being unrealistic
...
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
2019-10-18 14:56:27 +03:00
7a00acb3e4
Order fts results by trigram
2019-10-18 14:56:20 +03:00
713b2187b9
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
2019-10-18 14:56:14 +03:00
4123c9db07
Bump the version in mix.exs
2019-10-18 14:53:13 +03:00
deee9f3196
Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'
...
Fix a migration wiping user info of users that don't have any mutes
See merge request pleroma/pleroma!1856
2019-10-18 11:49:27 +00:00
41c47639e3
Add a changelog entry for yet another jsonb_set data loss
2019-10-18 14:40:47 +03:00
98c9affc48
Add a test for safe_jsonb_set
2019-10-18 14:33:51 +03:00
a1c4a5d7cf
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 14:11:30 +03:00
c00797d08e
Merge branch 'fix/version-branch-skip' into 'stable'
...
Fix hiding branch name logic
See merge request pleroma/pleroma!1845
2019-10-14 19:14:47 +00:00
0733da3205
Fix hiding branch name logic
2019-10-14 22:13:18 +03:00
988654a720
Merge branch 'stable-fix-docs' into 'stable'
...
Fix documentation deploy for stable
See merge request pleroma/pleroma!1844
2019-10-14 18:55:09 +00:00
dd859e6847
Fix documentation deploy for stable
2019-10-14 21:54:13 +03:00
442acb31ac
Fix pleroma_ctl link
2019-10-14 21:29:47 +03:00
832d892c2c
Merge branch 'final-release-prep' into 'maint/1.1'
...
Final 1.1 release preparations
See merge request pleroma/pleroma!1843
2019-10-14 18:21:49 +00:00
8ef4afcc3b
Final 1.1 release preparations
2019-10-14 21:20:29 +03:00
13966f1504
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
...
Backport/1.1 branch name change
See merge request pleroma/pleroma!1841
2019-10-14 16:47:27 +00:00
2b6cd10b68
Correct version parser branch name detection
2019-10-14 19:34:38 +03:00
164f42c5f8
Add a changelog entry for branch-moving
2019-10-14 19:34:29 +03:00
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 19:34:06 +03:00
3d3c166e59
Preparations for renaming `master` to `stable`
2019-10-14 19:33:57 +03:00
1f99abbeba
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
...
Backport mediaproxy failure tracking enchancements to maint
See merge request pleroma/pleroma!1837
2019-10-12 14:54:49 +00:00
a8afbe977a
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
(cherry picked from commit 930cbd6d059bdbf081
2019-10-12 14:43:20 +00:00
d9410c488a
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
...
Backport pleroma-ctl enchancements to maint
See merge request pleroma/pleroma!1833
2019-10-11 19:39:37 +00:00
fbbb032bc5
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
(cherry picked from commit 44afe4c887b750135a
2019-10-11 10:57:30 +00:00
ac113f6724
Merge branch 'backport/exclude-replies' into 'maint/1.1'
...
mastodon api: fix exclude_replies (closes #1287 )
See merge request pleroma/pleroma!1816
2019-10-07 13:12:46 +00:00
3e1d2ace73
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 13:01:05 +00:00
72bd763d9f
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
...
update changelog date
See merge request pleroma/pleroma!1812
2019-10-07 12:14:56 +00:00
129fb9f499
update changelog date
2019-10-07 12:14:04 +00:00
d928f0c4c3
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
...
Pleroma 1.0.91 (aka 1.1 RC2).
See merge request pleroma/pleroma!1811
2019-10-07 12:12:45 +00:00
c5b7d2ef26
Pleroma 1.0.91 (aka 1.1 RC2).
2019-10-07 12:10:57 +00:00
lain