nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7277 commits 2 branches 0 tags 272 MiB
Commit graph

7277 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ariadne Conill 4f82e42e4e websub: remove entirely 2019-10-18 14:50:09 +00:00
Ariadne Conill b16a460916 federator: remove websub stuff 2019-10-18 14:50:09 +00:00
Ariadne Conill 25b7ff56c3 application: don't start Federator.init/1 anymore 2019-10-18 14:50:09 +00:00
Ariadne Conill c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
Ariadne Conill 4e270964d7 update changelog 2019-10-18 14:50:09 +00:00
rinpatch 223c0c0136 Merge branch 'fix/changelog-typo' into 'develop' 
Fix wrong list level in the changelog

See merge request pleroma/pleroma!1860
 2019-10-18 13:00:33 +00:00
rinpatch c2f1cc4f16 Fix wrong list level in the changelog 2019-10-18 15:56:14 +03:00
rinpatch 153f652d41 Merge branch 'chore/develop-changelog-sync' into 'develop' 
Sync the changelog from stable and collapse the API sections

See merge request pleroma/pleroma!1859
 2019-10-18 12:47:45 +00:00
rinpatch 09c1e7a82e Sync the changelog from stable and collapse the API sections 2019-10-18 15:46:51 +03:00
rinpatch 30a59ae97d Merge branch 'backport/develop-safe-jsonb' into 'develop' 
Backport safe_jsonb_set fixes to develop

See merge request pleroma/pleroma!1858
 2019-10-18 12:42:09 +00:00
rinpatch b085cd2660 Add a test for safe_jsonb_set 2019-10-18 15:22:16 +03:00
rinpatch 39e996528c Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 15:22:07 +03:00
rinpatch 724f611b0e Merge branch 'cleanup/deprecated_config_upload' into 'develop' 
upload.ex: Remove deprecated configuration

See merge request pleroma/pleroma!1855
 2019-10-18 11:34:48 +00:00
Haelwenn (lanodan) Monnier 3c6fd0bb99
upload.ex: Remove deprecated configuration 2019-10-18 12:34:09 +02:00
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02:00
kaniini 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
 2019-10-18 04:42:02 +00:00
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex 2019-10-18 04:36:37 +00:00
feld 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
 2019-10-17 20:05:01 +00:00
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message 2019-10-17 16:49:39 +03:00
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03: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
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 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
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 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
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 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