a1c4a5d7cf
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
5 years ago
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
6c82b6e3bf
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
...
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message
See merge request pleroma/pleroma!1853
5 years ago
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
5 years ago
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
5 years ago
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)
5 years ago
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
0a5175ecbb
Order fts results by trigram
5 years ago
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
5 years ago
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
90d516d42b
Store status data inside flag activity
5 years ago
8c0cfed825
some fixes
5 years ago
e7bb762ec2
don't stream in benchmark env
5 years ago
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
5 years ago
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
5 years ago
e0da0d4f9e
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
...
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
5 years ago
2f0ed5f6c4
Fix hiding branch name logic
5 years ago
c00797d08e
Merge branch 'fix/version-branch-skip' into 'stable'
...
Fix hiding branch name logic
See merge request pleroma/pleroma!1845
5 years ago
0733da3205
Fix hiding branch name logic
5 years ago
988654a720
Merge branch 'stable-fix-docs' into 'stable'
...
Fix documentation deploy for stable
See merge request pleroma/pleroma!1844
5 years ago
dd859e6847
Fix documentation deploy for stable
5 years ago
442acb31ac
Fix pleroma_ctl link
5 years ago
832d892c2c
Merge branch 'final-release-prep' into 'maint/1.1'
...
Final 1.1 release preparations
See merge request pleroma/pleroma!1843
5 years ago
8ef4afcc3b
Final 1.1 release preparations
5 years ago
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
5 years ago
2b6cd10b68
Correct version parser branch name detection
5 years ago
164f42c5f8
Add a changelog entry for branch-moving
5 years ago
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
3d3c166e59
Preparations for renaming `master` to `stable`
5 years ago
8b39d6f93c
Merge branch 'master-to-stable' into 'develop'
...
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
5 years ago
17b8896c40
Correct version parser branch name detection
5 years ago
d1e969842d
Add a changelog entry for branch-moving
5 years ago
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
0e9243e8a2
Preparations for renaming `master` to `stable`
5 years ago
8ad015ef64
Skip deactivated users in followers import
5 years ago
1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
5 years ago
1f99abbeba
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
...
Backport mediaproxy failure tracking enchancements to maint
See merge request pleroma/pleroma!1837
5 years ago
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
5 years ago
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
5 years ago
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.
5 years ago
d9410c488a
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
...
Backport pleroma-ctl enchancements to maint
See merge request pleroma/pleroma!1833
5 years ago
rinpatch