Commit graph

  • 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
  • efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-15 18:52:27 +0300
  • e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). Ivan Tashkinov 2019-09-15 18:22:08 +0300
  • 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
  • 6c3f5e8ba0 Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1' rinpatch 2019-09-14 18:14:54 +0000
  • c64ab84e6a Merge branch 'fix-tests' into 'develop' rinpatch 2019-09-14 12:36:08 +0000
  • e71d662d3a Merge branch 'cherry-pick-9c64a257' into 'maint/1.1' rinpatch 2019-09-14 18:14:21 +0000
  • ea1867f48e Merge branch 'config-changes' into 'develop' rinpatch 2019-09-14 17:26:35 +0000
  • 9c64a25713 Merge branch 'config-changes' into 'develop' rinpatch 2019-09-14 17:26:35 +0000
  • c137545a84 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-09-14 17:40:40 +0100
  • 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop' rinpatch 2019-09-14 16:39:42 +0000
  • d7457c9165 Merge branch 'develop' into refactor/subscription Roman Chvanikov 2019-09-14 18:29:51 +0300
  • 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
  • 90b0bd3984 Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1' rinpatch 2019-09-14 12:34:21 +0000
  • b870ae08fd Fix Activity.all_by_actor_and_id/2 test Egor Kislitsyn 2019-09-14 19:31:20 +0700
  • dca545bb0d Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:50:08 +0000
  • ae33cca4cf Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:46:35 +0000
  • 056780fd8e Mastodon API: Respect post privacy in favourited/reblogged endpoints rinpatch 2019-09-14 01:50:15 +0300
  • 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
  • ab55e41626 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-09-14 00:20:56 +0100
  • b4512ddb6f thing sadposter 2019-09-14 00:20:48 +0100
  • 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
  • 6fe2f554c3 Emoji: Generate emoji detecting functions at compile time. lain 2019-09-13 18:27:32 +0200
  • 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
  • 0bd2b85edb Separate Subscription Notifications from regular Notifications Roman Chvanikov 2019-09-13 18:25:27 +0300
  • 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 15:25:15 +0000
  • f1e1ba71ce update tos sadposter 2019-09-13 16:23:28 +0100
  • 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
  • 8046440a16 update fe sadposter 2019-09-13 16:18:38 +0100
  • 53a3ad6043 Merge branch 'cleanup-activity' into 'develop' lain 2019-09-13 14:48:00 +0000
  • 3ff5532220 Linting. lain 2019-09-13 16:41:30 +0200
  • a7f31bf06c Merge remote-tracking branch 'origin/develop' into reactions lain 2019-09-13 16:31:27 +0200
  • cc5b65bd21 add lato sadposter 2019-09-13 15:27:51 +0100
  • f649a2e972 Pleroma API Docs: Documented Emoji reaction endpoints. lain 2019-09-13 16:19:50 +0200
  • e5b3ad3d04 ActivityPub: Use is_unicode_emoji? function. lain 2019-09-13 16:06:34 +0200
  • 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
  • bc3e8c033b fix formatting Maksim Pechnikov 2019-09-13 15:06:34 +0300
  • ec5aaf5bd7 fix tests Maksim Pechnikov 2019-09-13 14:59:58 +0300
  • 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
  • d8a178274b fix Activity.get_by_id Maksim Pechnikov 2019-09-13 07:12:34 +0300
  • 58b17196fa Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs Maksim 2019-09-13 03:58:58 +0000
  • 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-13 06:55:05 +0300
  • 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
  • a697f0d791 Emoji: Add function to detect if a character is an emoji lain 2019-09-13 02:11:02 +0200
  • 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
  • 936951826e Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-12 22:15:43 +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
  • 8d4b661ecb Transmogrifier: Strip internal emoji reaction fields. lain 2019-09-12 18:59:13 +0200
  • 05e9776517 PleromaAPIController: Add endpoint to fetch emoji reactions. lain 2019-09-12 18:48:25 +0200
  • 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
  • 007e0c1ce1 added tests Maksim Pechnikov 2019-09-11 23:19:06 +0300
  • 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