Commit graph

  • 56ff02f2ef
    removing GunMock to use Mox Alexander Strizhakov 2020-03-06 20:23:58 +0300
  • 46f118d7e1 Merge branch 'revert-67cc4dce' into 'develop' feld 2020-03-06 16:03:24 +0000
  • 15d36b7f5f Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" feld 2020-03-06 15:56:41 +0000
  • e25bacabb1 Remove EmojiPacks from AdminFE build Mark Felder 2020-03-06 09:54:38 -0600
  • 67cc4dceb5 Merge branch 'update/admin-fe-without-emojipack' into 'develop' lain 2020-03-06 15:14:10 +0000
  • d283c9abc1 Remove emoji support from AdminFE Mark Felder 2020-03-06 07:53:33 -0600
  • 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-06 11:48:30 +0300
  • a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd rinpatch 2020-03-05 23:41:47 +0300
  • 4271cfb81a Merge branch 'stable' into release/2.0.0 rinpatch 2020-03-05 22:38:38 +0300
  • 7605fe5065 Merge branch 'stable' into release/2.0.0 rinpatch 2020-03-05 22:36:35 +0300
  • 3508ae7039 version bump changelog and mix version rinpatch 2020-03-05 22:35:23 +0300
  • 69a85e9c82 changelog: sync with stable rinpatch 2020-03-05 22:28:37 +0300
  • 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions. Ivan Tashkinov 2020-03-05 21:19:21 +0300
  • 931111fd55
    removing integration tests Alexander Strizhakov 2020-03-05 18:57:45 +0300
  • 058c9b01ac
    returning, not needed Alexander Strizhakov 2020-03-05 18:28:04 +0300
  • f0753eed0f
    removing try block in tesla request Alexander Strizhakov 2020-03-05 17:31:06 +0300
  • ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode eugenijm 2020-03-05 15:01:45 +0300
  • 47604907c9 Merge branch 'proper_error_messages' into 'develop' lain 2020-03-05 11:49:51 +0000
  • f1750b4658 Admin API tests: Fix wrong test. lain 2020-03-05 12:42:02 +0100
  • 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop' Haelwenn 2020-03-05 07:25:23 +0000
  • eb324467d9
    removing try block in getting gun info Alexander Strizhakov 2020-03-05 09:51:52 +0300
  • ec3dc462ff Document the instance stats fix Mark Felder 2020-03-04 13:41:04 -0600
  • cdb05633a6 Generate instance stats on startup Mark Felder 2020-03-04 13:33:26 -0600
  • 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' feld 2020-03-04 18:22:37 +0000
  • b34bc669b9
    adding descriptions Alexander Strizhakov 2020-03-04 20:09:18 +0300
  • 4bce13fa2f MastodonController: Return 404 errors correctly. lain 2020-03-04 18:09:06 +0100
  • fe47bcde8c
    updating tesla ref Alexander Strizhakov 2020-03-04 19:44:03 +0300
  • d6bebd4f9c
    moving some logic to tesla adapter Alexander Strizhakov 2020-03-04 18:13:24 +0300
  • 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop' lain 2020-03-04 12:43:06 +0000
  • 22d52f5691
    same copyright date format Alexander Strizhakov 2020-03-04 09:41:23 +0300
  • 6b2fb9160c
    otp version Alexander Strizhakov 2020-03-04 09:23:42 +0300
  • 8d9dee1ba9
    retry_timeout description change Alexander Strizhakov 2020-03-04 08:56:36 +0300
  • d9c5ae7c09 Update Copyrights for gun related files Mark Felder 2020-03-03 17:16:24 -0600
  • 4427161ca3 Merge branch 'develop' into gun Mark Felder 2020-03-03 17:15:49 -0600
  • 5992c256ad Merge branch 'chore/update-copyrights' into 'develop' Haelwenn 2020-03-03 23:15:12 +0000
  • 5592db4757 Older copyright updates Mark Felder 2020-03-03 16:46:45 -0600
  • 05da5f5cca Update Copyrights Mark Felder 2020-03-03 16:44:49 -0600
  • b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests. Ivan Tashkinov 2020-03-03 22:22:02 +0300
  • 884d9710b2
    refactoring for gun api modules Alexander Strizhakov 2020-03-03 19:24:14 +0300
  • 23f407bf09
    don't test gun itself Alexander Strizhakov 2020-03-03 18:57:16 +0300
  • f98ee730f0
    adapter renaming to adapter_helper Alexander Strizhakov 2020-03-03 18:53:44 +0300
  • 8854770fc4
    retry and retry_timeout settings default change Alexander Strizhakov 2020-03-03 18:01:35 +0300
  • 1ad34bfdba
    no try block in checkout connection Alexander Strizhakov 2020-03-03 17:44:04 +0300
  • 3723d72365
    proxy parse tests fix Alexander Strizhakov 2020-03-03 17:32:59 +0300
  • 24bf5c4e89
    remove try block from pool request Alexander Strizhakov 2020-03-03 17:27:56 +0300
  • aaa879ce75
    proxy parsing errors Alexander Strizhakov 2020-03-03 17:27:22 +0300
  • 6ebf389d6e
    poolboy timeout fix Alexander Strizhakov 2020-03-03 16:51:49 +0300
  • 7c0ed9302c
    unnecessary mock Alexander Strizhakov 2020-03-03 16:46:20 +0300
  • 8fc00b7cbf
    return error if connection failed to open Alexander Strizhakov 2020-03-03 16:27:46 +0300
  • 7d68924e4f
    naming Alexander Strizhakov 2020-03-03 16:08:21 +0300
  • e605e79df9
    simplification of formatting host method Alexander Strizhakov 2020-03-03 15:44:13 +0300
  • ee8071f0d5
    removing unused method Alexander Strizhakov 2020-03-03 15:12:09 +0300
  • 05429730e4
    unnecessary with Alexander Strizhakov 2020-03-03 15:11:48 +0300
  • d0e4d3ca3b
    removing unnecessary with Alexander Strizhakov 2020-03-03 14:56:49 +0300
  • 3508f698b9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-03-03 11:16:59 +0000
  • 4709928b06 thing sadposter 2020-03-03 11:14:58 +0000
  • 24d1ac125c
    hiding raise error logic to otp_version module Alexander Strizhakov 2020-03-03 13:24:19 +0300
  • 28ed4b41d0
    naming for checkin from pool timeout Alexander Strizhakov 2020-03-03 13:05:28 +0300
  • 151dc4e387 Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex Alexander Strizhakov 2020-03-03 09:53:37 +0000
  • 7eb6592992 Apply suggestion to lib/pleroma/pool/connections.ex Alexander Strizhakov 2020-03-03 09:53:31 +0000
  • a21a66972f Apply suggestion to lib/pleroma/http/http.ex Alexander Strizhakov 2020-03-03 09:52:01 +0000
  • 614e3934f9 Apply suggestion to lib/pleroma/http/http.ex Alexander Strizhakov 2020-03-03 09:50:42 +0000
  • d30ff35d94 Apply suggestion to lib/pleroma/http/request_builder.ex Alexander Strizhakov 2020-03-03 09:46:53 +0000
  • df3c59d928 Apply suggestion to docs/configuration/cheatsheet.md Alexander Strizhakov 2020-03-03 09:45:18 +0000
  • a3ad028973 Apply suggestion to lib/pleroma/http/adapter.ex Alexander Strizhakov 2020-03-03 09:34:36 +0000
  • 2c8d80dc0a Apply suggestion to lib/pleroma/pool/connections.ex Alexander Strizhakov 2020-03-03 09:29:57 +0000
  • 097ad10d02 Apply suggestion to lib/pleroma/pool/connections.ex Alexander Strizhakov 2020-03-03 09:29:51 +0000
  • 4c8569d403
    otp_version refactor Alexander Strizhakov 2020-03-03 12:19:29 +0300
  • 3ecdead31a
    debug logs on pleroma restart Alexander Strizhakov 2020-03-03 10:33:40 +0300
  • 509c81e4b1
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-03 10:08:07 +0300
  • 9b6c7843d6
    debian_based_*.md: Use erlang-nox metapackage Haelwenn (lanodan) Monnier 2020-03-03 04:58:12 +0100
  • 0f386110c6
    Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-03-03 00:32:34 +0400
  • 4f3313bf80
    Merge remote-tracking branch 'origin/develop' into fix/signup-without-email Egor Kislitsyn 2020-03-03 00:29:51 +0400
  • bd8624d649 [#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest. Ivan Tashkinov 2020-03-02 22:02:21 +0300
  • f987d83885 Clarify in docs how to control connections_pool for Gun. Mark Felder 2020-03-02 13:00:05 -0600
  • 85d571fc23 Move Tesla repo to our GitLab Mark Felder 2020-03-02 12:52:41 -0600
  • b4367125e9 [#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest. Ivan Tashkinov 2020-03-02 21:43:18 +0300
  • 4c02e04935 Merge branch 'prepared-statements-settings' into 'develop' lain 2020-03-02 17:00:04 +0000
  • 99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-02 18:41:12 +0300
  • 7af431c150 Exclude reblogs from GET /api/pleroma/admin/statuses by default eugenijm 2020-03-02 16:47:30 +0300
  • 4a45b96a91
    Merge branch 'develop' into fix/signup-without-email Egor Kislitsyn 2020-03-02 15:35:49 +0400
  • 45b08ca166 Merge branch 'docs_cheatsheet_fix' into 'develop' rinpatch 2020-03-02 10:05:03 +0000
  • 036e8a40a2 fix for :fetch_initial_posts ilja 2020-03-02 10:29:24 +0100
  • 764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop' Haelwenn 2020-03-02 07:58:01 +0000
  • 137c600cae
    stop connections manually Alexander Strizhakov 2020-03-02 10:01:07 +0300
  • cc98d010ed
    relay list shows hosts without accepted follow Alexander Strizhakov 2020-02-25 16:21:48 +0300
  • 2622cf1190
    returning repo parameters Alexander Strizhakov 2020-03-02 09:22:34 +0300
  • 6ceef768cb Merge branch 'chores/bump-copyright' into 'develop' Haelwenn 2020-03-02 05:15:13 +0000
  • 6da6540036
    Bump copyright years of files changed after 2020-01-07 Haelwenn (lanodan) Monnier 2020-03-02 06:08:45 +0100
  • 6c0d869d9d
    Bump copyright years of files changed after 2019-01-01 Haelwenn (lanodan) Monnier 2020-03-02 05:54:39 +0100
  • deb5f5c40e
    pleroma_api.md: direct_conversation_id vs. conversation_id Haelwenn (lanodan) Monnier 2020-03-02 04:01:37 +0100
  • 6471c09372 Merge branch 'docs_cheatsheet' into 'develop' rinpatch 2020-03-01 19:16:54 +0000
  • 53ef8c11b9 Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users) I also made a more explicit distinction between OTP and from source installs in the general explanation Ilja 2020-03-01 19:16:54 +0000
  • d9e4b77f8b
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-01 12:48:49 +0300
  • 400fbc7629
    wait in mix task while pleroma is rebooted Alexander Strizhakov 2020-02-18 18:10:39 +0300
  • 34f1d09f3a
    spec fix Alexander Strizhakov 2020-01-17 11:51:08 +0300
  • ba87ed7335
    fix for compiling Alexander Strizhakov 2019-12-30 12:35:41 +0300
  • 32d1e04817
    ActivityPub actions & side-effects in transaction Alexander Strizhakov 2019-12-30 11:30:20 +0300
  • 523f73dccd Fix static FE plug to handle missing Accept header. Phil Hagelberg 2020-02-29 18:53:49 -0800
  • 438394d404 Merge branch 'fix/easy-timeline-dos' into 'develop' rinpatch 2020-02-29 23:08:14 +0000