Commit Graph

  • 0f94221594
    Refactor static.css with color variables Alex Gleason 2020-07-27 17:27:17 -05:00
  • 2208e5d9ba
    OAuth form: add instance header Alex Gleason 2020-07-27 17:15:42 -05:00
  • 057936bf0b Merge branch 'embedded-object-federation' into 'develop' Haelwenn 2020-07-27 21:20:52 +00:00
  • 6afbd60af6
    Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-07-27 15:37:39 -05:00
  • 520dce857e
    Add :registration_reason_length to description.exs Alex Gleason 2020-07-27 15:24:20 -05:00
  • 6f44a0ee84
    Add configurable registration_reason limit Alex Gleason 2020-07-27 15:13:34 -05:00
  • 90b237c273 use start_pleroma/0 instead of raw Application.ensure_all_started/1 Roman Chvanikov 2020-07-27 20:50:15 +03:00
  • 6747bf2e16
    Merge remote-tracking branch 'upstream/develop' into by-approval Alex Gleason 2020-07-27 12:29:18 -05:00
  • e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings' lain 2020-07-27 16:35:47 +00:00
  • 4a6389316d
    masto_fe_view: Remove @default_settings Haelwenn (lanodan) Monnier 2020-07-27 17:59:13 +02:00
  • 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator. lain 2020-07-27 16:39:50 +02:00
  • 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation lain 2020-07-27 16:19:45 +02:00
  • 7b33cb1b3c skip yarn-dependent tests when yarn is unavailable Roman Chvanikov 2020-07-27 16:46:05 +03:00
  • 211ab00aeb Handle empty configs in install-all Roman Chvanikov 2020-07-27 16:23:16 +03:00
  • a83a855b42 Merge develop Roman Chvanikov 2020-07-27 16:11:08 +03:00
  • 06db5cb1a1 Add mix task to install all frontends Roman Chvanikov 2020-07-27 16:02:31 +03:00
  • 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop' lain 2020-07-27 12:34:36 +00:00
  • 0d5d1c62ef Apply 1 suggestion(s) to 1 file(s) lain 2020-07-27 12:24:41 +00:00
  • 64b21cee14 Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop' Haelwenn 2020-07-27 08:20:46 +00:00
  • 58c09a8258 Merge branch 'fix/update-types-in-link-formatter' into 'develop' Haelwenn 2020-07-27 08:11:07 +00:00
  • 22c9d521ab Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-27 09:26:46 +03:00
  • 0022b2d2be
    Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-07-26 15:50:40 -05:00
  • 6931dbfa58
    Merge remote-tracking branch 'upstream/develop' into by-approval Alex Gleason 2020-07-26 15:46:14 -05:00
  • 6bf8eee5f9 ReverseProxy tesla client: remove handling of old_conn rinpatch 2020-07-26 20:44:26 +03:00
  • a7616dec8c Merge branch 'patch-3' into 'develop' rinpatch 2020-07-26 16:38:57 +00:00
  • d4fbec62a3 ReverseProxy: Fix a gun connection leak when there is an error with no body rinpatch 2020-07-26 19:18:21 +03:00
  • 6107440ea0 OpenAPI: remove accidentally pasted buffer data Alibek Omarov 2020-07-26 13:59:46 +00:00
  • b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema Alibek Omarov 2020-07-26 13:54:56 +00:00
  • ce9647aed7 Merge branch 'fix/mix-tasks' into 'develop' lain 2020-07-26 11:47:18 +00:00
  • 4d80cf5409 Update types in Pleroma.Formatter group Angelina Filippova 2020-07-26 01:48:50 +03:00
  • ae6427b186 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-25 16:48:06 +03:00
  • 643664d583 added migrate old settings to new Maksim Pechnikov 2020-07-25 07:09:09 +03:00
  • 65a1b048a8 Ensure Oban is available during mix tasks. Fixes: mix pleroma.user rm username Mark Felder 2020-07-24 12:06:56 -05:00
  • 9be6668236 Fix mix tasks that make HTTP calls by starting the Gun connection pool Mark Felder 2020-07-24 12:05:42 -05:00
  • 1dd6de03ee CommonAPI Tests: Check that undoing objects federates them as embeds. Lain Soykaf 2020-07-24 14:54:13 +02:00
  • 3d13fb05f8 Side Effects: On undoing, put information about the undone object. Lain Soykaf 2020-07-24 14:40:22 +02:00
  • 91f3cf9bc6 Pipeline: Add embedded object federation. Lain Soykaf 2020-07-24 14:06:41 +02:00
  • 61ef1fca4b remove duplicate module Maksim Pechnikov 2020-07-24 08:35:06 +03:00
  • 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop' feld 2020-07-23 20:06:11 +00:00
  • 4bfad0b483 Support blocking via query parameters as well and document the change. Mark Felder 2020-07-23 12:59:40 -05:00
  • a74951a3b0 Merge branch 'feature/add-mrf-related-policies' into 'develop' feld 2020-07-23 17:23:18 +00:00
  • 7d6376ab51
    mix.exs: Use hex releases for our librairies chores/our-libs-hex-releases Haelwenn (lanodan) Monnier 2020-07-23 19:17:58 +02:00
  • 6100b90209 Merge branch '1976-status-view-fixes' into 'develop' Haelwenn 2020-07-23 16:58:36 +00:00
  • 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email Maksim Pechnikov 2020-07-23 16:36:27 +03:00
  • 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' lain 2020-07-23 12:52:02 +00:00
  • 9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. Ivan Tashkinov 2020-07-23 15:08:30 +03:00
  • b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop' lain 2020-07-23 11:08:29 +00:00
  • 250e0369c7 Merge branch 'issue/1878' into 'develop' lain 2020-07-23 10:56:33 +00:00
  • 646ca6d2b4 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-23 13:36:01 +03:00
  • a81581472f Merge branch 'linkify' into 'develop' lain 2020-07-23 10:28:52 +00:00
  • 7991ddad58 added warning to use old keys Maksim Pechnikov 2020-07-23 06:51:19 +03:00
  • b6488a4db4
    Update linkify migration tests to use config from ConfigDB Alex Gleason 2020-07-22 16:01:55 -05:00
  • c7a0016f9f
    Migration to fix malformed Pleroma.Formatter config Alex Gleason 2020-07-22 14:18:09 -05:00
  • b87a1f8eaf
    Refactor require_migration/1 into a test helper function Alex Gleason 2020-07-22 13:45:15 -05:00
  • 67389b77af
    Add AutolinkerToLinkify migration test Alex Gleason 2020-07-22 13:10:10 -05:00
  • 89537573ed Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-22 20:51:24 +03:00
  • 7045db5a50
    Fix linkify ConfigDB migration Alex Gleason 2020-07-22 11:27:52 -05:00
  • 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. Made Pleroma.Web.MastodonAPI.AccountView.render("show.json", _) demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. Ivan Tashkinov 2020-07-22 19:06:00 +03:00
  • fdc4aeb5b0 Require yarn when installing FEs Roman Chvanikov 2020-07-22 18:52:36 +03:00
  • 188b0dc72d Add related_policy field Angelina Filippova 2020-07-22 18:15:30 +03:00
  • 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' lain 2020-07-22 15:09:32 +00:00
  • f9e8a94106 Add multiarch support to docker container, fixes https://git.pleroma.social/pleroma/pleroma-docker-compose/-/issues/2 Guy Sheffer 2020-07-22 17:26:36 +03:00
  • db0224d174 added check user email for welcome email Maksim Pechnikov 2020-07-22 16:00:49 +03:00
  • 0cb9e1da74 StatusView: Handle badly formatted emoji reactions. Lain Soykaf 2020-07-22 14:44:06 +02:00
  • 5879d36854 fix sender for welcome email Maksim Pechnikov 2020-07-22 15:34:47 +03:00
  • 96f023be5c Merge branch 'bugfix/limiter_git_url' into 'develop' lain 2020-07-22 11:22:34 +00:00
  • c8fe0321b0
    mix.exs: Append .git to git repo URLs Haelwenn (lanodan) Monnier 2020-07-22 12:00:07 +02:00
  • 8d6f7aec21 Merge branch 'develop' into issue/1023 Maksim Pechnikov 2020-07-22 09:24:16 +03:00
  • b620290dd9 update description Maksim Pechnikov 2020-07-22 09:17:00 +03:00
  • 7cafb96c02 added tests Maksim Pechnikov 2020-07-22 08:58:06 +03:00
  • 194012f7f5 Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-22 08:35:47 +03:00
  • b157b7dab3 Document the emoji packs API fix Mark Felder 2020-07-21 17:29:11 -05:00
  • 109836306c Test that Emoji Packs can be listed when instance is not public Mark Felder 2020-07-21 17:27:13 -05:00
  • 341a8f3500 Skip the correct plug Mark Felder 2020-07-21 17:26:59 -05:00
  • 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" lain 2020-07-21 22:18:17 +00:00
  • c36113cdf5 Merge branch 'revert-2b5d9eb1' into 'develop' lain 2020-07-21 22:18:02 +00:00
  • 696c13ce54 Revert "Merge branch 'linkify' into 'develop'" lain 2020-07-21 22:17:34 +00:00
  • 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs Mark Felder 2020-07-21 16:25:45 -05:00
  • 2b5d9eb105 Merge branch 'linkify' into 'develop' lain 2020-07-21 19:35:43 +00:00
  • fa2421dd7e Merge branch 'gopher-fix' into 'develop' lain 2020-07-21 19:31:03 +00:00
  • 51805bae82 Update docs Roman Chvanikov 2020-07-21 21:14:00 +03:00
  • b700ba9dff Update config descriptions Roman Chvanikov 2020-07-21 20:52:42 +03:00
  • b8021016eb [#2497] Resolved merge conflicts. Ivan Tashkinov 2020-07-21 20:03:14 +03:00
  • dba4756749 Update configs Roman Chvanikov 2020-07-21 19:59:34 +03:00
  • 43d9877ba9 fix credo Roman Chvanikov 2020-07-21 17:00:50 +03:00
  • 707ae0a6aa Fix config tests Roman Chvanikov 2020-07-21 16:25:59 +03:00
  • bdb3375933
    Allow unblocking a domain via query params Egor Kislitsyn 2020-07-21 16:06:46 +04:00
  • d00fe72850 Fix tests Roman Chvanikov 2020-07-21 14:39:25 +03:00
  • ec5dcb651c Fix instance setup Roman Chvanikov 2020-07-21 12:14:20 +03:00
  • 6afc6717d6
    copy tmp file if test depends on it Alexander Strizhakov 2020-07-21 10:31:58 +03:00
  • 3edaecae96 added welcome email Maksim Pechnikov 2020-07-21 09:25:53 +03:00
  • 7dd03bc83d Merge branch 'develop' into refactor/fe-bundles Roman Chvanikov 2020-07-20 21:53:24 +03:00
  • aa6ad8e2dd Fix instance setup Roman Chvanikov 2020-07-20 21:53:03 +03:00
  • 204dddcfaa
    Pleroma.Formatter can have partial updates Alex Gleason 2020-07-20 13:45:05 -05:00
  • ab648fd95d Fix admin FE build instructions Roman Chvanikov 2020-07-20 21:22:23 +03:00
  • 3c0f267766 Fix mock fe zip Roman Chvanikov 2020-07-20 21:08:50 +03:00
  • 4e566a0408 Update docs Roman Chvanikov 2020-07-20 20:45:41 +03:00
  • adfcd59738 add web installer Roman Chvanikov 2020-07-20 20:31:35 +03:00
  • 03a60c55fa Update docs Roman Chvanikov 2020-07-20 17:31:05 +03:00
  • 5d263dfdb3
    Update linkify to latest release Alex Gleason 2020-07-20 09:29:03 -05:00