Commit graph

  • dca1d6d162 Merge branch 'fix/user-timeline-reading-user' into 'develop' eal 2018-06-01 09:35:29 +00:00
  • 8c609ee3f9 MastoAPI user timelines: render statuses for the logged in user. eal 2018-06-01 12:16:42 +03:00
  • 98b8f08783 Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop' lambda 2018-06-01 08:51:04 +00:00
  • 935e544e19 TwitterAPI: fix "Follows you" being shown for the wrong user. eal 2018-05-31 15:27:42 +03:00
  • 5e76adb07e Fix url guessing attacks. lain 2018-05-30 20:00:27 +02:00
  • 349400c06a Fix url guessing attacks. lain 2018-05-30 20:00:27 +02:00
  • 5d3fdbc082 MastoAPI: Add streaming for lists. eal 2018-05-30 16:33:37 +03:00
  • 196d36a7d5 Merge branch 'fix/dm-timeline-activities' into 'develop' eal 2018-05-30 12:31:59 +00:00
  • 7cb2e2971e MastoAPI: fix dm_timeline getting non-create activities. eal 2018-05-30 15:02:22 +03:00
  • 8bd7ace420 Merge branch 'patch-3' into 'develop' lambda 2018-05-29 10:58:43 +00:00
  • 52b0413719 Merge branch 'fix/link-headers' into 'develop' lambda 2018-05-29 10:58:27 +00:00
  • 35cb8969c4 MastoAPI: Fix link headers with restrictive params. eal 2018-05-29 13:29:51 +03:00
  • 461f201caa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-05-28 12:39:49 +02:00
  • 3ece4a3ebc Only return certain activities in TwitterAPI mentions. lain 2018-05-28 12:38:48 +02:00
  • a6fd9c4b00 Update pleroma.nginx Dominik V. Salonen 2018-05-28 10:36:27 +00:00
  • 8216d5e40e Merge branch 'feature/mastodon-context-microformat' into 'develop' lambda 2018-05-27 13:16:10 +00:00
  • d7eb2e1b65 run mix format William Pitcock 2018-05-27 13:06:38 +00:00
  • f569b67cda tests: update for html changes William Pitcock 2018-05-27 13:03:34 +00:00
  • a8df7fc690 formatter: use class='mention' on links to user profiles William Pitcock 2018-05-27 12:53:14 +00:00
  • a9e36e5a64 Fix user topic streaming. lain 2018-05-26 21:06:46 +02:00
  • 46cc6fab07 Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop lain 2018-05-26 16:26:14 +02:00
  • 841ee8e3e4 Simplify DM query. lain 2018-05-26 16:25:32 +02:00
  • 4b3ec53514 Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api lain 2018-05-26 16:00:59 +02:00
  • 6138b29783 There are no symbols in JSON. lain 2018-05-26 15:20:21 +02:00
  • 745072b2cc Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop lain 2018-05-26 15:15:52 +02:00
  • 0a6c897c94 Formatting. lain 2018-05-26 15:11:50 +02:00
  • bfce29866f Make Mastodon follow hack more explicit. lain 2018-05-26 15:07:21 +02:00
  • 3839a11ef5 Don't treat remote accepts/rejects as local. lain 2018-05-26 14:07:46 +02:00
  • dd9bb37893 Rename id helper method. lain 2018-05-26 13:52:05 +02:00
  • 1db0dc3072 tests: add tests to verify the accept request is discarded if no follow activity could be found William Pitcock 2018-05-26 11:16:05 +00:00
  • 7e873756e7 activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists William Pitcock 2018-05-26 11:07:04 +00:00
  • e1fe46e1cf Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop' lambda 2018-05-26 09:50:54 +00:00
  • 1c926c7b60 activitypub: allow mastodon S2S block extension support to be disabled William Pitcock 2018-05-26 08:24:50 +00:00
  • e90b734f1c debug Hakaba Hitoyo 2018-05-26 14:10:12 +09:00
  • 9c7da2ef48 output repeats at ActivityPub outbox Hakaba Hitoyo 2018-05-26 14:02:57 +09:00
  • 7cf3cf77cf activitypub transmogrifier: cleanups and tests for incoming accepts/rejects William Pitcock 2018-05-25 12:51:04 +00:00
  • f35e6bf75b activitypub transmogrifier: clean up accept/reject handling a bit William Pitcock 2018-05-25 09:38:07 +00:00
  • e80d91c64a introduce User.maybe_direct_follow() and use it where we used to call User.follow() William Pitcock 2018-05-25 09:31:42 +00:00
  • c89b90222c twitter api: also remove explicit User.follow here William Pitcock 2018-05-25 08:35:38 +00:00
  • 62c95e8d4d run mix format William Pitcock 2018-05-25 08:03:34 +00:00
  • 5d6d86bf00 Merge branch 'feature/blocks-deny-refollow' into 'develop' lambda 2018-05-25 07:15:01 +00:00
  • caae83e6d5 Merge branch 'bugfix/follow-query-overhead' into 'develop' lambda 2018-05-25 07:13:05 +00:00
  • 502ba33d01 activitypub: fix up accept/reject semantics for following William Pitcock 2018-05-25 06:09:01 +00:00
  • c0ca9f82b9 mastodon api: properly track if an account is locked or not William Pitcock 2018-05-25 04:15:42 +00:00
  • 1f3eb0f470 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest) William Pitcock 2018-05-25 03:14:49 +00:00
  • 5f06a1a3c5 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest) William Pitcock 2018-05-25 03:14:49 +00:00
  • 47dc52a758 activitypub utils: optimize block and follow activity lookup William Pitcock 2018-05-25 05:19:11 +00:00
  • 1d88abf2d4 user: do not allow refollowing somebody who has blocked a user William Pitcock 2018-05-25 03:16:02 +00:00
  • 8d2ee70da1 testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest) William Pitcock 2018-05-25 03:14:49 +00:00
  • f3a71f2986 Merge branch 'feature/lists' into 'develop' lambda 2018-05-24 20:22:43 +00:00
  • c2dcd767cf Merge branch 'feature/incoming-remote-unfollow' into 'develop' lambda 2018-05-24 19:52:24 +00:00
  • 1197ec10a8 Rewrite block fetch query Francis Dinh 2018-05-24 13:26:59 -04:00
  • 6b9a683833 update frontend lain 2018-05-24 19:25:44 +02:00
  • c41012053a Merge branch 'feature/change-password' into 'develop' lambda 2018-05-24 17:16:37 +00:00
  • 3dbd9809d4 MastoAPI: add lists. eal 2018-04-29 16:02:46 +03:00
  • 1cd6194dee More efficient queries. lain 2018-05-24 12:44:26 +02:00
  • a8369db4f2 MastoAPI: add lists. eal 2018-04-29 16:02:46 +03:00
  • 0b5bc62b33 Don't save double tags in AP objects we create lain 2018-05-23 17:25:24 +02:00
  • 06c97f211f Merge branch 'feature/deps-migration' into 'develop' lambda 2018-05-23 09:03:11 +00:00
  • f0e8194a71 Repair some access-control headers required for third-party webclients Niklas Poslovski 2018-05-22 16:26:01 +02:00
  • 493e1bdf52 Merge branch 'nipos-develop' into develop lain 2018-05-22 16:02:53 +02:00
  • d81a4e9280
    Add access-control-expose-headers to Nginx default config Niklas Poslovski 2018-05-22 15:39:29 +02:00
  • 72b93d13f8 Hook up block/unblock to TwitterAPI Francis Dinh 2018-05-22 05:41:17 -04:00
  • 55f9aefd08 Hook unfollow into TwitterAPI Francis Dinh 2018-05-22 04:49:30 -04:00
  • b2c6ae7d82 Hook up unfollow and (un)block to MastoAPI + tests Francis Dinh 2018-05-22 04:27:40 -04:00
  • 4fd9df100f Merge branch 'develop' into feature/mstdn-direct-api csaurus 2018-05-21 20:19:37 -04:00
  • 69aa7c213a Fixed test Syldexia 2018-05-21 22:32:28 +01:00
  • d0690622cd Added endpoint for changing passwords Syldexia 2018-05-21 22:17:34 +01:00
  • b4064dfe30 Merge branch 'feature/clarify-http-sig-error' into 'develop' lambda 2018-05-21 21:20:41 +00:00
  • 9a2d097ed8 activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work William Pitcock 2018-05-21 19:19:40 +00:00
  • 46427cb90f Pass correct number of arguments to unfollow Francis Dinh 2018-05-21 11:57:15 -04:00
  • 38ee0f3fc6 Merge branch 'bugfix/webfinger-statusnet' into 'develop' lambda 2018-05-21 13:58:20 +00:00
  • 75cfd9d34d webfinger: fix finding the XRD uri for statusnet instances William Pitcock 2018-05-21 12:38:12 +00:00
  • d269c69a0b Actually fix missing alias. lain 2018-05-21 12:32:29 +02:00
  • 39bf535221 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-05-21 12:09:33 +02:00
  • bf64208b52 Add missing alias. lain 2018-05-21 12:09:03 +02:00
  • d045b96f95 Add tests for incoming unfollow over OStatus Francis Dinh 2018-05-21 05:11:13 -04:00
  • cc5373b846 Fix unblock handling Francis Dinh 2018-05-21 05:00:58 -04:00
  • f2d6c3a512 Handle unfollows from OStatus Francis Dinh 2018-05-21 04:36:20 -04:00
  • 2573332214 Add undo block handler Francis Dinh 2018-05-21 04:35:43 -04:00
  • c8a16f334d Format Francis Dinh 2018-05-20 21:02:06 -04:00
  • 89c5de9096 Fix unfollows Francis Dinh 2018-05-20 21:01:14 -04:00
  • 56de0216ae pass user to User.blocks?/2 instead of ap_id Francis Dinh 2018-05-20 19:45:05 -04:00
  • 1afd6d37bd Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow Francis Dinh 2018-05-20 19:17:15 -04:00
  • 961f131257 Merge branch 'develop' into 'develop' lambda 2018-05-20 19:37:16 +00:00
  • 9c3e2069d0 Correct 'register_user' parameters in README witti 2018-05-20 20:49:44 +02:00
  • e55c6f311b
    Migrate to comeonin 4 and Cachex 3 Thog 2018-05-20 18:05:34 +02:00
  • 413de8e4bc More fixes. lain 2018-05-20 19:26:09 +02:00
  • dca26f3655 Fix specs. lain 2018-05-20 19:22:26 +02:00
  • dde5ad9e37 update frontend lain 2018-05-20 18:29:12 +02:00
  • ff007af0c2 Return visilility in twitter api, too. lain 2018-05-20 18:01:24 +02:00
  • 434601a5c3 Return private / direct posts on user timelines, too. lain 2018-05-20 16:15:18 +02:00
  • bdfe0991d2 update frontend lain 2018-05-20 13:24:16 +02:00
  • 8b0c222b43 Merge branch 'feature/account-deletion' into 'develop' lambda 2018-05-20 10:57:19 +00:00
  • 40af452594 Merge branch 'feature/undo-like-federation' into 'develop' lambda 2018-05-20 10:55:39 +00:00
  • d46393f6ef Fix test for blocks Francis Dinh 2018-05-20 02:15:56 -04:00
  • a9141d88aa Pass user instead of their ap_id to User.block Francis Dinh 2018-05-19 22:02:13 -04:00
  • 3b706ea493 Remove handler for incoming undos with object references Francis Dinh 2018-05-19 21:34:30 -04:00
  • 1e43de0f86 Formatting and add tests for blocks/unblocks Francis Dinh 2018-05-19 21:23:52 -04:00
  • da9744eb84 Use correct variable names in unfollow Francis Dinh 2018-05-19 20:57:37 -04:00