Commit Graph

  • 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' lain 2020-07-22 15:09:32 +0000
  • 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 +0300
  • db0224d174 added check user email for welcome email Maksim Pechnikov 2020-07-22 16:00:49 +0300
  • 0cb9e1da74 StatusView: Handle badly formatted emoji reactions. Lain Soykaf 2020-07-22 14:44:06 +0200
  • 5879d36854 fix sender for welcome email Maksim Pechnikov 2020-07-22 15:34:47 +0300
  • 96f023be5c Merge branch 'bugfix/limiter_git_url' into 'develop' lain 2020-07-22 11:22:34 +0000
  • c8fe0321b0
    mix.exs: Append .git to git repo URLs Haelwenn (lanodan) Monnier 2020-07-22 12:00:07 +0200
  • 8d6f7aec21 Merge branch 'develop' into issue/1023 Maksim Pechnikov 2020-07-22 09:24:16 +0300
  • b620290dd9 update description Maksim Pechnikov 2020-07-22 09:17:00 +0300
  • 7cafb96c02 added tests Maksim Pechnikov 2020-07-22 08:58:06 +0300
  • b157b7dab3 Document the emoji packs API fix Mark Felder 2020-07-21 17:29:11 -0500
  • 109836306c Test that Emoji Packs can be listed when instance is not public Mark Felder 2020-07-21 17:27:13 -0500
  • 341a8f3500 Skip the correct plug Mark Felder 2020-07-21 17:26:59 -0500
  • 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" lain 2020-07-21 22:18:17 +0000
  • c36113cdf5 Merge branch 'revert-2b5d9eb1' into 'develop' lain 2020-07-21 22:18:02 +0000
  • 696c13ce54 Revert "Merge branch 'linkify' into 'develop'" lain 2020-07-21 22:17:34 +0000
  • 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs Mark Felder 2020-07-21 16:25:45 -0500
  • 2b5d9eb105 Merge branch 'linkify' into 'develop' lain 2020-07-21 19:35:43 +0000
  • fa2421dd7e Merge branch 'gopher-fix' into 'develop' lain 2020-07-21 19:31:03 +0000
  • b8021016eb [#2497] Resolved merge conflicts. Ivan Tashkinov 2020-07-21 20:03:14 +0300
  • bdb3375933
    Allow unblocking a domain via query params Egor Kislitsyn 2020-07-21 16:06:46 +0400
  • 6afc6717d6
    copy tmp file if test depends on it Alexander Strizhakov 2020-07-21 10:31:58 +0300
  • 3edaecae96 added welcome email Maksim Pechnikov 2020-07-21 09:25:53 +0300
  • 204dddcfaa
    Pleroma.Formatter can have partial updates Alex Gleason 2020-07-20 13:45:05 -0500
  • 5d263dfdb3
    Update linkify to latest release Alex Gleason 2020-07-20 09:29:03 -0500
  • 1b82b7eac9 Merge branch 'patch-1' into 'develop' Haelwenn 2020-07-20 13:52:56 +0000
  • 531c3ab9f3 fix markdown rendering withing <details>; typo parent**s**_visible Dym Sohin 2020-07-20 11:41:43 +0000
  • bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-07-19 20:05:37 +0300
  • afa8b469ed
    Allow restricting public timeline by instance Alex Gleason 2020-07-01 21:12:59 -0500
  • ae74c52e22
    Test angry face in formatter D:< #1968 Alex Gleason 2020-07-18 15:10:48 -0500
  • f0d13fc3f7 Merge branch 'fix/followredirects-hackney' into 'develop' feld 2020-07-18 16:49:30 +0000
  • 4bac25e6f5 Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used href 2020-07-18 13:17:38 +0200
  • 7ce722ce3e
    Fix /api/pleroma/emoji/packs index endpoint. KokaKiwi 2020-07-18 12:55:04 +0200
  • bd1e2e3a58
    Validate alias IDs Alex Gleason 2020-07-17 19:11:28 -0500
  • d0eb43b58b
    Add account aliases Alex Gleason 2020-07-16 22:19:17 -0500
  • 10d46235cf Merge branch 'fix-1958' into 'develop' Haelwenn 2020-07-17 18:54:30 +0000
  • 48f8b26c92
    OpenAPI: Add :id to follower/following endpoints, fixes #1958 Alex Gleason 2020-07-16 21:39:10 -0500
  • 15f8921b11
    Test that unapproved users can never log in regardless of admin settings Alex Gleason 2020-07-17 12:26:52 -0500
  • 5756843736
    Fully delete users with status :approval_pending Alex Gleason 2020-07-17 12:19:41 -0500
  • b782739ffe Merge branch 'feature/expose-post-formats' into 'develop' Haelwenn 2020-07-17 16:52:59 +0000
  • 20a496d2cb Expose the post formats in /api/v1/instance Mark Felder 2020-07-17 10:45:41 -0500
  • af376cbffb
    using atom keys in search params Alexander Strizhakov 2020-07-17 18:06:05 +0300
  • 64b4de4af1 Merge branch 'feature/totp-input-improvements' into 'develop' feld 2020-07-17 14:36:38 +0000
  • 62438530e2 TOTP length is configurable, so we can't hardcode this here. Mark Felder 2020-07-17 08:19:49 -0500
  • a3fdd1446f Merge branch 'chore/issue-template-remove-tasks' into 'develop' rinpatch 2020-07-17 08:05:16 +0000
  • 2a3bb23091 Bug issue template: remove choice in "Installation type" rinpatch 2020-07-17 11:03:47 +0300
  • 5e74556703
    Sanitize `reason` param in POST /api/v1/accounts Alex Gleason 2020-07-16 20:25:53 -0500
  • 613e096389
    Migrate :auto_linker --> Pleroma.Formatter in ConfigDB Alex Gleason 2020-07-16 16:35:03 -0500
  • 880301985b
    Formatter: Test link with local mention Alex Gleason 2020-06-01 19:51:41 -0500
  • 5701840d30
    Use updated Linkify from git Alex Gleason 2020-07-16 14:54:20 -0500
  • 6fdaee7cae
    description.exs typofixes Alex Gleason 2020-07-16 14:52:48 -0500
  • 38425ebdbf
    Merge remote-tracking branch 'upstream/develop' into linkify Alex Gleason 2020-07-16 14:51:36 -0500
  • 3be64556db Improve TOTP token and recovery input fields in OAuth login Mark Felder 2020-07-16 13:11:03 -0500
  • 5fcb3e8738 fix docs Maksim Pechnikov 2020-07-16 16:35:09 +0300
  • 16da9f5cfd Apply 1 suggestion(s) to 1 file(s) Maksim 2020-07-16 13:30:28 +0000
  • c72676d22f Apply 1 suggestion(s) to 1 file(s) Maksim 2020-07-16 13:30:17 +0000
  • 6c59fe259d Merge branch 'develop' into issue/1023 Maksim Pechnikov 2020-07-16 08:53:21 +0300
  • 4e0e19a706 update task messages Maksim Pechnikov 2020-07-16 08:52:14 +0300
  • 3a2b2cb6f2 Merge branch 'refactor/gun-pool-registry' into 'develop' feld 2020-07-15 23:10:52 +0000
  • 02cc42e72c
    Squash User approval migrations Alex Gleason 2020-07-15 17:08:46 -0500
  • 9ce95fa68f
    Use `approval_required` in /api/v1/instance Alex Gleason 2020-07-15 17:04:30 -0500
  • b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry Mark Felder 2020-07-15 13:34:27 -0500
  • 00f9b53f07 Merge branch 'refactor/notification_settings' into 'develop' feld 2020-07-15 15:22:39 +0000
  • 34d1d3e93e Update FE bundle Mark Felder 2020-07-15 09:38:56 -0500
  • 9d30bacace Merge branch 'develop' into refactor/notification_settings Mark Felder 2020-07-15 09:30:23 -0500
  • 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop' rinpatch 2020-07-15 14:00:22 +0000
  • 2ce141fb0e Merge branch 'fix/oban-pruning' into 'develop' rinpatch 2020-07-15 13:52:01 +0000
  • a2f9bc77b6 Merge branch 'issue/sign-authority' into 'develop' feld 2020-07-15 13:44:52 +0000
  • d29b8997f4
    MastoAPI: fix & test giving MRF reject reasons Haelwenn (lanodan) Monnier 2020-07-15 15:25:33 +0200
  • c413649a8d Bring back oban job pruning rinpatch 2020-07-15 16:20:17 +0300
  • 7115c5f82e ConnectionPool.Worker: do not stop with an error when there is a timeout rinpatch 2020-07-15 15:58:08 +0300
  • 3f8bff8d6b Merge branch 'develop' into issue/sign-authority Maksim Pechnikov 2020-07-15 15:49:46 +0300
  • 6d583bcc3b Set a default timeout for Gun adapter timeout href 2020-07-13 10:44:36 +0200
  • e499275076 Don't test tls_options in adapter helper test. href 2020-07-08 19:23:32 +0200
  • afd378f84c host is now useless href 2020-07-08 16:02:57 +0200
  • ce1a42bd04 Simplify TLS opts href 2020-07-08 15:12:09 +0200
  • ebfa591689 Go back to upstream Tesla href 2020-07-08 15:02:56 +0200
  • 6b1f6a1cf7 Bump gun href 2020-07-08 14:59:10 +0200
  • 53ba6815b1 parentheses... href 2020-07-08 13:58:38 +0200
  • 23d714ed30 Fix race in enforcer/reclaimer start href 2020-07-08 13:22:42 +0200
  • 6a0f2bdf8c Ensure connections error get known by the caller href 2020-07-08 13:01:02 +0200
  • 46dd276d68 ConnectionPool.Worker: Open gun conn in continue instead of init href 2020-07-07 18:56:17 +0200
  • 33747e9366 config.exs: set gun retries to 0 rinpatch 2020-07-06 12:13:02 +0300
  • a705637dcf Connection Pool: fix LRFU implementation to not actually be LRU rinpatch 2020-07-02 01:53:27 +0300
  • 9b73c35ca8 Request limiter setup: consider {:error, :existing} a success rinpatch 2020-06-30 18:35:15 +0300
  • 12fa5541f0 FollowRedirects: Unconditionally release the connection if there is an error rinpatch 2020-06-30 15:58:53 +0300
  • 9df5918974 config.exs: make gun the default again rinpatch 2020-06-23 15:52:57 +0300
  • 37f1e781cb Gun adapter helper: fix wildcard cert issues on OTP 23 rinpatch 2020-06-23 20:36:21 +0300
  • 007843b75e Add documentation for new connection pool settings and remove some rinpatch 2020-06-23 15:38:45 +0300
  • 7882f28569 Use erlang monotonic time for CRF calculation rinpatch 2020-06-17 12:54:13 +0300
  • 00926a63fb Adapter Helper: Use built-in ip address type rinpatch 2020-06-16 16:20:28 +0300
  • bf3492ceb3 Connection Pool: add tests rinpatch 2020-06-06 17:53:39 +0300
  • 721e89e88b Remove tests for old pool rinpatch 2020-05-28 14:06:18 +0300
  • 4128e3a84a HTTP: Implement max request limits rinpatch 2020-05-17 22:16:02 +0300
  • 94c8f3cfaf Use a custom pool-aware FollowRedirects middleware rinpatch 2020-05-16 11:49:19 +0300
  • 281ddd5e37 Connection pool: fix connections being supervised by gun_sup rinpatch 2020-05-08 19:57:11 +0300
  • 1b15cb066c Connection pool: Add client death tracking rinpatch 2020-05-08 18:18:59 +0300
  • e94ba05e52 Connection pool: Fix a possible infinite recursion if the pool is exhausted rinpatch 2020-05-07 16:11:48 +0300
  • 7738fbbaf5 Connection pool: implement logging and telemetry events rinpatch 2020-07-15 15:26:25 +0300
  • 0ffde499b8 Connection Pool: register workers using :via rinpatch 2020-07-15 15:24:47 +0300