Commit Graph

  • 53c3e99039 add tunable for streaming. develop Rachel Fae Fox (foxiepaws) 2019-09-23 15:18:25 -0400
  • 22923690bc revert s3.ex Rachel Fae Fox (foxiepaws) 2019-09-23 14:43:07 -0400
  • 065accdfbb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Rachel Fae Fox (foxiepaws) 2019-09-23 13:39:33 -0400
  • 472e7b796c Merge branch 'config/update-mongoose' into 'develop' Haelwenn 2019-09-20 13:21:07 +0000
  • df3feb9412 Make it obvious how to support dual stack for MongooseIM feld 2019-09-20 13:21:07 +0000
  • c4da7499a3 Merge branch 'conversation-docs' into 'develop' rinpatch 2019-09-19 19:04:55 +0000
  • fe4db3b94e API Docs: Document conversation ids. lain 2019-09-19 21:01:05 +0200
  • c1e011624d Merge branch 'docs/clients-update' into 'develop' Haelwenn 2019-09-19 18:01:49 +0000
  • b80c41a14f Merge branch 'outbox_pagination' into 'develop' lain 2019-09-19 16:53:59 +0000
  • 9aca2cc95d Add test for correct AP outbox pagination D Anzorge 2019-09-19 16:09:24 +0200
  • 9c8a94bae2 Merge branch 'direct_conversation_id_on_status_creation' into 'develop' rinpatch 2019-09-19 14:34:24 +0000
  • 0e6085da10 Fix pagination in AP outbox.json D Anzorge 2019-09-19 16:09:07 +0200
  • fe5e0b7846 Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`) eugenijm 2019-09-19 08:27:55 +0300
  • f95a2b2cda Merge branch 'issue/733' into 'develop' Haelwenn 2019-09-18 22:28:10 +0000
  • b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop' rinpatch 2019-09-18 21:57:49 +0000
  • 447514dfa2
    Bump copyright years of files changed in 2019 Haelwenn (lanodan) Monnier 2019-09-18 23:20:54 +0200
  • c3856bed0c
    docs/clients.md: Update source code urls Haelwenn (lanodan) Monnier 2019-09-18 23:17:15 +0200
  • ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop' feld 2019-09-18 21:13:15 +0000
  • 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop' feld 2019-09-18 21:11:37 +0000
  • 220afadc55 Merge branch 'restore-tests' into 'develop' feld 2019-09-18 21:05:18 +0000
  • 76a1019f41 Merge branch 'chore/refetch-poll-changelog-update' into 'develop' rinpatch 2019-09-18 21:00:51 +0000
  • 56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop' Haelwenn 2019-09-18 21:00:09 +0000
  • a22b87b30c Add a changelog entry for poll refetching rinpatch 2019-09-19 00:00:05 +0300
  • e32d099a3a Merge branch 'feature/poll-refresh' into 'develop' Haelwenn 2019-09-18 20:58:53 +0000
  • a12aeb09c4 Cleanup uploads after the tests are finished rinpatch 2019-09-18 23:34:13 +0300
  • 5028b7b578 Fix credo issues rinpatch 2019-09-18 22:09:03 +0300
  • c096dd86e5 Do not refetch local objects rinpatch 2019-09-18 19:59:23 +0300
  • eb87a86b5b Preserve internal fields when reinjecting rinpatch 2019-09-18 19:53:51 +0300
  • d32894ae51 Move object internal fields to a constant rinpatch 2019-09-18 19:24:20 +0300
  • e3f902b3a1 Set updated_at even if the object stayed the same rinpatch 2019-09-18 19:07:25 +0300
  • a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff rinpatch 2019-09-18 18:52:33 +0300
  • 84a40f6f26 Capture log in object refetch tests rinpatch 2019-09-18 18:31:24 +0300
  • 5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop' Haelwenn 2019-09-18 15:31:03 +0000
  • 7ef575d11e Initial poll refresh support rinpatch 2019-09-18 18:13:21 +0300
  • a18f1e7cd7 namings Alex S 2019-09-13 08:07:29 +0300
  • 17ff63b3c3 docs fix Alex S 2019-09-07 08:56:22 +0300
  • 2263c8b6b9 little fixes Alex S 2019-09-06 17:20:44 +0300
  • 4faf2b1555 post for creating invite tokens in admin api Alex S 2019-09-06 17:14:31 +0300
  • 40c968626d Merge branch 'chore/changelog-separate-1.1' into 'develop' Haelwenn 2019-09-17 21:30:58 +0000
  • ea6d4137da Apply suggestion to CHANGELOG.md rinpatch 2019-09-17 21:24:21 +0000
  • e501c822c9
    markdown.ex: put two-spaces before the description-newline Haelwenn (lanodan) Monnier 2019-09-17 23:02:24 +0200
  • 4785596a2c
    markdown.ex: end suggestions list with a newline Haelwenn (lanodan) Monnier 2019-09-17 22:55:29 +0200
  • d2097fd0f5
    markdown.ex: \n\n on >1 suggestions, 2-spaces on one Haelwenn (lanodan) Monnier 2019-09-17 22:33:32 +0200
  • d6182a3c8f
    markdown.ex: Make suggestion(s) plural only if on >1 Haelwenn (lanodan) Monnier 2019-09-17 22:22:54 +0200
  • 32d64102cb
    description.exs: uncomment type for email logo Haelwenn (lanodan) Monnier 2019-09-17 22:19:30 +0200
  • c0c5628200
    description.exs: remove empty strings on descriptions Haelwenn (lanodan) Monnier 2019-09-17 22:14:56 +0200
  • 106afaed58
    markdown.ex: do not fail if there is no children Haelwenn (lanodan) Monnier 2019-09-17 22:04:21 +0200
  • e0d8c8897e
    docs/markdown.ex: do no print empty suggestions Haelwenn (lanodan) Monnier 2019-09-17 22:00:02 +0200
  • 50ec445b2c
    description.exs: remove empty strings and arrays Haelwenn (lanodan) Monnier 2019-09-17 21:57:13 +0200
  • bf8567996c Sync develop changelog with master and create a new section for post-1.1 changes rinpatch 2019-09-17 23:48:26 +0300
  • f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop' rinpatch 2019-09-17 20:09:26 +0000
  • e686f9be81 Apply suggestion to CHANGELOG.md Maxim Filippov 2019-09-17 20:04:57 +0000
  • 7f211a48e0
    docs/markdown.ex: child header as "- key (type): description" Haelwenn (lanodan) Monnier 2019-09-17 21:43:27 +0200
  • 35dcea3e13
    Remove [true,false] for booleans, it is implicit Haelwenn (lanodan) Monnier 2019-09-13 17:05:19 +0200
  • 764931fc9f Merge branch 'deps/update-tesla' into 'develop' feld 2019-09-17 19:37:29 +0000
  • 228bfd8a70 Bump elixir version to ~> 1.8 Maxim Filippov 2019-09-17 22:36:42 +0300
  • 0447c42715 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 22:20:39 +0300
  • 79376abae3 Merge branch 'support/package_versions' into 'develop' rinpatch 2019-09-17 19:12:24 +0000
  • ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop' rinpatch 2019-09-17 19:09:56 +0000
  • d201eec45c fixed ecto version Maksim Pechnikov 2019-09-17 22:02:37 +0300
  • 8d812c28a7 Update Tesla to 1.3 rinpatch 2019-09-17 21:51:50 +0300
  • 7dd51652f9 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 21:20:08 +0300
  • 7318095657 Merge branch 'fix-notification-warnings' into 'develop' rinpatch 2019-09-17 18:12:27 +0000
  • 6193157f19 Fix notification warnings Steven Fuchs 2019-09-17 18:12:27 +0000
  • 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' Haelwenn 2019-09-17 17:16:39 +0000
  • 95a4a19417 Merge branch 'support/tests' into 'develop' rinpatch 2019-09-17 14:47:26 +0000
  • 1fc8fabecf Merge branch 'eliminate-test-errors' into 'develop' rinpatch 2019-09-17 14:44:52 +0000
  • 80c5c3495b remove remaining errors from tests Steven Fuchs 2019-09-17 14:44:52 +0000
  • bb6d172e74 Merge branch 'deps/update-oban' into 'develop' rinpatch 2019-09-17 13:55:01 +0000
  • 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`) eugenijm 2019-09-13 17:37:30 +0300
  • a21584556f Update oban to 0.8.1 rinpatch 2019-09-17 13:04:43 +0300
  • a58f29b826 Merge branch 'update-fields-limit' into 'develop' Haelwenn 2019-09-16 15:11:05 +0000
  • d6ab78e610 Set `account_field_value_length` limit to 2048 by default Egor Kislitsyn 2019-09-16 21:48:01 +0700
  • 085d014f08 Fix `Transmogrifier.upgrade_user_from_ap_id/1` Egor Kislitsyn 2019-09-16 19:26:00 +0700
  • 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports Maxim Filippov 2019-09-16 14:40:17 +0300
  • 409e701ab8 Merge branch 'fix/develop' into 'develop' rinpatch 2019-09-16 10:59:44 +0000
  • 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" Egor Kislitsyn 2019-09-16 17:03:37 +0700
  • 4397a3fe4a Merge branch 'fix/signed-fetch-inclusion-test' into 'develop' rinpatch 2019-09-16 10:34:03 +0000
  • e8120944d8 Fix signed fetch inclusion publisher test rinpatch 2019-09-16 13:23:06 +0300
  • fe7fd33126 Merge branch 'revert-4fabf83a' into 'develop' kaniini 2019-09-16 09:09:32 +0000
  • c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" kaniini 2019-09-16 09:09:21 +0000
  • 4fabf83ad0 Merge branch 'streamer-refactoring' into 'develop' kaniini 2019-09-16 07:44:03 +0000
  • aab264db82 Streamer refactoring Steven Fuchs 2019-09-16 07:44:03 +0000
  • 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' kaniini 2019-09-16 07:39:58 +0000
  • d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop' kaniini 2019-09-16 07:37:54 +0000
  • 74eba5afe2 Merge branch 'fix/race-in-tests' into 'develop' kaniini 2019-09-16 07:36:57 +0000
  • ca88e37a8f Fix a race condition in tests Egor Kislitsyn 2019-09-16 12:55:05 +0700
  • 43f17c2e67 Restore tests for `change_password` and `delete_account` Egor Kislitsyn 2019-09-12 19:04:55 +0700
  • d75bc728e7 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-16 07:34:22 +0300
  • 2990c0a53b Merge branch '1149-oban-job-queue' into 'develop' rinpatch 2019-09-15 20:22:17 +0000
  • b4cf74c106 added prepare html for RichMedia.Parser Maksim Pechnikov 2019-09-15 14:53:58 +0300
  • 8751809e1e Merge branch 'develop' into support/tests Maksim Pechnikov 2019-09-15 14:07:07 +0300
  • 3b8ec98b0e [#1149] Reinstated docs/config.md changes. Ivan Tashkinov 2019-09-15 10:15:57 +0300
  • 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-15 10:12:24 +0300
  • 9c64a25713 Merge branch 'config-changes' into 'develop' rinpatch 2019-09-14 17:26:35 +0000
  • 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop' rinpatch 2019-09-14 16:39:42 +0000
  • e127b9ab6d [#1149] Rewritten readme as config/description.exs. Ivan Tashkinov 2019-09-14 16:28:59 +0300
  • 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-14 16:11:44 +0300
  • 3ae448b592 Merge branch 'fix-tests' into 'develop' rinpatch 2019-09-14 12:36:08 +0000
  • b870ae08fd Fix `Activity.all_by_actor_and_id/2` test Egor Kislitsyn 2019-09-14 19:31:20 +0700