Commit Graph

  • 4a2d7a7a5d
    Merge remote-tracking branch 'origin/develop' into feature/account-export Egor Kislitsyn 2020-10-28 15:33:36 +04:00
  • 4f90077767
    Fix warning Egor Kislitsyn 2020-10-28 15:32:44 +04:00
  • 1204aaa2e3 Merge branch 'feature/autofollowing' into 'develop' feld 2020-10-27 22:55:31 +00:00
  • d8d4bd15d0 Merge branch '2236-no-name' into 'develop' Haelwenn 2020-10-27 22:44:31 +00:00
  • 03a318af9a Merge branch 'develop' into 'feature/autofollowing' feld 2020-10-27 22:13:50 +00:00
  • f2b74f60f0 Merge branch 'develop' into feature/account-export Mark Felder 2020-10-27 15:16:22 -05:00
  • 7d31122781 Merge branch 'fix/prometheus-test' into 'develop' feld 2020-10-27 20:05:09 +00:00
  • d28f72a55a FrontStatic plug: excluded invalid url Maksim Pechnikov 2020-10-27 22:58:55 +03:00
  • cbe41408e4 phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+ Mark Felder 2020-10-27 14:37:48 -05:00
  • 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope' minibikini 2020-10-27 18:59:19 +00:00
  • 291189357b Merge branch 'develop' into feature/account-export Mark Felder 2020-10-27 12:54:33 -05:00
  • 9e54ef086b Merge branch 'develop' into feature/account-export Mark Felder 2020-10-27 12:51:31 -05:00
  • 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop' feld 2020-10-27 17:47:56 +00:00
  • e062329a17 Merge branch 'develop' into 'feature/autofollowing' feld 2020-10-27 17:42:24 +00:00
  • 03e306785b
    Add an API endpoint to install a new frontend Egor Kislitsyn 2020-10-27 19:20:04 +04:00
  • 04b7505c75 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior lain 2020-10-26 17:50:34 +01:00
  • 2f7401806b Merge branch 'docs/clients-apc2s' into 'develop' lain 2020-10-26 15:59:10 +00:00
  • de6d49c8ce ActivityPub: Add back debug call + explanation. lain 2020-10-26 16:33:26 +01:00
  • 9542c5d0f4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name lain 2020-10-26 16:30:48 +01:00
  • e6dab6513d Merge branch 'patch-1' into 'develop' rinpatch 2020-10-26 11:33:16 +00:00
  • 1de4ff8b4d
    clients.md: Add AndStatus, note supported protocols Haelwenn (lanodan) Monnier 2020-10-26 03:23:47 +01:00
  • 073ad7e6d9 Merge branch 'docs/ap_c2s' into 'develop' Haelwenn 2020-10-26 02:09:20 +00:00
  • ac692ff3e9 Fix link reference Kana 2020-10-25 08:28:17 +00:00
  • 2fd384e0a2 Merge branch 'fix/sendmail' into 'develop' Haelwenn 2020-10-23 23:29:17 +00:00
  • e7b0840b88 NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries Mark Felder 2020-10-23 15:32:32 -05:00
  • df61071422 Merge branch '2242-nsfw-case' into 'develop' rinpatch 2020-10-23 19:39:42 +00:00
  • 0ab917ec6f Return maps in node_info Ilja 2020-10-23 20:27:13 +02:00
  • a999e8b0b7 Changelog: Add info about whitespace name remote users. lain 2020-10-23 13:55:08 +02:00
  • 60e379ce0b User: Correctly handle whitespace names. lain 2020-10-23 13:53:01 +02:00
  • 682f0aa259 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2061-chat-deletion lain 2020-10-23 13:25:41 +02:00
  • 3ca8feb246 fix merge conflict Ilja 2020-10-23 11:11:51 +02:00
  • 096e4518ad Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2020-10-22 22:26:47 +00:00
  • bd033aba48 Translated using Weblate (Chinese (Simplified)) shironeko 2020-10-22 08:59:44 +00:00
  • d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop' feld 2020-10-22 20:33:52 +00:00
  • 14900164b8 [#3059] Used forked prometheus-phx to remove log spam. Ivan Tashkinov 2020-10-22 17:58:25 +03:00
  • 8a68673eed [#3059] Formatting fix. Ivan Tashkinov 2020-10-22 14:07:33 +03:00
  • d031b185e2 Merge branch '2257-self-chat' into 'develop' rinpatch 2020-10-22 10:56:17 +00:00
  • 8a55de1d78 [#3059] Fixed Phoenix 1.5 telemetry processing. Ivan Tashkinov 2020-10-22 13:54:15 +03:00
  • 3fdc2a0d1e Changelog: Add information about self-chats lain 2020-10-22 12:23:07 +02:00
  • 8d251096fe SideEffects: Correctly handle chat messages sent to yourself lain 2020-10-22 12:22:08 +02:00
  • ef627b9391 fix module name Maksim Pechnikov 2020-10-22 12:04:23 +03:00
  • add26817e3 update changelog Maksim Pechnikov 2020-09-25 16:50:47 +03:00
  • 51189ad365 update docs Maksim Pechnikov 2020-09-25 16:40:50 +03:00
  • 44e5a57d1a admin api: added user filters by actor_types Maksim Pechnikov 2020-09-25 16:37:55 +03:00
  • 60663150b5 admin user search: added filter by actor_type Maksim Pechnikov 2020-09-25 16:04:01 +03:00
  • 46b420aa60 need_confirmed -> unconfirmed Maksim Pechnikov 2020-09-25 09:39:49 +03:00
  • cf4f393794 added AdminApi.UserController Maksim Pechnikov 2020-09-21 15:01:03 +03:00
  • 9ef46ce410 added 'unconfirmed' filter to admin/users Maksim Pechnikov 2020-09-21 09:33:51 +03:00
  • 2ca98f2d94 Apply 1 suggestion(s) to 1 file(s) Haelwenn 2020-10-21 19:40:37 +00:00
  • fb0e340363 Rip out fedsockets from the release branch rinpatch 2020-10-21 21:13:49 +03:00
  • b18b93bbed
    Fix formatting and typos in "Managing frontends" guide Egor Kislitsyn 2020-10-21 21:42:21 +04:00
  • e4d4f87b10 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-20 20:00:41 -05:00
  • 77e827bb66 Merge branch 'bugfix/ci-majic-release' into 'develop' Haelwenn 2020-10-20 21:15:48 +00:00
  • 54d99cbb72
    CI: Install libmagic-dev in debian release targets Haelwenn (lanodan) Monnier 2020-10-20 22:10:20 +02:00
  • 7d53827785 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-20 12:33:10 -05:00
  • 034ac43f3a
    Fix credo warnings Egor Kislitsyn 2020-10-20 17:47:04 +04:00
  • e87901c424
    Merge remote-tracking branch 'origin/develop' into feature/account-export Egor Kislitsyn 2020-10-20 17:27:29 +04:00
  • 50d4280880 [#1668] Formatting fix. Ivan Tashkinov 2020-10-20 16:18:24 +03:00
  • ad605e3e16
    Rename Pleroma.Backup to Pleroma.User.Backup Egor Kislitsyn 2020-10-20 17:16:58 +04:00
  • 3a28aa8814 [#1668] Added :prometheus group config to config/description.exs. Ivan Tashkinov 2020-10-20 15:13:20 +03:00
  • 44b2a137d1 Merge branch 'bugfix/ci-majic-release' into 'develop' Haelwenn 2020-10-20 00:47:44 +00:00
  • ccd1e75e35
    CI: Install file-dev in alpine release targets Haelwenn (lanodan) Monnier 2020-10-20 02:36:45 +02:00
  • fe160330e6 Merge branch 'fix/autofollower-suggestions' into 'develop' Haelwenn 2020-10-19 23:16:24 +00:00
  • c1976d5b19 Fix credo warnings Egor Kislitsyn 2020-10-19 18:14:39 +04:00
  • e97b254c6b Transmogrifier: Refactor and unify incoming tag handling lain 2020-10-19 15:46:24 +02:00
  • 39fd4d7639 Transmogrifier: Downcase incoming Hashtags lain 2020-10-19 15:40:50 +02:00
  • 98f32cf820
    Fix tests Egor Kislitsyn 2020-10-19 15:30:32 +04:00
  • 76c4e80e5a
    Merge branch 'develop' into mutes-blocks-pagination Egor Kislitsyn 2020-10-19 15:40:03 +04:00
  • 18a91d85e5
    Merge branch 'develop' into feature/local-only-scope Egor Kislitsyn 2020-10-19 15:31:56 +04:00
  • 0495a07dc7 Merge branch '2239-mute-fixes' into 'develop' Haelwenn 2020-10-19 04:26:35 +00:00
  • 524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. Added tests and documentation. Ivan Tashkinov 2020-10-18 21:22:21 +03:00
  • 3f805d98ad Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-17 18:36:06 -05:00
  • be611b143b Merge branch 'chore/changelogfix' into 'develop' feld 2020-10-17 17:45:51 +00:00
  • d16336e7fb Document autofollowing_nicknames Mark Felder 2020-10-17 16:54:05 +00:00
  • cb3ee4d543 Fix duplicate Added sections in the changelog Mark Felder 2020-10-17 11:52:33 -05:00
  • 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 Ivan Tashkinov 2020-10-17 17:53:47 +03:00
  • d54233760f [#3053] Post-merge fix. Ivan Tashkinov 2020-10-17 13:33:57 +03:00
  • 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances Ivan Tashkinov 2020-10-17 13:12:39 +03:00
  • efd6572ffb Remove suggestions Mark Felder 2020-10-16 17:43:44 +00:00
  • 405f27b4f8 The suggestions are problematic as they need to be real local account names Mark Felder 2020-10-16 17:41:44 +00:00
  • 1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts Mark Felder 2020-10-16 17:32:05 +00:00
  • fbd71abc1a Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-16 00:14:53 -05:00
  • aafdc975bd
    federation_status: Add ApiSpec Haelwenn (lanodan) Monnier 2020-10-16 01:13:52 +02:00
  • 3b5a7a6b14
    federation_status: New endpoint showing unreachable instances Haelwenn (lanodan) Monnier 2020-10-16 00:32:20 +02:00
  • 023f726d7f Merge branch 'refactor/discoverable_user_field' into 'develop' feld 2020-10-15 21:49:15 +00:00
  • fb056ce05b Merge branch 'develop' into refactor/discoverable_user_field Mark Felder 2020-10-15 16:39:01 -05:00
  • 724e4b7f00 Apply 1 suggestion(s) to 1 file(s) Haelwenn 2020-10-15 21:03:48 +00:00
  • 5703fb6d2a Merge branch 'issue/2009' into 'develop' feld 2020-10-15 20:21:57 +00:00
  • 2030ffd490 fix test Maksim Pechnikov 2020-08-08 06:49:19 +03:00
  • cf53e300f8 added generate the release env to pleroma.instance gen Maksim Pechnikov 2020-08-07 15:55:08 +03:00
  • 595da6080d fixed install docs Maksim Pechnikov 2020-08-05 19:04:12 +03:00
  • 2f6bbd53b5 fix docs Maksim Pechnikov 2020-07-16 16:35:09 +03:00
  • e2333f757a Apply 1 suggestion(s) to 1 file(s) Maksim 2020-07-16 13:30:28 +00:00
  • 499df7b73a Apply 1 suggestion(s) to 1 file(s) Maksim 2020-07-16 13:30:17 +00:00
  • 14054cd004 update task messages Maksim Pechnikov 2020-07-16 08:52:14 +03:00
  • 20e68b30f0 added generated pleroma.env Maksim Pechnikov 2020-07-14 07:31:21 +03:00
  • 274c8e6fab SECURITY.md: update supported versions to only 2.2 rinpatch 2020-10-15 21:45:31 +03:00
  • 6c1bc9ca39 CHANGELOG.md: prepare 2.2.0 changelog rinpatch 2020-10-15 21:43:46 +03:00
  • 65b73eb9fd mix.exs: bump version to 2.2.0 rinpatch 2020-10-15 21:43:35 +03:00
  • 2a475622ee
    Add Pleroma.Constants.as_local_public/0 Egor Kislitsyn 2020-10-15 19:07:00 +04:00