lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
lain
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
2019-10-16 12:29:08 +00:00
feld
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
rinpatch
b8be6a4dc9
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-16 15:09:39 +03:00
lain
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
rinpatch
0a5175ecbb
Order fts results by trigram
2019-10-16 13:49:33 +03:00
rinpatch
c10ce113d4
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-16 12:52:47 +03:00
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
Maxim Filippov
90d516d42b
Store status data inside flag activity
2019-10-15 16:52:41 +02:00
Alexander
8c0cfed825
some fixes
2019-10-15 16:26:04 +03:00
Alexander
e7bb762ec2
don't stream in benchmark env
2019-10-15 15:16:17 +03:00
kPherox
5bd0717de2
Add Sec-WebSocket-Protocol to response header
2019-10-15 21:09:44 +09:00
Ekaterina Vaartis
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
2019-10-15 09:53:28 +03:00
feld
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
2019-10-14 19:40:40 +00:00
rinpatch
e0da0d4f9e
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
...
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
2019-10-14 19:17:06 +00:00
rinpatch
2f0ed5f6c4
Fix hiding branch name logic
2019-10-14 22:15:16 +03:00
rinpatch
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
rinpatch
0733da3205
Fix hiding branch name logic
2019-10-14 22:13:18 +03:00
rinpatch
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
rinpatch
dd859e6847
Fix documentation deploy for stable
2019-10-14 21:54:13 +03:00
rinpatch
442acb31ac
Fix pleroma_ctl link
2019-10-14 21:29:47 +03:00
rinpatch
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
rinpatch
8ef4afcc3b
Final 1.1 release preparations
2019-10-14 21:20:29 +03:00
rinpatch
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
rinpatch
2b6cd10b68
Correct version parser branch name detection
2019-10-14 19:34:38 +03:00
rinpatch
164f42c5f8
Add a changelog entry for branch-moving
2019-10-14 19:34:29 +03:00
rinpatch
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 19:34:06 +03:00
rinpatch
3d3c166e59
Preparations for renaming master to stable
2019-10-14 19:33:57 +03:00
rinpatch
8b39d6f93c
Merge branch 'master-to-stable' into 'develop'
...
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
2019-10-14 16:08:53 +00:00
rinpatch
17b8896c40
Correct version parser branch name detection
2019-10-14 18:45:16 +03:00
rinpatch
d1e969842d
Add a changelog entry for branch-moving
2019-10-14 18:42:30 +03:00
rinpatch
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 18:39:56 +03:00
rinpatch
0e9243e8a2
Preparations for renaming master to stable
2019-10-14 18:38:51 +03:00
Egor Kislitsyn
8ad015ef64
Skip deactivated users in followers import
2019-10-14 14:16:57 +07:00
Egor Kislitsyn
1d46944fbd
Do not add follower_address to following for non local users
2019-10-14 13:50:43 +07:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
2019-10-13 15:37:49 +00:00
rinpatch
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
rinpatch
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
rinpatch
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
2019-10-12 14:42:55 +00:00
rinpatch
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
2019-10-11 22:52:38 +03:00
rinpatch
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
Maxim Filippov
751513b6df
This line either causes a warning, or a failed test
2019-10-11 19:31:00 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
Haelwenn
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
Haelwenn
44afe4c887
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
2019-10-11 10:56:45 +00:00
lain
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
