alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-02 10:43:13 +0200
  • 19f468c5bc
         replies filtering for blocked domains Alexander Strizhakov 2020-06-02 08:50:24 +0300
  • 6fb900a496 Merge branch 'user-updates' into 'develop' rinpatch 2020-06-01 20:48:11 +0000
  • d67b8a96c7 Merge branch 'only-creates-in-public-tl' into 'develop' rinpatch 2020-06-01 20:45:59 +0000
  • 7e6ec778d9
         exclude replies on blocked domains Alexander Strizhakov 2020-05-20 17:45:06 +0300
  • 6b84c62d4a
         Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts Egor Kislitsyn 2020-06-01 17:38:57 +0400
  • fa37bfff99 Merge branch 'default-to-hackney-again' into 'develop' lain 2020-06-01 13:24:03 +0000
  • af9090238e CommonAPI: Newlines -> br for chat messages. lain 2020-06-01 15:14:22 +0200
  • a7627bdc7a
         Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-06-01 15:48:51 +0400
  • ac31f687c0 Config: Default to Hackney again lain 2020-06-01 13:35:39 +0200
  • 8ff3425828 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-06-01 13:34:13 +0200
  • d4d4b92f75 TimelineController: Only return `Create` in public timelines. lain 2020-06-01 13:17:56 +0200
  • 9460983032 AccountController: Federate user account changes. lain 2020-06-01 13:03:22 +0200
  • 954acdda20
         Add `account_activation_required` to /api/v1/instance Alex Gleason 2020-05-29 15:16:44 -0500
  • e96765df6b Merge branch 'chore/bump-hackney' into 'develop' Haelwenn 2020-05-30 15:51:19 +0000
  • beeeed5b58 Merge branch 'test/fix-config-setting-in-user-test' into 'develop' lain 2020-05-30 14:03:43 +0000
  • b973d0b2f0 Fix config setting to not affect other tests Roman Chvanikov 2020-05-30 16:47:09 +0300
  • 0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts rinpatch 2020-05-30 13:59:04 +0300
  • 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-30 12:31:12 +0200
  • 8bdf18d7c1 CommonAPI: Linkify chat messages. lain 2020-05-30 12:30:31 +0200
  • 2c9465cc51 SafeText: Let through basic html. lain 2020-05-30 12:17:18 +0200
  • b004c427a0 Merge branch 'conversation-pagination' into 'develop' lain 2020-05-30 10:02:37 +0000
  • 6d4b80822b Conversation pagination Steven Fuchs 2020-05-30 10:02:37 +0000
  • 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test. Ivan Tashkinov 2020-05-30 10:29:08 +0300
  • 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results Ivan Tashkinov 2020-05-30 08:51:38 +0300
  • d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop' rinpatch 2020-05-29 21:23:49 +0000
  • 32ba2b7f9f Merge branch 'media-docs' into 'develop' rinpatch 2020-05-29 21:20:36 +0000
  • d2a1975e56 mix.lock: update hackney to 1.16.0 rinpatch 2020-05-30 00:18:17 +0300
  • 109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex rinpatch 2020-05-29 21:15:07 +0000
  • f361264e1a Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop' lain 2020-05-29 20:31:07 +0000
  • 0a83af330b fix unused var warning Roman Chvanikov 2020-05-29 23:05:03 +0300
  • 660d49227b Merge branch 'connect-src' into 'develop' rinpatch 2020-05-29 19:26:54 +0000
  • c181e555db [#1794] Improvements to hashtags extraction from search query. Ivan Tashkinov 2020-05-29 22:03:14 +0300
  • d67b302810 preload data into index.html stwf 2020-05-12 11:08:00 -0400
  • d38f28870e
         Add blob: to connect-src CSP Alex Gleason 2020-05-29 10:33:31 -0500
  • 219d2b3146 Merge branch 'fix-streaming' into 'develop' lain 2020-05-29 15:42:43 +0000
  • 81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop' feld 2020-05-29 15:33:35 +0000
  • 9ca978494f
         Add test for stream boosts of mastodon user kPherox 2020-05-29 21:08:09 +0900
  • de0e262839
         Fix argument error in streamer kPherox 2020-05-25 23:21:43 +0900
  • da1e31fae3
         http_security_plug.ex: Fix non-proxied media Haelwenn (lanodan) Monnier 2020-05-29 17:17:02 +0200
  • 1b586ff3ae Document new database vacuum tasks Mark Felder 2020-05-29 10:17:06 -0500
  • a43b435c0a
         AP C2S: allow limit & order on outbox & read_inbox Haelwenn (lanodan) Monnier 2020-05-08 03:05:56 +0200
  • 2c18830d0d
         Bugfix: router: allow basic_auth for outbox Haelwenn (lanodan) Monnier 2020-05-08 03:08:11 +0200
  • b3b367b894
         Bugfix: Reuse Controller.Helper pagination for APC2S Haelwenn (lanodan) Monnier 2020-05-07 21:52:45 +0200
  • 32431ad1ee Docs: Also add the streaming docs to the Chat api doc. lain 2020-05-29 16:07:40 +0200
  • 3898dd69a6 SideEffects: Ensure a chat is present before streaming something out. lain 2020-05-29 16:05:02 +0200
  • b08baf905b Docs: Document streaming differences lain 2020-05-29 16:03:55 +0200
  • 767ce8b803 StreamerView: Actually send Chats, not ChatMessages. lain 2020-05-29 16:02:45 +0200
  • 863c02b25d SideEffects: Stream out chat messages. lain 2020-05-29 15:44:03 +0200
  • c86a88edec Streamer: Add a chat message stream. lain 2020-05-29 15:24:41 +0200
  • 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop' lain 2020-05-29 10:42:49 +0000
  • af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-29 12:36:17 +0200
  • 228ff3760e
         Use `User.is_internal_user?` instead kPherox 2020-05-27 05:24:36 +0000
  • 9df5b1e6ae
         Don't make relay announce notification kPherox 2020-05-26 11:32:05 +0000
  • 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' rinpatch 2020-05-29 09:46:31 +0000
  • 27180611df HTTP Security plug: make starting csp string generation more readable rinpatch 2020-05-29 12:32:48 +0300
  • 394258d548
         Docs: Attachement limitations in MastoAPI differences Alex Gleason 2020-05-28 16:10:06 -0500
  • d4b20c96c4 Migrate old notification settings to new variants Mark Felder 2020-05-28 15:34:11 -0500
  • 06f20e9181
         Add OpenApi spec to AdminAPI.ConfigController Egor Kislitsyn 2020-05-28 23:11:12 +0400
  • d1ee3527ef
         Move config actions to AdminAPI.ConfigController Egor Kislitsyn 2020-05-28 22:23:15 +0400
  • 4c82f657c5 Formatting Mark Felder 2020-05-28 13:22:28 -0500
  • 1d30608e20 Merge branch 'fix/1557-gets-local-pack' into 'develop' lain 2020-05-28 17:08:30 +0000
  • f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop' lain 2020-05-28 16:58:28 +0000
  • d4a18d44fe
         Update default instance description Alex Gleason 2020-05-28 00:49:49 -0500
  • ddbf7084e2 Merge branch 'update-install-guides' into 'develop' lain 2020-05-28 16:54:09 +0000
  • ae05792d2a
         get-packs for local generated pack Alexander Strizhakov 2020-05-28 19:41:34 +0300
  • 800e624058
         Update installation guides Egor Kislitsyn 2020-05-28 19:32:56 +0400
  • 9eea800026 Refactor notification settings Mark Felder 2020-05-28 10:16:09 -0500
  • 089d72d2e6 Merge branch 'chore/fix-spelling' into 'develop' rinpatch 2020-05-28 11:38:35 +0000
  • 92fba24c74 Alpha sort Mark Felder 2020-05-27 17:17:06 -0500
  • 30f96b19c1 Abstract out the database maintenance. I'd like to use this from AdminFE too. Mark Felder 2020-05-27 16:40:51 -0500
  • 0d57e06626 Make clearer that this is time and resource consuming Mark Felder 2020-05-27 16:31:37 -0500
  • 73ca57e4f1 Make it obvious a full vacuum can take a while Mark Felder 2020-05-27 16:27:29 -0500
  • a2f57bd82b Permit easy access to vaccum full and analyze via a mix task Mark Felder 2020-05-27 16:27:07 -0500
  • 95f6240889 Fix minor spelling error Mark Felder 2020-05-27 14:34:37 -0500
  • a23df89b5d Merge branch 'bundle/adminfe-20200527' into 'develop' rinpatch 2020-05-27 19:22:53 +0000
  • d28b9708d2 Update AdminFE build, re-enables emoji packs Mark Felder 2020-05-27 13:50:24 -0500
  • 29ff6d414b HTTP security plug: Harden img-src and media-src when MediaProxy is enabled rinpatch 2020-05-27 21:01:36 +0300
  • 455a402c8a HTTP Security plug: rewrite &csp_string/0 rinpatch 2020-05-27 20:27:30 +0300
  • 8f6d428880 AccountView: Use mediaproxy URLs for emojis rinpatch 2020-05-27 19:35:35 +0300
  • 78c46fb7ba MediaProxy test: use config macros instead of directly putting values rinpatch 2020-05-27 19:34:56 +0300
  • 48fd9be65a
         Exclude post actor from to of relay announce kPherox 2020-05-26 09:47:03 +0000
  • d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' rinpatch 2020-05-27 14:17:12 +0000
  • 91f73a7592 Merge branch 'notification-fixes' into 'develop' rinpatch 2020-05-27 13:45:14 +0000
  • 73f222d76a Migrations: Make user_id index on notifications better for query. lain 2020-05-27 12:56:15 +0200
  • 047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex Alexander Strizhakov 2020-05-27 10:55:42 +0000
  • c6290be682
         Fix typo Egor Kislitsyn 2020-05-27 14:42:21 +0400
  • b8e029b5ea Notification: Actually preload objects. lain 2020-05-27 12:41:06 +0200
  • b9e2678b9e Merge branch 'fav-speedup' into 'develop' lain 2020-05-27 08:02:00 +0000
  • 7e13200869 ActivityPub: Change ordering to `nulls last` in favorites query lain 2020-05-27 09:46:12 +0200
  • 3249141588
         validate actor type Alexander Strizhakov 2020-05-27 09:42:28 +0300
  • cf139b06a3 Merge branch 'fav-speedup' into 'develop' rinpatch 2020-05-26 16:33:13 +0000
  • 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop' rinpatch 2020-05-26 15:57:01 +0000
  • 5ad28ff405 Merge branch 'apps-index' into 'develop' rinpatch 2020-05-26 15:56:23 +0000
  • ed08da9135 Merge branch '1813-throttling' into 'develop' rinpatch 2020-05-26 15:55:09 +0000
  • d8d99fd4cf Activity.Queries: Use correct actor restriction. lain 2020-05-26 17:46:16 +0200
  • acba7043be Migrations: Add index on client_id and client_secret for apps. lain 2020-05-26 16:46:57 +0200
  • 5083558ecd Merge branch 'restore-new-image' into 'develop' lain 2020-05-26 14:17:54 +0000
  • 337ca33e5e Config: Restore old new background image lain 2020-05-26 16:00:56 +0200
  • b233c8e55c Merge branch 'fix/oban-warnings' into 'develop' lain 2020-05-26 12:41:46 +0000