Commit Graph

  • fee0c6a2cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users lain 2021-01-05 13:33:57 +0100
  • 7a03b112f2 Merge branch '1526-account-aliases' into 'develop' lain 2021-01-05 12:31:33 +0000
  • e802b48d55 User: Use ObjectID type to validate also-known-as field lain 2021-01-05 13:10:14 +0100
  • f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases lain 2021-01-05 12:42:30 +0100
  • ca7cf62d2a Merge branch 'pleroma-moderation-log-stuff' into 'develop' lain 2021-01-05 11:36:57 +0000
  • bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff lain 2021-01-05 12:19:39 +0100
  • 95a0ae8a35 AccountControllerTest: Fix test logic lain 2021-01-05 11:48:40 +0100
  • d44850d7a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor lain 2021-01-05 10:48:32 +0100
  • b3c36d3f7a Merge branch '2391-async-bugs' into 'develop' Haelwenn 2021-01-05 00:01:44 +0000
  • 8e5904daa5 SideEffects.DeleteTest: asyncify. lain 2021-01-04 18:40:59 +0100
  • 0e93775ed0 Add test to validate profile pagination works with keyset Mark Felder 2021-01-04 11:04:58 -0600
  • 83f27282ba Do not try to guess which pagination we need by the existence of an :offset param. Require explicit request to get offset pagination. Mark Felder 2021-01-04 10:13:17 -0600
  • e1e7e4d379 Object: Rework how Object.normalize works lain 2021-01-04 13:38:31 +0100
  • 0ec7e9b8e9
    AdminAPI: return id for moderation log entries Alex Gleason 2021-01-01 11:58:42 -0600
  • 7b44605cb8
    Migration to confirm previously-logged-in users Alex Gleason 2020-12-31 14:04:51 -0600
  • afe9c152ab Merge branch 'fix/reports-ordering' into 'develop' feld 2020-12-31 19:24:49 +0000
  • 83d97ab98e Document reports ordering change Mark Felder 2020-12-31 13:15:44 -0600
  • 4200a06340
    Aliases: refactor validate_also_known_as/1 Alex Gleason 2020-12-31 12:53:28 -0600
  • 0d6b9ce8ca Apply 2 suggestion(s) to 1 file(s) Alex Gleason 2020-12-31 18:51:57 +0000
  • e4791258d4 Ensure newest report is returned first in the list Mark Felder 2020-12-31 10:53:18 -0600
  • 64f0e96ff6
    Automatically confirm logged-in users Alex Gleason 2020-12-31 12:13:08 -0600
  • 70e8ef2c46 Merge branch 'fix/adminapi-user-status-pagination' into 'develop' feld 2020-12-31 16:04:42 +0000
  • 2aa60e7592 Apply 1 suggestion(s) to 1 file(s) feld 2020-12-31 15:55:44 +0000
  • 11d40e92b7
    Render AKAs in Actor endpoints Alex Gleason 2020-12-30 18:53:27 -0600
  • cbce880076
    Merge remote-tracking branch 'upstream/develop' into aliases Alex Gleason 2020-12-30 17:10:02 -0600
  • 2597b028f7 Make pagination type conditional Mark Felder 2020-12-30 16:37:04 -0600
  • 085d4e6cfc Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset Mark Felder 2020-12-30 16:10:10 -0600
  • 4c5f75f4e9 Support pagination in AdminAPI for user statuses Mark Felder 2020-12-30 14:36:04 -0600
  • 744b34709d Do not reverse order of reports. We want newest ones sorted to the top. Mark Felder 2020-12-30 14:22:48 -0600
  • 38924166eb Merge branch 'deps/crypt-local-fork' into 'develop' lain 2020-12-30 14:04:10 +0000
  • a1a58f0a53 Switch to local fork of crypt until upstream fixes ability to build on aarch64 Mark Felder 2020-12-28 17:52:18 -0600
  • 607cac1947 Merge branch 'revert-b122b6ff' into 'develop' Haelwenn 2020-12-28 12:12:19 +0000
  • 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'" Haelwenn 2020-12-28 12:02:16 +0000
  • b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop' Haelwenn 2020-12-28 10:14:58 +0000
  • d0c2479710
    pleroma.database fill_old_hashtags: Add month_limit argument Haelwenn (lanodan) Monnier 2020-12-22 05:11:19 +0100
  • 18b536c176
    Pleroma.Object/1: take %Object{} as argument instead Haelwenn (lanodan) Monnier 2020-12-28 10:33:28 +0100
  • 2e859794ee
    non condition dir creation Alexander Strizhakov 2020-12-27 21:58:15 +0300
  • 546da68a11
    changelog entry Alexander Strizhakov 2020-12-25 11:53:01 +0300
  • dad76703aa
    not needed Alexander Strizhakov 2020-12-25 11:34:09 +0300
  • 7bfb041658
    insreasing test coverage for StealEmojiPolicy Alexander Strizhakov 2020-12-25 11:30:36 +0300
  • aafd7b44ce
    check dir existence in policy Alexander Strizhakov 2020-12-24 20:27:28 +0300
  • e02889edb2
    Add MRFs to the list of things that may need a soft reboot Mark Felder 2020-12-23 15:19:08 -0600
  • 72aeb2e73b
    Mark private Mark Felder 2020-12-23 15:16:58 -0600
  • 77e39e6aae
    Create dir for EmojiStealPolicy automatically Mark Felder 2020-12-23 15:06:20 -0600
  • e4f1d8f48c Merge branch 'cachex-test' into 'develop' lain 2020-12-26 10:26:35 +0000
  • 50e226bc52 Revert, this is useful in an edge case Mark Felder 2020-12-23 17:41:15 -0600
  • ce78b64db8 Formatting Mark Felder 2020-12-23 17:41:10 -0600
  • 5a084d6f8d Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE Mark Felder 2020-12-23 17:38:33 -0600
  • 7aec234b44 Remove Proxy settings that were not meant to exist under Pleroma.Upload Mark Felder 2020-12-23 17:01:11 -0600
  • fecefe68f8 Add test/instance to .gitignore Mark Felder 2020-12-23 14:09:22 -0600
  • 88530c02d6 Merge branch 'update/linkify' into 'develop' lain 2020-12-23 15:58:20 +0000
  • 5b838accc0 Update Linkify to 0.4.1 Mark Felder 2020-12-23 09:03:16 -0600
  • ce1be8f5e6 Merge branch 'mergeback/2.2.1' into 'develop' lain 2020-12-23 14:08:08 +0000
  • ae934659d1 Align changelog lain 2020-12-23 14:56:57 +0100
  • 31c89acd00 Merge branch 'stable' into mergeback/2.2.1 lain 2020-12-23 14:41:04 +0100
  • f64237927c Merge branch 'release/2.2.1' into 'stable' lain 2020-12-23 13:35:41 +0000
  • 843d2074fe Fixtures: Add application actor fixture. lain 2020-12-23 11:56:08 +0100
  • 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1 lain 2020-12-23 11:40:34 +0100
  • 322463e1bd Update changelog lain 2020-12-23 11:39:19 +0100
  • 463eec992a Apply 1 suggestion(s) to 1 file(s) lain 2020-12-23 10:35:41 +0000
  • 68eed0873e Linting lain 2020-12-23 11:16:13 +0100
  • d4e6ca88a6 Update frontend lain 2020-12-23 09:35:19 +0100
  • b988e9cc8b Mix: Update version. lain 2020-12-22 21:59:37 +0100
  • a8ca282b4a Update changelog lain 2020-12-22 21:54:31 +0100
  • d788b41c2e Report fixes. lain 2020-12-22 21:32:11 +0100
  • 0f527c9e02 Mix: Update linkify to 0.4.1 lain 2020-12-22 21:22:48 +0100
  • 5cfa32cb50 [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results. Ivan Tashkinov 2020-11-19 18:08:22 +0300
  • 897b62091b fix for elixir 1.11 Alexander Strizhakov 2020-11-24 18:44:48 +0300
  • c26583c99e SideEffects: fix test lain 2020-12-02 14:48:11 +0100
  • 41d6225e2e User: Remove left-over (wrong) fix. lain 2020-12-02 13:39:29 +0100
  • a32e13e6c4 User: Don't allow local users in remote changesets lain 2020-12-02 12:18:43 +0100
  • c10783087f Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix Mark Felder 2020-12-12 13:01:30 -0600
  • 66c75b0192 Update changelog lain 2020-12-22 21:05:12 +0100
  • 29c3c35ba1 Search: Only skip ordering the rum index. lain 2020-11-19 16:29:31 +0100
  • 3388bf9c9b Activity search: Fix order of results lain 2020-11-19 13:20:58 +0100
  • 42a386eb9f Document fixing the pleroma.user delete_activities mix task Mark Felder 2020-11-17 15:28:46 +0000
  • a21aeeee12 Need to start web_resp cache or mix task fails Mark Felder 2020-11-17 15:15:53 +0000
  • 93852f1b42 Document S3 and Elixir 1.11 compat fix Mark Felder 2020-11-16 19:54:02 +0000
  • 012108a299 Fix S3 uploads with Elixir 1.11 Mark Felder 2020-11-16 19:51:44 +0000
  • aa848cbd75 pleroma.instance: Fix Exiftool module name Haelwenn (lanodan) Monnier 2020-11-14 22:27:13 +0100
  • 065009a57a remove PurgeExpiredActivity from Oban db config Alexander Strizhakov 2020-11-13 09:07:08 +0300
  • 538af14d52
    possibility to run rollback in test env Alexander Strizhakov 2020-12-22 17:55:30 +0300
  • c5cce89f50 Merge branch 'update-elixir-make' into 'develop' feld 2020-12-22 14:53:04 +0000
  • dedc575225
    update for retired elixir_make package version Alexander Strizhakov 2020-12-22 17:42:23 +0300
  • 0ca13be499 Merge branch 'update/instance-gen-template' into 'develop' rinpatch 2020-12-22 11:31:06 +0000
  • 87b13c5430
    Create Object.hashtags/1 wrapper Haelwenn (lanodan) Monnier 2020-12-22 03:54:57 +0100
  • acb03d591b
    Insert text representation of hashtags into object["hashtags"] Haelwenn (lanodan) Monnier 2020-07-31 16:46:35 +0200
  • d5746e8447 Do not include pool_size in the template. It encourages unwanted fiddling :) Mark Felder 2020-12-21 15:19:24 -0600
  • 8e1f32e715 Merge branch 'develop' into 'develop' lain 2020-12-21 17:13:52 +0000
  • ab633e51ab Linting lain 2020-12-16 20:41:35 +0100
  • 1a3da01a65 Tests: Stub the pipeline in all tests. lain 2020-12-21 16:38:34 +0100
  • 5db1e6c8d3 Pipeline test: Switch from Mock to Mox. lain 2020-12-16 17:51:48 +0100
  • 0ef0aed205 Tests: Add a helper method to reduce sleeping times in test. lain 2020-12-16 10:39:36 +0100
  • ba19975838 Linting lain 2020-12-21 16:22:36 +0100
  • 9d5ce82221 Test: More async/sync tweaks. lain 2020-12-21 15:05:56 +0100
  • b17c36c45a Tests: More test fixes. lain 2020-12-21 12:59:11 +0100
  • 2f8ec8a9cc XMLBuidlder test: Make async. lain 2020-12-21 12:35:04 +0100
  • ecd39a8fe5 Test config: Raise pool size for postgres. lain 2020-12-21 12:31:12 +0100
  • 9ba60f70d2 Tests: Make as many tests as possible async. lain 2020-12-21 12:21:40 +0100
  • c9d73af74d Cachex: Unify arity of callback function lain 2020-12-21 12:03:58 +0100