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

Commit Graph

  • bf181ca968
         Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response() Alex Gleason 2020-09-21 16:03:22 -05:00
  • 7b2bf381e9 Chase the Autolinker rename from !2677 Mark Felder 2020-09-21 16:02:57 -05:00
  • 656741787e tmp rinpatch 2020-09-21 23:36:48 +03:00
  • 66d8d670e0 tmp rinpatch 2020-09-21 23:34:33 +03:00
  • 0b728ccc44
         Pass hackney tls config into email tests, #2101 Alex Gleason 2020-09-21 15:05:46 -05:00
  • d2eb48d97e tmp rinpatch 2020-09-21 23:21:47 +03:00
  • 5eaa7a0fe3 tmp rinpatch 2020-09-21 22:52:47 +03:00
  • 80b34a5967 tmp rinpatch 2020-09-21 22:49:37 +03:00
  • 23d5d7cf59
         Fix #2172 HTTP error on password reset Alex Gleason 2020-09-21 13:56:40 -05:00
  • 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 -05:00
  • 59680f27ff Merge branch 'bugfix/federator-actor-error' into 'develop' lain 2020-09-21 17:24:14 +00:00
  • 9108e27c2f Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' lain 2020-09-21 17:15:54 +00:00
  • b36b6259d8 Merge branch 'issue/2099' into 'develop' lain 2020-09-21 16:25:17 +00:00
  • 994ce250c2 Merge branch '2161-block-changes' into 'develop' Haelwenn 2020-09-21 15:29:55 +00:00
  • 8afdbcdb1c Force HTTP for fedsockets Mark Felder 2020-09-21 10:13:41 -05:00
  • f2f0a0260f ActivityPub: Don't block-filter your own posts lain 2020-09-21 16:08:38 +02:00
  • 909458b872 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-09-20 15:27:15 -05:00
  • b0bd81ef71 Update CHANGELOG Roman Chvanikov 2020-09-20 20:58:32 +03:00
  • 28d0986f83 Refactor mutes removing in CommonAPI and User Roman Chvanikov 2020-09-20 20:51:20 +03:00
  • 4987ee6256 Merge branch 'develop' into feature/expire-mutes Roman Chvanikov 2020-09-20 19:27:27 +03:00
  • 882c1fc6bd Merge branch 'weblate-pleroma-pleroma' into 'develop' lain 2020-09-20 15:23:15 +00:00
  • f3c62b246d Translated using Weblate (Chinese (Simplified)) Kana 2020-09-20 13:19:21 +00:00
  • d72970a1fc Added translation using Weblate (Chinese (Simplified)) Kana 2020-09-20 13:18:26 +00:00
  • cd139dbd86 tmp rinpatch 2020-09-20 14:15:34 +03:00
  • 402acce525 Merge branch 'fix/openapi-errors' into 'develop' rinpatch 2020-09-20 11:15:20 +00:00
  • 60b025b782 [#2074] OAuth scope checking in Streaming API. Ivan Tashkinov 2020-09-19 19:16:55 +03:00
  • fd99ed3347 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-09-19 10:51:01 -05:00
  • 4b12e071ac OpenAPI: make it possible to generate a spec without starting the app rinpatch 2020-09-19 00:50:38 +03:00
  • 51116b5392 OpenAPI: fix various errors pointed out by editor.swagger.io rinpatch 2020-09-19 00:50:00 +03:00
  • 26859c549c Add user agent to fedsocket requests Mark Felder 2020-09-18 17:49:15 -05:00
  • 3cd9ded474 tmp: fetch_registry simplify rinpatch 2020-09-19 09:30:34 +03:00
  • ed3bc53fa1 Merge branch 'develop' into issue/2099 Maksim Pechnikov 2020-09-18 22:13:05 +03:00
  • 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop' feld 2020-09-18 18:38:20 +00:00
  • fff0d63921 docs: API: api_extending_guideline: wording Alibek Omarov 2020-09-18 18:35:50 +00:00
  • c1971cb4b1 docs: API: add client API extension guideline Alibek Omarov 2020-09-18 17:03:37 +00:00
  • 9cd99bcfac Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-09-18 10:25:09 -05:00
  • 91ddd47e51 Merge branch 'fix/fedsocket-log-spam' into 'develop' lain 2020-09-18 13:30:41 +00:00
  • 26c571df33 FedSockets: fix log spam on cached rejects rinpatch 2020-09-18 16:09:37 +03:00
  • 7e02f4ed3b Merge branch 'feature/2118-web-push-encryption-http' into 'develop' lain 2020-09-18 12:25:10 +00:00
  • 875b6654ec Merge branch 'websocket-data-fed' into 'develop' lain 2020-09-18 11:58:23 +00:00
  • f2ef9735c5 Federate data through persistent websocket connections Steven Fuchs 2020-09-18 11:58:22 +00:00
  • 2159daa9af update changelog Maksim Pechnikov 2020-09-18 07:09:53 +03:00
  • 2ec0dcf001 Merge branch 'develop' into issue/2099 Maksim Pechnikov 2020-09-18 07:08:37 +03:00
  • f316a94c38 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-09-17 16:32:52 -05:00
  • 226fa3e486
         Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Sergey Suprunenko 2020-09-17 22:04:47 +02:00
  • 49584a9928 Merge branch 'stable-sync/2.1.2' into 'develop' rinpatch 2020-09-17 19:42:42 +00:00
  • a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream Ivan Tashkinov 2020-09-17 22:22:59 +03:00
  • 065a4dddfd Merge branch 'stable' into stable-sync/2.1.2 rinpatch 2020-09-17 22:19:49 +03:00
  • a0f5e8b27e Merge branch 'release/2.1.2' into 'stable' v2.1.2 rinpatch 2020-09-17 19:09:10 +00:00
  • 7bf269fe83 Fix MRF reject for ChatMessage Haelwenn (lanodan) Monnier 2020-09-14 14:07:22 +02:00
  • abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present Haelwenn (lanodan) Monnier 2020-09-12 12:05:36 +02:00
  • 3a0f99ed35 KeywordPolicy: Still match when fields are absent Haelwenn (lanodan) Monnier 2020-09-14 13:52:13 +02:00
  • 34afc2b074 pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d rinpatch 2020-09-17 21:00:13 +03:00
  • b751c5babc CHANGELOG.md: Add 2.1.2 entry rinpatch 2020-09-17 20:40:52 +03:00
  • beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop' Haelwenn 2020-09-17 17:59:38 +00:00
  • 608824b97e Merge branch 'instance-docs' into 'develop' feld 2020-09-17 16:54:53 +00:00
  • a5d6c9aa8e mix.exs: bump version to 2.1.2 rinpatch 2020-09-17 19:54:41 +03:00
  • 6bbd65fb09 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' rinpatch 2020-09-10 18:38:48 +00:00
  • 608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop' rinpatch 2020-09-10 18:40:54 +00:00
  • 0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' Haelwenn 2020-09-15 08:25:10 +00:00
  • bb70b231d0 Merge branch 'reply-visibility-user-guard' into 'develop' lain 2020-09-15 12:21:38 +00:00
  • 22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop' rinpatch 2020-09-17 12:13:36 +00:00
  • 9d77f4abf8 adapt to new user factory behavior stwf 2020-09-17 12:32:40 -04:00
  • dfc621a529 add test and changelog entry stwf 2020-09-17 10:13:56 -04:00
  • 41939e3175 User search respect discoverable flag stwf 2020-09-14 11:40:52 -04:00
  • eff7f9892d Merge branch 'hotfix/rich-media-compile-error' into 'develop' rinpatch 2020-09-14 12:48:27 +00:00
  • dee4639dbb Merge branch 'feat/rich-media-head' into 'develop' rinpatch 2020-09-14 12:38:00 +00:00
  • 6b9bfc9e86 Merge branch 'fix/configdb-migration-with-deprecated' into 'develop' feld 2020-09-17 14:51:13 +00:00
  • f7e40f7ef1 Deny ConfigDB migration when deprecated settings found Mark Felder 2020-09-17 09:32:50 -05:00
  • 2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop' lain 2020-09-17 14:20:03 +00:00
  • d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream Ivan Tashkinov 2020-09-17 17:14:20 +03:00
  • 7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. Ivan Tashkinov 2020-09-17 17:13:40 +03:00
  • cd93aa2aed Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop' rinpatch 2020-09-17 14:13:24 +00:00
  • 7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata' lain 2020-09-17 14:09:01 +00:00
  • db80b9d630 RichMedia: Fix log spam on failures and resetting TTL on cached errors rinpatch 2020-09-17 16:13:21 +03:00
  • c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name eugenijm 2020-09-17 16:54:38 +03:00
  • f58262c673 add description to changelog stwf 2020-09-17 09:48:17 -04:00
  • 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API eugenijm 2020-08-30 15:15:14 +03:00
  • 5426eb5997 Merge branch 'chat-moderation' into 'develop' lain 2020-09-17 11:56:30 +00:00
  • 44e8b6037a Merge branch 'develop' into feature/expire-mutes Roman Chvanikov 2020-09-17 14:54:00 +03:00
  • 5e3c70afa5 AdminAPI Chat tests: Remove factory. lain 2020-09-17 13:37:25 +02:00
  • e39ff2616b Admin chat api tests: Small additions. lain 2020-09-17 13:29:26 +02:00
  • 7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation lain 2020-09-17 13:26:04 +02:00
  • 5a8ea0a5b0 small refactoring Maksim Pechnikov 2020-09-17 09:13:43 +03:00
  • b867f9d7ae Merge branch 'develop' into issue/2099 Maksim Pechnikov 2020-09-17 08:41:35 +03:00
  • a781f41f96 [#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring. Ivan Tashkinov 2020-09-16 22:30:42 +03:00
  • c5acbf8a1b Merge branch 'chore/unused-import' into 'develop' feld 2020-09-16 16:12:22 +00:00
  • 73e0e6a8a2 Remove unused import Mark Felder 2020-09-16 10:56:42 -05:00
  • 3a9baa9d0d Merge branch '2144-empty-users' into 'develop' rinpatch 2020-09-16 15:47:07 +00:00
  • 7a88b726bf User: Remote users don't need to be confirmed or approved lain 2020-09-16 17:29:16 +02:00
  • a4f80e1e74 Merge branch 'feat/connection-worker-monitor-flush' into 'develop' rinpatch 2020-09-16 15:10:20 +00:00
  • adb1b0282d ConnectionPool Worker: use monitor flush instead of checking ref rinpatch 2020-09-16 17:23:05 +03:00
  • eca8d26784 Merge branch 'chores/mrf-loglevel' into 'develop' rinpatch 2020-09-16 13:37:04 +00:00
  • adbd0032fa Merge branch 'features/validators-video' into 'develop' rinpatch 2020-09-16 13:36:27 +00:00
  • 6b088ed76a Merge branch 'issue/2089' into 'develop' lain 2020-09-16 12:22:48 +00:00
  • 599f8bb152 RepoStreamer.chunk_stream -> Repo.chunk_stream Maksim Pechnikov 2020-09-16 09:47:18 +03:00
  • c74fad9e06 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-09-16 03:18:50 +00:00
  • 2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream Ivan Tashkinov 2020-09-15 20:29:39 +03:00
  • f879d07fa1 fixed tests Maksim Pechnikov 2020-09-15 15:32:49 +03:00
  • cfad4f46b2 Merge branch 'reply-visibility-user-guard' into 'develop' lain 2020-09-15 12:21:38 +00:00