Commit Graph

  • 4264c4b7e5 Merge branch 'security/fav-reblog-access-control' into 'develop' rinpatch 2019-09-14 11:44:34 +0000
  • a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:50:08 +0000
  • 85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:46:35 +0000
  • 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints rinpatch 2019-09-14 01:50:15 +0300
  • a9b78f55e3 Merge branch 'capture-test-errors' into 'develop' lain 2019-09-13 17:07:14 +0000
  • 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop' lain 2019-09-13 17:06:38 +0000
  • ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking rinpatch 2019-09-13 19:42:53 +0300
  • ac4a748fad Disallow NULLs in deliveries rinpatch 2019-09-13 19:28:35 +0300
  • 4da0da9aa4 don't track generated_config.md Alex S 2019-09-13 19:13:04 +0300
  • c625fe6f09 config.md back Alex S 2019-09-13 19:03:39 +0300
  • 69faec031d markdown generation to the new file Alex S 2019-09-13 19:02:42 +0300
  • 25a64a4aa0 Capture test error messages where appropriate stwf 2019-09-13 11:46:41 -0400
  • 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 15:25:15 +0000
  • 05f8a066a1 Apply suggestion to lib/pleroma/delivery.ex rinpatch 2019-09-13 15:23:26 +0000
  • 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 15:23:03 +0000
  • 53a3ad6043 Merge branch 'cleanup-activity' into 'develop' lain 2019-09-13 14:48:00 +0000
  • 0d9609894f Merge branch 'feature/change-email' into 'develop' Haelwenn 2019-09-13 12:46:16 +0000
  • f884987ace Merge branch 'admin-config-description' into 'develop' rinpatch 2019-09-13 12:36:24 +0000
  • 3896a51b8a Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 10:09:56 +0000
  • 5170170483 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 10:09:46 +0000
  • fb96facc32 Remove unused functions and fix credo issues rinpatch 2019-09-13 12:06:31 +0300
  • ce23529d91 Use delivery info when federating deletes rinpatch 2019-09-13 11:36:49 +0300
  • 7b5c81b391 Add a note about compatibility with Mastodon Egor Kislitsyn 2019-08-28 14:50:58 +0700
  • 25d8216804 Add email change endpoint Egor Kislitsyn 2019-09-13 13:09:35 +0700
  • 5bfbad13ad Add more tests for Pleroma.Activity Egor Kislitsyn 2019-09-03 21:33:02 +0700
  • 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils Egor Kislitsyn 2019-09-03 21:58:30 +0700
  • 5ca643b80d Merge branch 'fix/admin-api-docs' into 'develop' kaniini 2019-09-13 03:31:16 +0000
  • 528a88a686 Fix admin api docs for creating users Angelina Filippova 2019-09-13 03:31:16 +0000
  • 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop' Haelwenn 2019-09-12 20:21:56 +0000
  • b0e6058021 Parse http signature for request to objects/activities rinpatch 2019-09-12 22:40:53 +0300
  • dabc4a00f5 Put the cache with the right key when using a tracking function rinpatch 2019-09-12 22:10:15 +0300
  • 769fb778d4 Track object/create activity fetches rinpatch 2019-09-12 21:37:36 +0300
  • 102eb4455c Fix associated test as well Mark Felder 2019-09-12 12:29:08 -0500
  • 4f548cb2b7 added test for Ostatus Maksim Pechnikov 2019-09-12 09:59:34 +0300
  • 74e4c72c4a Fix double quotes in error logs Mark Felder 2019-09-11 16:16:09 -0500
  • 50269e9cac Merge branch 'feature/jason-view-render' into 'develop' kaniini 2019-09-11 20:47:25 +0000
  • 56828abf6d Use Jason for rendering responses rinpatch 2019-09-11 23:04:01 +0300
  • 46ae62d159 Merge branch 'patch-5' into 'develop' Haelwenn 2019-09-11 17:47:19 +0000
  • fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop' lain 2019-09-11 11:21:03 +0000
  • 5a76d5d239 Add extended benchmark rinpatch 2019-09-10 23:08:15 +0300
  • e47089cf55 web_cache_ttl description Alex S 2019-09-11 09:32:58 +0300
  • 38b29779c3 refactoring Alex S 2019-09-03 20:11:32 +0300
  • be32d90a0c little refactor Alex S 2019-09-03 20:06:22 +0300
  • 5ff12e7df1 some changes Alex S 2019-09-03 19:22:25 +0300
  • aa7fb22008 placeholder for config.md Alex S 2019-09-03 12:32:00 +0300
  • 57dc59d98d little fix Alex S 2019-09-03 12:31:43 +0300
  • 6b0e8b73df bump ex_doc version Alex S 2019-09-03 12:30:44 +0300
  • 10827eecad formatting Alex S 2019-09-03 11:56:21 +0300
  • 35757b6d0e don't add behaviour to suggestions Alex S 2019-09-03 09:45:54 +0300
  • 5db2920644 Apply suggestion to config/description.exs Alexander Strizhakov 2019-09-03 06:45:16 +0000
  • 65bc9e66ad Apply suggestion to config/description.exs Alexander Strizhakov 2019-09-03 06:45:02 +0000
  • 0624e06a9c little fix Alex S 2019-08-30 20:14:18 +0300
  • 8f5ee7db06 typo fix Alex S 2019-08-30 19:59:13 +0300
  • 6721301086 some changes Alex S 2019-08-30 19:14:01 +0300
  • 0559c82bdb fix Alex S 2019-08-30 14:27:55 +0300
  • 68e45a327f changelog Alex S 2019-08-30 14:09:07 +0300
  • a1f2dfb10a expanding regex sigils to use modifiers Alex S 2019-08-30 14:04:21 +0300
  • 511d93fa54 mix docs generates config.md Alex S 2019-08-30 13:22:21 +0300
  • 67e4300931 description formatters Alex S 2019-08-30 13:21:48 +0300
  • 171cefd889 description.exs Alex S 2019-08-30 13:20:09 +0300
  • ab4960cc7f deleting old config.md file Alex S 2019-08-30 12:00:36 +0300
  • 43f02dfe38 Revert "Parallelize template rendering" rinpatch 2019-09-10 22:01:45 +0300
  • 69800055f1 Merge branch 'fix/tests' into 'develop' lain 2019-09-10 18:53:41 +0000
  • 3d12e05f43 Fix `Activity.all_by_ids_with_object/1` test Egor Kislitsyn 2019-09-11 01:08:37 +0700
  • d8b76c79f2 Merge branch 'statuses-by-ids' into 'develop' lain 2019-09-10 17:04:12 +0000
  • 30f0cec49a Add note about limit to the doc Egor Kislitsyn 2019-09-03 16:58:33 +0700
  • b40b10b53d Add an endpoint to get multiple statuses by IDs Egor Kislitsyn 2019-09-03 16:23:03 +0700
  • ceb2e09126 Merge branch 'cache-plug' into 'develop' feld 2019-09-09 18:53:09 +0000
  • 11e12b5761 Add Pleroma.Plugs.Cache minibikini 2019-09-09 18:53:08 +0000
  • bce16f4557 Merge branch 'update-changelog' into 'develop' feld 2019-09-09 18:39:44 +0000
  • e34de00052 Update CHANGELOG (add a note about !1649) Egor Kislitsyn 2019-09-10 01:30:02 +0700
  • edbaf78176 Merge branch 'fix/read-inbox' into 'develop' feld 2019-09-09 18:21:29 +0000
  • e0f84d0043 Fix `ActivityPubController.read_inbox/2` Egor Kislitsyn 2019-09-10 01:11:57 +0700
  • 45006997d2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Rachel Fae Fox (foxiepaws) 2019-09-08 15:01:06 -0400
  • c3f00447af Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-08 08:41:10 +0300
  • e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs shadowfacts 2019-09-07 19:50:45 +0000
  • 39f99dc6cd Merge branch 'develop' into support/tests Maksim Pechnikov 2019-09-07 22:13:43 +0300
  • c45013df8e Merge branch 'chore/query-optimization' into 'develop' kaniini 2019-09-06 23:25:30 +0000
  • 40a61532ca activity: when restricting deactivated users, precalculate the user list Ariadne Conill 2019-09-06 23:14:29 +0000
  • 5effb2cbca activitypub: help ecto build a better query for thread mute filtering Ariadne Conill 2019-09-06 23:11:26 +0000
  • 130bc8e0d5 Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop' rinpatch 2019-09-06 15:29:03 +0000
  • f92dc82dda Prioritize the removal of TwitterAPI and :accept_blocks in the changelog rinpatch 2019-09-06 18:28:01 +0300
  • ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-06 13:26:05 +0300
  • 40b3289c26 Refactor `add_link_headers/7` -> `add_link_headers/3` Egor Kislitsyn 2019-09-06 17:08:47 +0700
  • 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop' rinpatch 2019-09-06 08:43:38 +0000
  • d0e0f2380d Merge branch 'update-frontend-e75ac9dd' into 'develop' rinpatch 2019-09-06 08:41:30 +0000
  • 16e6be340d Update frontend bundle to e75ac9dd rinpatch 2019-09-06 11:31:44 +0300
  • 592ce8a74f Merge branch 'hotifx/emoji-trailing' into 'develop' rinpatch 2019-09-05 19:23:52 +0000
  • 3523bdcf26 Call TrailingFormatPlug for /api/pleroma/emoji rinpatch 2019-09-05 22:21:20 +0300
  • 736165c082 Reverse reports list Maxim Filippov 2019-09-05 16:54:34 +0300
  • fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop' Haelwenn 2019-09-05 12:48:27 +0000
  • 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname rinpatch 2019-09-05 15:33:49 +0300
  • 9d4fc9aa35 Merge branch 'fix/endless-poll-handling' into 'develop' rinpatch 2019-09-05 09:11:16 +0000
  • b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date rinpatch 2019-09-05 11:58:02 +0300
  • 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-05 11:30:41 +0300
  • 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop' rinpatch 2019-09-05 05:47:06 +0000
  • 558969a0fd Do not crash if one notification failed to render rinpatch 2019-09-05 08:32:49 +0300
  • 3b8d64ee24 Merge branch 'dockerfile-touchups' into 'develop' rinpatch 2019-09-04 20:22:41 +0000
  • 053b17f57e Switch to alpine:3.9 to avoid dlsym errors Ashlynn Anderson 2019-09-04 14:56:26 -0400
  • ae506ca997 fix formatting Maksim Pechnikov 2019-09-04 21:40:53 +0300