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

Commit Graph

  • 4dadb7c433 Merge branch 'user-query/filter-out-internal' into 'develop' lain 2020-09-23 11:51:04 +0000
  • 436d1a3c41 Merge branch 'develop' into 'issue/2115' lain 2020-09-23 11:49:19 +0000
  • 5e86a2809e
         transmogrifier: Drop incoming create early if it already exists Haelwenn (lanodan) Monnier 2020-09-23 11:45:32 +0200
  • 8f5589cf66 Merge develop Roman Chvanikov 2020-09-23 13:56:50 +0300
  • a5e1c400e4 Merge branch 'issue/1975' into 'develop' lain 2020-09-23 10:49:29 +0000
  • a6c14041c4 Merge branch 'develop' into 'issue/1975' lain 2020-09-23 09:16:00 +0000
  • 34235bc02a Merge branch 'email-fix-develop' into 'develop' lain 2020-09-23 09:05:52 +0000
  • 518c0f2962 Changelog: Add info about emoji zip import feature lain 2020-09-23 10:57:53 +0200
  • 9d6415de15 Changelog: Info about email fix. lain 2020-09-23 10:54:24 +0200
  • 8e4f043ac7 finland-emojis.zip -> emojis.zip Maksim Pechnikov 2020-09-22 21:58:30 +0300
  • 72d2b34d3b Merge branch 'develop' into issue/1975 Maksim Pechnikov 2020-09-22 21:42:10 +0300
  • 3104367931
         Merge remote-tracking branch 'upstream/develop' into email-fix-develop Alex Gleason 2020-09-22 13:37:02 -0500
  • 88653c01c9 Add test for check_activity_expiration_config/0 Mark Felder 2020-09-22 11:34:51 -0500
  • 7775b1540f Add deprecation warning test for check_hellthread_threshold/0 Mark Felder 2020-09-22 11:22:15 -0500
  • 25bdf0d0d9 Add test for welcome message format Mark Felder 2020-09-22 11:19:29 -0500
  • e2dcf039d2 Fix gun_pool_options deprecation warning message Mark Felder 2020-09-22 11:15:40 -0500
  • 2fc3b46ee7 Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1. Mark Felder 2020-09-22 11:13:36 -0500
  • df1eb5cf7e Changelog: Add info about chat pagination fix. lain 2020-09-22 17:17:19 +0200
  • c95859e45b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115 lain 2020-09-22 17:13:46 +0200
  • 0e0ece251a
         Filter out internal users by default Egor Kislitsyn 2020-09-22 16:55:40 +0400
  • 02f12ec625 Merge branch 'chore/missing-link' into 'develop' feld 2020-09-22 12:42:03 +0000
  • 3174804f3c Add FreeBSD and alpha sort Mark Felder 2020-09-22 07:26:31 -0500
  • ee3052a2d8 ActivityPub: Return Announces when filtering by `following`. lain 2020-09-22 14:20:19 +0200
  • e5927e92a6 Fix deprecation warning for welcome message Mark Felder 2020-09-21 17:08:49 -0500
  • d65e6e152a Merge branch 'docs/nginx-config-fedsockets' into 'develop' feld 2020-09-21 21:52:34 +0000
  • 8906f30ba1 Use an upstream for reverse proxy so future modifications are simplified Mark Felder 2020-09-21 16:19:08 -0500
  • 637ce939d9 Merge branch 'chore/autolinker-rename' into 'develop' feld 2020-09-21 21:19:02 +0000
  • ade7fede71 Most proxy settings can be global Mark Felder 2020-09-21 16:13:45 -0500
  • 2b553b8f8e Remove duplicate setting Mark Felder 2020-09-21 16:11:01 -0500
  • 75f6e5e8b7 Add FedSockets config Mark Felder 2020-09-21 16:10:31 -0500
  • a5c34e3123 Merge branch 'fix/fedsocket-useragent' into 'develop' feld 2020-09-21 21:06:32 +0000
  • bf181ca968
         Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response() Alex Gleason 2020-09-21 16:03:22 -0500
  • 7b2bf381e9 Chase the Autolinker rename from !2677 Mark Felder 2020-09-21 16:02:57 -0500
  • 0b728ccc44
         Pass hackney tls config into email tests, #2101 Alex Gleason 2020-09-21 15:05:46 -0500
  • 23d5d7cf59
         Fix #2172 HTTP error on password reset Alex Gleason 2020-09-21 13:56:40 -0500
  • 8b6ac45f3c
         Allow emails to be sent again, #2101 #2172 https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707 Alex Gleason 2020-09-21 13:28:02 -0500
  • 59680f27ff Merge branch 'bugfix/federator-actor-error' into 'develop' lain 2020-09-21 17:24:14 +0000
  • 9108e27c2f Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' lain 2020-09-21 17:15:54 +0000
  • b36b6259d8 Merge branch 'issue/2099' into 'develop' lain 2020-09-21 16:25:17 +0000
  • 994ce250c2 Merge branch '2161-block-changes' into 'develop' Haelwenn 2020-09-21 15:29:55 +0000
  • 8afdbcdb1c Force HTTP for fedsockets Mark Felder 2020-09-21 10:13:41 -0500
  • f2f0a0260f ActivityPub: Don't block-filter your own posts lain 2020-09-21 16:08:38 +0200
  • b0bd81ef71 Update CHANGELOG Roman Chvanikov 2020-09-20 20:58:32 +0300
  • 28d0986f83 Refactor mutes removing in CommonAPI and User Roman Chvanikov 2020-09-20 20:51:20 +0300
  • 4987ee6256 Merge branch 'develop' into feature/expire-mutes Roman Chvanikov 2020-09-20 19:27:27 +0300
  • 882c1fc6bd Merge branch 'weblate-pleroma-pleroma' into 'develop' lain 2020-09-20 15:23:15 +0000
  • f3c62b246d Translated using Weblate (Chinese (Simplified)) Kana 2020-09-20 13:19:21 +0000
  • d72970a1fc Added translation using Weblate (Chinese (Simplified)) Kana 2020-09-20 13:18:26 +0000
  • 402acce525 Merge branch 'fix/openapi-errors' into 'develop' rinpatch 2020-09-20 11:15:20 +0000
  • 60b025b782 [#2074] OAuth scope checking in Streaming API. Ivan Tashkinov 2020-09-19 19:16:55 +0300
  • 4b12e071ac OpenAPI: make it possible to generate a spec without starting the app rinpatch 2020-09-19 00:50:38 +0300
  • 51116b5392 OpenAPI: fix various errors pointed out by editor.swagger.io rinpatch 2020-09-19 00:50:00 +0300
  • 26859c549c Add user agent to fedsocket requests Mark Felder 2020-09-18 17:49:15 -0500
  • ed3bc53fa1 Merge branch 'develop' into issue/2099 Maksim Pechnikov 2020-09-18 22:13:05 +0300
  • 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop' feld 2020-09-18 18:38:20 +0000
  • 91ddd47e51 Merge branch 'fix/fedsocket-log-spam' into 'develop' lain 2020-09-18 13:30:41 +0000
  • 26c571df33 FedSockets: fix log spam on cached rejects rinpatch 2020-09-18 16:09:37 +0300
  • 7e02f4ed3b Merge branch 'feature/2118-web-push-encryption-http' into 'develop' lain 2020-09-18 12:25:10 +0000
  • 875b6654ec Merge branch 'websocket-data-fed' into 'develop' lain 2020-09-18 11:58:23 +0000
  • f2ef9735c5 Federate data through persistent websocket connections Steven Fuchs 2020-09-18 11:58:22 +0000
  • 2159daa9af update changelog Maksim Pechnikov 2020-09-18 07:09:53 +0300
  • 2ec0dcf001 Merge branch 'develop' into issue/2099 Maksim Pechnikov 2020-09-18 07:08:37 +0300
  • 226fa3e486
         Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Sergey Suprunenko 2020-09-17 22:04:47 +0200
  • 49584a9928 Merge branch 'stable-sync/2.1.2' into 'develop' rinpatch 2020-09-17 19:42:42 +0000
  • a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream Ivan Tashkinov 2020-09-17 22:22:59 +0300
  • 065a4dddfd Merge branch 'stable' into stable-sync/2.1.2 rinpatch 2020-09-17 22:19:49 +0300
  • a0f5e8b27e Merge branch 'release/2.1.2' into 'stable' rinpatch 2020-09-17 19:09:10 +0000
  • 7bf269fe83 Fix MRF reject for ChatMessage Haelwenn (lanodan) Monnier 2020-09-14 14:07:22 +0200
  • abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present Haelwenn (lanodan) Monnier 2020-09-12 12:05:36 +0200
  • 3a0f99ed35 KeywordPolicy: Still match when fields are absent Haelwenn (lanodan) Monnier 2020-09-14 13:52:13 +0200
  • 34afc2b074 pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d rinpatch 2020-09-17 21:00:13 +0300
  • b751c5babc CHANGELOG.md: Add 2.1.2 entry rinpatch 2020-09-17 20:40:52 +0300
  • beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop' Haelwenn 2020-09-17 17:59:38 +0000
  • 608824b97e Merge branch 'instance-docs' into 'develop' feld 2020-09-17 16:54:53 +0000
  • a5d6c9aa8e mix.exs: bump version to 2.1.2 rinpatch 2020-09-17 19:54:41 +0300
  • 6bbd65fb09 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' rinpatch 2020-09-10 18:38:48 +0000
  • 608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop' rinpatch 2020-09-10 18:40:54 +0000
  • 0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' Haelwenn 2020-09-15 08:25:10 +0000
  • bb70b231d0 Merge branch 'reply-visibility-user-guard' into 'develop' lain 2020-09-15 12:21:38 +0000
  • 22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop' rinpatch 2020-09-17 12:13:36 +0000
  • 9d77f4abf8 adapt to new user factory behavior stwf 2020-09-17 12:32:40 -0400
  • dfc621a529 add test and changelog entry stwf 2020-09-17 10:13:56 -0400
  • 41939e3175 User search respect discoverable flag stwf 2020-09-14 11:40:52 -0400
  • eff7f9892d Merge branch 'hotfix/rich-media-compile-error' into 'develop' rinpatch 2020-09-14 12:48:27 +0000
  • dee4639dbb Merge branch 'feat/rich-media-head' into 'develop' rinpatch 2020-09-14 12:38:00 +0000
  • 6b9bfc9e86 Merge branch 'fix/configdb-migration-with-deprecated' into 'develop' feld 2020-09-17 14:51:13 +0000
  • f7e40f7ef1 Deny ConfigDB migration when deprecated settings found Mark Felder 2020-09-17 09:32:50 -0500
  • 2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop' lain 2020-09-17 14:20:03 +0000
  • d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream Ivan Tashkinov 2020-09-17 17:14:20 +0300
  • 7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. Ivan Tashkinov 2020-09-17 17:13:40 +0300
  • cd93aa2aed Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop' rinpatch 2020-09-17 14:13:24 +0000
  • 7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata' lain 2020-09-17 14:09:01 +0000
  • db80b9d630 RichMedia: Fix log spam on failures and resetting TTL on cached errors rinpatch 2020-09-17 16:13:21 +0300
  • c711a2b157 Return the file content for `GET /api/pleroma/admin/instance_document/:document_name` eugenijm 2020-09-17 16:54:38 +0300
  • f58262c673 add description to changelog stwf 2020-09-17 09:48:17 -0400
  • 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API eugenijm 2020-08-30 15:15:14 +0300
  • 5426eb5997 Merge branch 'chat-moderation' into 'develop' lain 2020-09-17 11:56:30 +0000
  • 44e8b6037a Merge branch 'develop' into feature/expire-mutes Roman Chvanikov 2020-09-17 14:54:00 +0300
  • 5e3c70afa5 AdminAPI Chat tests: Remove factory. lain 2020-09-17 13:37:25 +0200
  • e39ff2616b Admin chat api tests: Small additions. lain 2020-09-17 13:29:26 +0200