Commit graph

  • 7a00acb3e4 Order fts results by trigram rinpatch 2019-10-16 13:49:33 +0300
  • 713b2187b9 User search: Remove trigram and refactor the module rinpatch 2019-10-16 12:52:47 +0300
  • 4123c9db07 Bump the version in mix.exs rinpatch 2019-10-18 14:53:13 +0300
  • deee9f3196 Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1' rinpatch 2019-10-18 11:49:27 +0000
  • 41c47639e3 Add a changelog entry for yet another jsonb_set data loss rinpatch 2019-10-18 14:40:47 +0300
  • 724f611b0e Merge branch 'cleanup/deprecated_config_upload' into 'develop' rinpatch 2019-10-18 11:34:48 +0000
  • 98c9affc48 Add a test for safe_jsonb_set rinpatch 2019-10-18 14:33:51 +0300
  • a1c4a5d7cf Fix a migration wiping user info of users that don't have any mutes rinpatch 2019-10-18 14:11:30 +0300
  • 15bbc34c07 Tests: Capture log. lain 2019-10-18 12:44:53 +0200
  • 3c6fd0bb99
    upload.ex: Remove deprecated configuration Haelwenn (lanodan) Monnier 2019-10-18 12:29:42 +0200
  • 4ec299ea9c CommonAPI tests: Capture logs. lain 2019-10-18 12:11:25 +0200
  • 2473702be2 Merge branch 'develop' into feature/relay-list Maxim Filippov 2019-10-18 10:24:29 +0200
  • 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop' kaniini 2019-10-18 04:42:02 +0000
  • 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex kaniini 2019-10-18 04:36:37 +0000
  • 6c82b6e3bf Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop' feld 2019-10-17 20:05:01 +0000
  • 203d61b950 Transmogrifier: Make proper use of the LikeValidator. lain 2019-10-17 19:35:31 +0200
  • 66452f518f ObjectValidator: Rewrite LikeValidator with Ecto. lain 2019-10-17 18:36:52 +0200
  • 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message eugenijm 2019-10-17 15:25:15 +0300
  • 66b5d0ff55 add Markers /api/v1/markers Maksim Pechnikov 2019-10-17 15:26:59 +0300
  • 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. Ivan Tashkinov 2019-10-16 21:59:21 +0300
  • 081e8206ab Transmogrifier: Use new ingestion pipeline for Likes. lain 2019-10-16 17:03:21 +0200
  • 6e4f52f8a2 Introduce new ingestion pipeline structure, implement internal Likes with it. lain 2019-10-16 16:16:39 +0200
  • 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop' lain 2019-10-16 12:29:08 +0000
  • 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop' feld 2019-10-16 12:14:47 +0000
  • 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) rinpatch 2019-10-16 15:09:39 +0300
  • 6977cddff9 Merge branch 'benchmark-finishing' into 'develop' lain 2019-10-16 11:54:49 +0000
  • 0a5175ecbb Order fts results by trigram rinpatch 2019-10-16 13:49:33 +0300
  • c10ce113d4 User search: Remove trigram and refactor the module rinpatch 2019-10-16 12:52:47 +0300
  • da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array Maxim Filippov 2019-10-15 17:33:29 +0200
  • 90d516d42b Store status data inside flag activity Maxim Filippov 2019-10-15 16:52:41 +0200
  • 8c0cfed825
    some fixes Alexander 2019-10-15 16:26:04 +0300
  • e7bb762ec2
    don't stream in benchmark env Alexander 2019-10-15 15:16:17 +0300
  • 5bd0717de2
    Add Sec-WebSocket-Protocol to response header kPherox 2019-10-15 19:10:22 +0900
  • fbe5a00475 For pleroma.emoji downloaded packs, generate pack.json instead Ekaterina Vaartis 2019-09-30 16:04:30 +0300
  • 3b1bc079af Merge branch 'exclude-visibilities-for-timelines' into 'develop' feld 2019-10-14 19:40:40 +0000
  • e0da0d4f9e Merge branch 'backport/develop-branch-hiding-fix' into 'develop' rinpatch 2019-10-14 19:17:06 +0000
  • 2f0ed5f6c4 Fix hiding branch name logic rinpatch 2019-10-14 22:13:18 +0300
  • c00797d08e Merge branch 'fix/version-branch-skip' into 'stable' rinpatch 2019-10-14 19:14:47 +0000
  • 0733da3205 Fix hiding branch name logic rinpatch 2019-10-14 22:13:18 +0300
  • 988654a720 Merge branch 'stable-fix-docs' into 'stable' rinpatch 2019-10-14 18:55:09 +0000
  • dd859e6847 Fix documentation deploy for stable rinpatch 2019-10-14 21:53:01 +0300
  • 442acb31ac Fix pleroma_ctl link rinpatch 2019-10-14 21:27:59 +0300
  • 832d892c2c Merge branch 'final-release-prep' into 'maint/1.1' rinpatch 2019-10-14 18:21:49 +0000
  • 8ef4afcc3b Final 1.1 release preparations rinpatch 2019-10-14 21:19:19 +0300
  • 13966f1504 Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1' rinpatch 2019-10-14 16:47:27 +0000
  • 2b6cd10b68 Correct version parser branch name detection rinpatch 2019-10-14 18:45:16 +0300
  • 164f42c5f8 Add a changelog entry for branch-moving rinpatch 2019-10-14 18:42:30 +0300
  • bbe409c914 Prepare pleroma_ctl for moving master to stable and relax the error message rinpatch 2019-10-14 18:39:56 +0300
  • 3d3c166e59 Preparations for renaming master to stable rinpatch 2019-10-14 18:38:51 +0300
  • 8b39d6f93c Merge branch 'master-to-stable' into 'develop' rinpatch 2019-10-14 16:08:53 +0000
  • 17b8896c40 Correct version parser branch name detection rinpatch 2019-10-14 18:45:16 +0300
  • d1e969842d Add a changelog entry for branch-moving rinpatch 2019-10-14 18:42:30 +0300
  • 58fea88564 Prepare pleroma_ctl for moving master to stable and relax the error message rinpatch 2019-10-14 18:39:56 +0300
  • 0e9243e8a2 Preparations for renaming master to stable rinpatch 2019-10-14 18:38:51 +0300
  • 8ad015ef64
    Skip deactivated users in followers import Egor Kislitsyn 2019-10-14 14:16:57 +0700
  • 1d46944fbd
    Do not add follower_address to following for non local users Egor Kislitsyn 2019-10-14 13:50:43 +0700
  • a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints eugenijm 2019-10-08 23:05:57 +0300
  • e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop' lain 2019-10-13 15:37:49 +0000
  • 1f99abbeba Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1' rinpatch 2019-10-12 14:54:49 +0000
  • a8afbe977a Merge branch 'fix/mediaproxy-too-brutal' into 'develop' rinpatch 2019-10-12 14:42:55 +0000
  • 930cbd6d05 Merge branch 'fix/mediaproxy-too-brutal' into 'develop' rinpatch 2019-10-12 14:42:55 +0000
  • 9bdbf0811b Make MediaProxy failure tracking less brutal rinpatch 2019-10-11 22:52:38 +0300
  • d9410c488a Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1' rinpatch 2019-10-11 19:39:37 +0000
  • 751513b6df This line either causes a warning, or a failed test Maxim Filippov 2019-10-11 19:31:00 +0300
  • cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays Maxim Filippov 2019-10-11 19:12:29 +0300
  • c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions Maxim Filippov 2019-10-11 15:59:35 +0300
  • aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it Maxim Filippov 2019-10-11 15:58:45 +0300
  • fbbb032bc5 Merge branch 'pleroma-ctl-enchancements' into 'develop' Haelwenn 2019-10-11 10:56:45 +0000
  • 44afe4c887 Merge branch 'pleroma-ctl-enchancements' into 'develop' Haelwenn 2019-10-11 10:56:45 +0000
  • 422aa6befe Ostatus DeleteHandler: Fix for new option format. lain 2019-10-11 12:53:09 +0200
  • cb8492962e SearchController: Fix test. lain 2019-10-11 12:41:44 +0200
  • b750135acd pleroma_ctl: Make it possible to specify branches/flavours when updating rinpatch 2019-10-11 13:22:21 +0300
  • 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. lain 2019-10-11 11:48:58 +0200
  • 9b963064eb Transmogrifier: Actually store who deleted a note. lain 2019-10-11 11:25:45 +0200
  • f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it Maxim Filippov 2019-10-11 00:24:31 +0300
  • fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289 yalh76 2019-10-10 20:05:54 +0000
  • 059005ff82
    Replace user.following with Pleroma.FollowingRelationship Egor Kislitsyn 2019-10-11 02:35:32 +0700
  • 29647dfd09 Transmogrifier: Save correct ids for incoming deletes. lain 2019-10-10 17:17:33 +0200
  • 2c7ff32e5b
    Add thread_visibility to migrations Egor Kislitsyn 2019-10-10 21:11:34 +0700
  • ecd7ac855b Benchmark config: Don't use the sql sandbox. lain 2019-10-10 15:42:54 +0200
  • b9b00e6e96 Gitlab CI: Run correct benchmark task. lain 2019-10-10 15:31:32 +0200
  • 2629493804 Benchmark config: Database adjustments. lain 2019-10-10 15:01:06 +0200
  • c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing lain 2019-10-10 14:40:59 +0200
  • d7f9679ff2 Merge branch 'develop' into 'reactions' lain 2019-10-10 12:38:51 +0000
  • 02f8e2a8ab Gitlab: Run benchmark in CI. lain 2019-10-10 14:24:54 +0200
  • 58f9ce0deb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-10 10:28:16 +0100
  • 24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-10-10 03:33:55 +0300
  • 9fd5176c35 Merge branch 'unicode-search' into 'develop' kaniini 2019-10-09 16:33:05 +0000
  • c9b3f0151b Merge branch 'webfinger-mocks' into 'develop' kaniini 2019-10-09 16:32:28 +0000
  • dc6d20b68d provide mocks for webfinger endpoints Steven Fuchs 2019-10-09 16:32:28 +0000
  • 1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' lain 2019-10-09 15:10:08 +0000
  • f64dfd317f Merge branch 'feature/count-statuses-task' into 'develop' lain 2019-10-09 14:11:23 +0000
  • ad42837244 Ability to toggle activation status and permission group for a group of users Maxim Filippov 2019-10-09 17:03:54 +0300
  • c1bae01376 Search: Add tests for unicode searches. lain 2019-10-09 16:03:45 +0200
  • d537bfd4e1
    Add a task to re-count statuses for all users Egor Kislitsyn 2019-10-09 13:11:57 +0700
  • 580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) eugenijm 2019-10-09 06:51:14 +0300
  • 761ad0b48e
    Split CreateFollowingRelationships to multiple migrations Egor Kislitsyn 2019-10-08 20:27:42 +0700
  • 6291eaa590 Update CreateFollowingRelationships Egor Kislitsyn 2019-10-08 13:06:48 +0700
  • 6355694309 Merge branch 'chore/format-migrations' into 'develop' rinpatch 2019-10-08 12:28:10 +0000
  • 32808208be Enable mix format for migrations rinpatch 2019-10-08 15:16:39 +0300