Commit Graph

7261 Commits (99cf1ef9be93ebab04d088848804369e6295a76d)
 

Author SHA1 Message Date
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
feld 6c82b6e3bf Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
5 years ago
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop'
5 years ago
feld 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
5 years ago
rinpatch b8be6a4dc9 Remove a failing search test due to it being unrealistic
5 years ago
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
5 years ago
rinpatch 0a5175ecbb Order fts results by trigram
5 years ago
rinpatch c10ce113d4 User search: Remove trigram and refactor the module
5 years ago
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Alexander 8c0cfed825
some fixes
5 years ago
Alexander e7bb762ec2
don't stream in benchmark env
5 years ago
kPherox 5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
Ekaterina Vaartis fbe5a00475 For pleroma.emoji downloaded packs, generate pack.json instead
5 years ago
feld 3b1bc079af Merge branch 'exclude-visibilities-for-timelines' into 'develop'
5 years ago
rinpatch e0da0d4f9e Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
5 years ago
rinpatch 2f0ed5f6c4 Fix hiding branch name logic
5 years ago
rinpatch 8b39d6f93c Merge branch 'master-to-stable' into 'develop'
5 years ago
rinpatch 17b8896c40 Correct version parser branch name detection
5 years ago
rinpatch d1e969842d Add a changelog entry for branch-moving
5 years ago
rinpatch 58fea88564 Prepare pleroma_ctl for moving master to stable and relax the error
5 years ago
rinpatch 0e9243e8a2 Preparations for renaming `master` to `stable`
5 years ago
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop'
5 years ago
rinpatch 930cbd6d05 Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
5 years ago
rinpatch 9bdbf0811b Make MediaProxy failure tracking less brutal
5 years ago
Maxim Filippov 751513b6df This line either causes a warning, or a failed test
5 years ago
Maxim Filippov cc6875b582 Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
Haelwenn 44afe4c887 Merge branch 'pleroma-ctl-enchancements' into 'develop'
5 years ago
lain 422aa6befe Ostatus DeleteHandler: Fix for new option format.
5 years ago
lain cb8492962e SearchController: Fix test.
5 years ago
rinpatch b750135acd pleroma_ctl: Make it possible to specify branches/flavours when updating
5 years ago
lain 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain 9b963064eb Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
yalh76 fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
5 years ago
lain 29647dfd09 Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain ecd7ac855b Benchmark config: Don't use the sql sandbox.
5 years ago
lain b9b00e6e96 Gitlab CI: Run correct benchmark task.
5 years ago
lain 2629493804 Benchmark config: Database adjustments.
5 years ago
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain 02f8e2a8ab Gitlab: Run benchmark in CI.
5 years ago
kaniini 9fd5176c35 Merge branch 'unicode-search' into 'develop'
5 years ago
kaniini c9b3f0151b Merge branch 'webfinger-mocks' into 'develop'
5 years ago
Steven Fuchs dc6d20b68d provide mocks for webfinger endpoints
5 years ago
lain 1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
5 years ago