Commit Graph

  • 01653f618d Merge branch 'improve-ap-routes-rate-limit' into 'develop' lain 2019-08-22 10:20:50 +0000
  • a79ebac592 Improve AP routes rate limit Egor Kislitsyn 2019-08-22 16:03:43 +0700
  • 64bfb41c55 fixed unfollow for relay actor Maksim Pechnikov 2019-08-22 06:57:55 +0300
  • 37229af15f remove old user create and delete routes for admin Sachin Joshi 2019-08-22 00:15:00 +0545
  • 85bd8a4e31 fixed clear config after test Maksim Pechnikov 2019-08-21 21:24:35 +0300
  • f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop' lain 2019-08-21 16:45:20 +0000
  • 73884441f3 Merge branch 'chore/fix-flakey-aws-test' into 'develop' kaniini 2019-08-20 20:28:54 +0000
  • 76bb3572dd test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 Ariadne Conill 2019-08-20 20:19:23 +0000
  • 74f7f308f8 Merge branch 'fix/admin-api-user-deletion' into 'develop' lain 2019-08-20 19:34:47 +0000
  • 8d899d6197 Add `:ap_routes` rate limit Egor Kislitsyn 2019-08-20 22:10:36 +0700
  • 8340fe8fcc Merge branch 'digest-template' into 'develop' lain 2019-08-20 12:55:51 +0000
  • cd2fd225dc Update CHANGELOG Egor Kislitsyn 2019-08-20 19:50:50 +0700
  • ef43016b2c Merge branch 'feature/custom-fields' into 'develop' lain 2019-08-20 12:44:14 +0000
  • 5171aa5b4d Refactor check_actor_is_active Maxim Filippov 2019-08-19 20:36:25 +0300
  • 10696ce2ee Merge branch 'fix/reverse-proxy-body-too-large' into 'develop' lain 2019-08-19 17:05:30 +0000
  • d2c9befc64 Merge branch 'develop' into 'fix/reverse-proxy-body-too-large' lain 2019-08-19 17:00:59 +0000
  • e5d2c0c669 Merge branch 'tests/database-digest-tests' into 'develop' lain 2019-08-19 16:10:00 +0000
  • 75a5dd41ee Add more tests for Database tasks and DigestEmailWorker Sergey Suprunenko 2019-08-19 16:10:00 +0000
  • 222ac3bcbe Merge branch 'support/test_helpers' into 'develop' lain 2019-08-19 15:34:29 +0000
  • a320358703 added test helpers to clear config after tests Maksim 2019-08-19 15:34:29 +0000
  • 49ae3191df Merge branch 'hotfix/user_unfollow' into 'develop' lain 2019-08-19 14:36:10 +0000
  • e652cef76b removes duplicates from relay subscription list Maksim Pechnikov 2019-08-19 13:31:56 +0300
  • c275572317 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Rachel Fae Fox (foxiepaws) 2019-08-18 19:03:14 -0400
  • 608773c5ef Merge branch 'chore/fix-ap-muted-tests' into 'develop' kaniini 2019-08-18 22:33:51 +0000
  • a2fdc32368 tests: activitypub: fix typo Ariadne Conill 2019-08-18 22:21:31 +0000
  • 475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' kaniini 2019-08-18 21:59:22 +0000
  • 18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' kaniini 2019-08-18 21:57:55 +0000
  • 58c1391c4d use commonAPI in tests Sadposter 2019-08-18 22:54:40 +0100
  • 94e336d9d5 clear follow requests when blocking a user Sadposter 2019-08-18 20:29:31 +0100
  • cb222b72b3 Add changelog entry too Mark Felder 2019-08-16 10:28:07 -0500
  • ef82f868d9 Formatting Mark Felder 2019-08-16 10:00:18 -0500
  • 3315a2a1c3 fixed User.unfollow with synchronization external user Maksim Pechnikov 2019-08-16 15:58:42 +0300
  • 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop' lain 2019-08-16 12:55:33 +0000
  • 158231cd20 Add configurable colors and logo for the digest template Egor Kislitsyn 2019-08-16 18:32:25 +0700
  • 6a3b1a526e max_body_size -> max_body_length, as it should be Mark Felder 2019-08-15 15:34:41 -0500
  • 0f24edcd8d Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop' rinpatch 2019-08-15 17:51:30 +0000
  • fba3c16d20 Fix OAuth cleanup worker unconditionally starting rinpatch 2019-08-15 20:36:20 +0300
  • 1c8f58a30e Merge branch 'features/formatting-sub_sup' into 'develop' kaniini 2019-08-15 17:34:16 +0000
  • aefb9cdee8 Merge branch 'feature/parallel-rendering' into 'develop' lain 2019-08-15 15:51:11 +0000
  • 1ad71592ad Parallelize template rendering rinpatch 2019-08-15 17:41:26 +0300
  • a4a3e3becd Hide muted theads from home/public timelines unless `with_muted` is set rinpatch 2019-08-15 17:37:30 +0300
  • 9fb71ce7f4 Merge branch 'cache-follow-state' into 'develop' lain 2019-08-15 14:06:27 +0000
  • ec969eec51 Merge branch 'develop' into 'fix/admin-api-user-deletion' Maxim Filippov 2019-08-14 22:45:32 +0000
  • b27fafe161 Fix CHANGELOG entry Maxim Filippov 2019-08-15 01:42:43 +0300
  • 2b94ae3b39 Do not check if actor is active when deleting a user Maxim Filippov 2019-08-15 01:35:29 +0300
  • 27b747546a Merge branch 'fix/stats-send-after' into 'develop' rinpatch 2019-08-14 22:10:44 +0000
  • e8a8d50138 Collect stats immediately after init rinpatch 2019-08-15 01:01:13 +0300
  • bd5ad0af78 Cache follow state rinpatch 2019-08-15 00:47:30 +0300
  • a9e75fa6a4 Add a task to benchmark timeline rendering rinpatch 2019-08-15 00:43:02 +0300
  • a6a814420d
    html.ex: Allow sub and sup elements by default Haelwenn (lanodan) Monnier 2019-08-14 22:48:44 +0200
  • 31d576de0c Merge branch 'misc-otp-issues' into 'develop' rinpatch 2019-08-14 19:22:15 +0000
  • dc902ad3df Merge branch 'fix/http-signatures-post' into 'develop' rinpatch 2019-08-14 19:16:52 +0000
  • 1754f8ce6d Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex kaniini 2019-08-14 19:05:44 +0000
  • 4be71c91e0 Merge branch 'fix/mrf-describe-keyword-lists' into 'develop' rinpatch 2019-08-14 19:03:39 +0000
  • 5bb418a90d activitypub: publisher: add (request-target) to http signature when POSTing Ariadne Conill 2019-08-14 19:00:48 +0000
  • 626e094589 MRF: fix up unserializable option lists in describe implementations Ariadne Conill 2019-08-14 18:53:18 +0000
  • 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-08-14 21:44:50 +0300
  • a180c1360e [#1149] Oban mailer job. Adjusted tests. Ivan Tashkinov 2019-08-14 21:42:21 +0300
  • c43152f6c1 fix formatting stwf 2019-08-14 14:01:11 -0400
  • d81f63845a Implement Pleroma.Stats as GenServer stwf 2019-08-14 11:59:33 -0400
  • 574856ef01 streamline Streamer pings stwf 2019-08-14 11:58:32 -0400
  • 15ef521009 Isolate OAuth.Token.CleanWorker stwf 2019-08-14 11:57:50 -0400
  • 51bdf0cab6 use default child_specs stwf 2019-08-14 11:55:17 -0400
  • 4a5b0965a0 Merge branch 'fix/revert-tzdata-1.8' into 'develop' lain 2019-08-14 15:07:03 +0000
  • d3af9e19ed Conversations: Load relations in one query. lain 2019-08-14 17:01:11 +0200
  • 6a101f0361 Switch to pre-1.8 version of tzdata. rinpatch 2019-08-14 17:05:21 +0300
  • c9970feee2 Fix compatibility with Elixir 1.8 Egor Kislitsyn 2019-08-14 21:03:25 +0700
  • f73212b2a3 Conversation: Render new participation on update. lain 2019-08-14 15:56:15 +0200
  • df81abb68c Conversations: Use correct oauth paths for extended api. lain 2019-08-14 15:55:43 +0200
  • 4b7f1c6995 Improve digest email template Egor Kislitsyn 2019-08-14 20:46:05 +0700
  • 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations lain 2019-08-14 15:30:40 +0200
  • a2e1db5632 Increase max account fields limits Egor Kislitsyn 2019-08-08 13:20:35 +0700
  • 672fcbc7b7 Limit custom fields for old remote users Egor Kislitsyn 2019-08-07 18:48:05 +0700
  • e457fcc479 Add `:max_remote_account_fields` config option Egor Kislitsyn 2019-08-07 18:14:22 +0700
  • f7bbf99caa Use info.fields instead of source_data for remote users Egor Kislitsyn 2019-08-06 18:21:25 +0700
  • 2c35d4b0b0 Add configurable account field name length limit Egor Kislitsyn 2019-08-01 15:09:15 +0700
  • db3c05f6b4 Add configurable account field value length limit Egor Kislitsyn 2019-07-30 17:22:52 +0700
  • 7d6f8a7fd7 Linkify custom fields values in ActivityPub.UserViewx Egor Kislitsyn 2019-07-29 19:17:09 +0700
  • 5178f960c3 Support user attachment update in Transmogrifier Egor Kislitsyn 2019-07-29 19:01:15 +0700
  • 8ab87ce40b Apply suggestion to CHANGELOG.md Egor 2019-07-26 12:08:46 +0000
  • 88598c9baf Add profile custom fields to ActivityPub.UserView Egor Kislitsyn 2019-07-25 19:35:34 +0700
  • a22f540fc4 Add custom fields to TwitterAPI.UserView Egor Kislitsyn 2019-07-25 19:33:18 +0700
  • 069951722f Update CHANGELOG Egor Kislitsyn 2019-07-25 14:34:52 +0700
  • d6094b405d Fix tests Egor Kislitsyn 2019-07-24 19:48:15 +0700
  • e0ac5c7a66 Add custom profile fields Egor Kislitsyn 2019-07-24 19:26:35 +0700
  • 744e2ce8b4 Merge branch 'backport/describe-api-changelog' into 'develop' rinpatch 2019-08-14 02:12:09 +0000
  • 8fab9c5c1c update changelog to cover MRF describe API. Ariadne Conill 2019-08-14 01:36:42 +0000
  • 5c35d2f1d8 Merge branch 'preload-user-timelines' into 'develop' kaniini 2019-08-14 01:04:07 +0000
  • fe42844bda Merge branch 'get-context-optimizations' into 'develop' kaniini 2019-08-14 01:03:54 +0000
  • 8202f1634a Preload thread mutes/bookmarks in user_statuses rinpatch 2019-08-14 03:02:09 +0300
  • f4e087ee48 Preload thread mutes/bookmarks in get_context rinpatch 2019-08-14 02:36:54 +0300
  • 9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop' rinpatch 2019-08-13 22:51:15 +0000
  • c3a54cc34d Merge branch 'feature/mrf-describe' into 'develop' kaniini 2019-08-13 22:46:19 +0000
  • 5983f98f26 docs tweak Ariadne Conill 2019-08-13 22:40:18 +0000
  • 83a3de8cc4 Merge branch 'length-limit-bio' into 'develop' rinpatch 2019-08-13 22:40:13 +0000
  • abfbcfdcb3 mrf_vocabulary: add describe API support Ariadne Conill 2019-08-13 22:39:26 +0000
  • 4244e17de0 fix credo Ariadne Conill 2019-08-13 22:36:24 +0000
  • 47c20ab796 Merge branch 'fix/mastoapi-more-object-preloads' into 'develop' Haelwenn 2019-08-13 22:32:49 +0000
  • 10fef2fcee tests: fix up nodeinfo tests Ariadne Conill 2019-08-13 22:32:40 +0000
  • f5aacaf4d3 Merge branch 'feature/nicer-safe-render-errors' into 'develop' kaniini 2019-08-13 22:25:15 +0000