phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 7318095657 Merge branch 'fix-notification-warnings' into 'develop' rinpatch 2019-09-17 18:12:27 +00:00
  • 6193157f19 Fix notification warnings Steven Fuchs 2019-09-17 18:12:27 +00:00
  • 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' Haelwenn 2019-09-17 17:16:39 +00:00
  • 95a4a19417 Merge branch 'support/tests' into 'develop' rinpatch 2019-09-17 14:47:26 +00:00
  • 1fc8fabecf Merge branch 'eliminate-test-errors' into 'develop' rinpatch 2019-09-17 14:44:52 +00:00
  • 80c5c3495b remove remaining errors from tests Steven Fuchs 2019-09-17 14:44:52 +00:00
  • 9fa2586abd Refactor SubscriptionNotificationView Roman Chvanikov 2019-09-17 17:44:10 +03:00
  • bb6d172e74 Merge branch 'deps/update-oban' into 'develop' rinpatch 2019-09-17 13:55:01 +00:00
  • e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders Roman Chvanikov 2019-09-17 16:52:23 +03:00
  • 7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show Roman Chvanikov 2019-09-17 16:48:24 +03:00
  • a76168e743 Cleanup PleromaAPIController Roman Chvanikov 2019-09-17 16:44:41 +03:00
  • 015597c2ab Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs Roman Chvanikov 2019-09-17 13:43:15 +00:00
  • a81f80233d Apply suggestion to lib/pleroma/web/router.ex Roman Chvanikov 2019-09-17 13:43:10 +00:00
  • f9be517c7f Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:40 +00:00
  • c0f776faec Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:36 +00:00
  • 2688b876ab Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex Roman Chvanikov 2019-09-17 13:42:28 +00:00
  • e7afb67c5c [#1260] Rate-limiting for create authentication and related requests. Ivan Tashkinov 2019-09-17 16:16:11 +03:00
  • 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 +03:00
  • a21584556f Update oban to 0.8.1 rinpatch 2019-09-17 13:04:43 +03:00
  • 6042e21b25 Move subscription notifications to a separate controller Roman Chvanikov 2019-09-16 21:59:49 +03:00
  • 56b60798c2 Code style fixes Roman Chvanikov 2019-09-16 20:50:14 +03:00
  • 76c3e290fc Merge develop Roman Chvanikov 2019-09-16 20:30:42 +03:00
  • df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters Maxim Filippov 2019-09-16 19:44:06 +03:00
  • a58f29b826 Merge branch 'update-fields-limit' into 'develop' Haelwenn 2019-09-16 15:11:05 +00:00
  • d6ab78e610 Set account_field_value_length limit to 2048 by default Egor Kislitsyn 2019-09-16 21:48:01 +07:00
  • 085d014f08 Fix Transmogrifier.upgrade_user_from_ap_id/1 Egor Kislitsyn 2019-09-16 19:26:00 +07:00
  • 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports Maxim Filippov 2019-09-16 14:40:17 +03:00
  • 409e701ab8 Merge branch 'fix/develop' into 'develop' rinpatch 2019-09-16 10:59:44 +00:00
  • 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" Egor Kislitsyn 2019-09-16 17:03:37 +07:00
  • 4397a3fe4a Merge branch 'fix/signed-fetch-inclusion-test' into 'develop' rinpatch 2019-09-16 10:34:03 +00:00
  • e8120944d8 Fix signed fetch inclusion publisher test rinpatch 2019-09-16 13:23:06 +03:00
  • fe7fd33126 Merge branch 'revert-4fabf83a' into 'develop' kaniini 2019-09-16 09:09:32 +00:00
  • c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" kaniini 2019-09-16 09:09:21 +00:00
  • 4fabf83ad0 Merge branch 'streamer-refactoring' into 'develop' kaniini 2019-09-16 07:44:03 +00:00
  • aab264db82 Streamer refactoring Steven Fuchs 2019-09-16 07:44:03 +00:00
  • 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' kaniini 2019-09-16 07:39:58 +00:00
  • d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop' kaniini 2019-09-16 07:37:54 +00:00
  • 74eba5afe2 Merge branch 'fix/race-in-tests' into 'develop' kaniini 2019-09-16 07:36:57 +00:00
  • ca88e37a8f Fix a race condition in tests Egor Kislitsyn 2019-09-16 12:55:05 +07:00
  • 43f17c2e67 Restore tests for change_password and delete_account Egor Kislitsyn 2019-09-12 19:04:55 +07:00
  • d75bc728e7 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-16 07:34:22 +03:00
  • 2990c0a53b Merge branch '1149-oban-job-queue' into 'develop' rinpatch 2019-09-15 20:22:17 +00:00
  • 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 +03:00
  • e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). Ivan Tashkinov 2019-09-15 18:22:08 +03:00
  • b4cf74c106 added prepare html for RichMedia.Parser Maksim Pechnikov 2019-09-15 14:53:58 +03:00
  • 8751809e1e Merge branch 'develop' into support/tests Maksim Pechnikov 2019-09-15 14:07:07 +03:00
  • 3b8ec98b0e [#1149] Reinstated docs/config.md changes. Ivan Tashkinov 2019-09-15 10:15:57 +03:00
  • 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-15 10:12:24 +03:00
  • 6c3f5e8ba0 Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1' rinpatch 2019-09-14 18:14:54 +00:00
  • c64ab84e6a Merge branch 'fix-tests' into 'develop' rinpatch 2019-09-14 12:36:08 +00:00
  • e71d662d3a Merge branch 'cherry-pick-9c64a257' into 'maint/1.1' rinpatch 2019-09-14 18:14:21 +00:00
  • ea1867f48e Merge branch 'config-changes' into 'develop' rinpatch 2019-09-14 17:26:35 +00:00
  • 9c64a25713 Merge branch 'config-changes' into 'develop' rinpatch 2019-09-14 17:26:35 +00:00
  • 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop' rinpatch 2019-09-14 16:39:42 +00:00
  • d7457c9165 Merge branch 'develop' into refactor/subscription Roman Chvanikov 2019-09-14 18:29:51 +03:00
  • e127b9ab6d [#1149] Rewritten readme as config/description.exs. Ivan Tashkinov 2019-09-14 16:28:59 +03:00
  • 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-14 16:11:44 +03:00
  • 3ae448b592 Merge branch 'fix-tests' into 'develop' rinpatch 2019-09-14 12:36:08 +00:00
  • 90b0bd3984 Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1' rinpatch 2019-09-14 12:34:21 +00:00
  • b870ae08fd Fix Activity.all_by_actor_and_id/2 test Egor Kislitsyn 2019-09-14 19:31:20 +07:00
  • dca545bb0d Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:50:08 +00:00
  • ae33cca4cf Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:46:35 +00:00
  • 056780fd8e Mastodon API: Respect post privacy in favourited/reblogged endpoints rinpatch 2019-09-14 01:50:15 +03:00
  • 4264c4b7e5 Merge branch 'security/fav-reblog-access-control' into 'develop' rinpatch 2019-09-14 11:44:34 +00:00
  • a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:50:08 +00:00
  • 85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs rinpatch 2019-09-14 10:46:35 +00:00
  • 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints rinpatch 2019-09-14 01:50:15 +03:00
  • a9b78f55e3 Merge branch 'capture-test-errors' into 'develop' lain 2019-09-13 17:07:14 +00:00
  • 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop' lain 2019-09-13 17:06:38 +00:00
  • ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking rinpatch 2019-09-13 19:42:53 +03:00
  • ac4a748fad Disallow NULLs in deliveries rinpatch 2019-09-13 19:28:35 +03:00
  • 6fe2f554c3 Emoji: Generate emoji detecting functions at compile time. lain 2019-09-13 18:27:32 +02:00
  • 4da0da9aa4 don't track generated_config.md Alex S 2019-09-13 19:13:04 +03:00
  • c625fe6f09 config.md back Alex S 2019-09-13 19:03:39 +03:00
  • 69faec031d markdown generation to the new file Alex S 2019-09-13 19:02:42 +03:00
  • 25a64a4aa0 Capture test error messages where appropriate stwf 2019-09-13 11:46:41 -04:00
  • 0bd2b85edb Separate Subscription Notifications from regular Notifications Roman Chvanikov 2019-09-13 18:25:27 +03:00
  • 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 15:25:15 +00:00
  • 05f8a066a1 Apply suggestion to lib/pleroma/delivery.ex rinpatch 2019-09-13 15:23:26 +00:00
  • 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 15:23:03 +00:00
  • 53a3ad6043 Merge branch 'cleanup-activity' into 'develop' lain 2019-09-13 14:48:00 +00:00
  • 3ff5532220 Linting. lain 2019-09-13 16:41:30 +02:00
  • a7f31bf06c Merge remote-tracking branch 'origin/develop' into reactions lain 2019-09-13 16:31:27 +02:00
  • f649a2e972 Pleroma API Docs: Documented Emoji reaction endpoints. lain 2019-09-13 16:19:50 +02:00
  • e5b3ad3d04 ActivityPub: Use is_unicode_emoji? function. lain 2019-09-13 16:06:34 +02:00
  • 0d9609894f Merge branch 'feature/change-email' into 'develop' Haelwenn 2019-09-13 12:46:16 +00:00
  • f884987ace Merge branch 'admin-config-description' into 'develop' rinpatch 2019-09-13 12:36:24 +00:00
  • bc3e8c033b fix formatting Maksim Pechnikov 2019-09-13 15:06:34 +03:00
  • ec5aaf5bd7 fix tests Maksim Pechnikov 2019-09-13 14:59:58 +03:00
  • 3896a51b8a Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 10:09:56 +00:00
  • 5170170483 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex rinpatch 2019-09-13 10:09:46 +00:00
  • fb96facc32 Remove unused functions and fix credo issues rinpatch 2019-09-13 12:06:31 +03:00
  • ce23529d91 Use delivery info when federating deletes rinpatch 2019-09-13 11:36:49 +03:00
  • 7b5c81b391 Add a note about compatibility with Mastodon Egor Kislitsyn 2019-08-28 14:50:58 +07:00
  • 25d8216804 Add email change endpoint Egor Kislitsyn 2019-09-13 13:09:35 +07:00
  • 5bfbad13ad Add more tests for Pleroma.Activity Egor Kislitsyn 2019-09-03 21:33:02 +07:00
  • 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils Egor Kislitsyn 2019-09-03 21:58:30 +07:00
  • d8a178274b fix Activity.get_by_id Maksim Pechnikov 2019-09-13 07:12:34 +03:00
  • 58b17196fa Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs Maksim 2019-09-13 03:58:58 +00:00
  • 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-13 06:55:05 +03:00