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

Commit graph

  • f8e0942745 twitter api: add approve/deny endpoints William Pitcock 2018-06-07 00:04:03 +0000
  • d116af3bee tests: add tests for /api/pleroma/friend_requests William Pitcock 2018-06-06 23:46:55 +0000
  • e08cf21e5b twitter api: add friend requests list api William Pitcock 2018-05-29 15:30:06 +0000
  • ba8dab7542 twitterapi: user view: return if an account is locked or not William Pitcock 2018-05-29 14:13:34 +0000
  • d96377f359 activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it William Pitcock 2018-05-29 10:18:23 +0000
  • 5eed1ea181 run mix format William Pitcock 2018-05-28 18:31:48 +0000
  • 993312cdb3 twitterapi: add profile setting for locked/unlocked accounts William Pitcock 2018-05-28 18:19:20 +0000
  • a0c5b42e29 tests: assert the state prior to mutating it as well as afterward William Pitcock 2018-05-28 17:51:50 +0000
  • c99b9b9d92 testsuite: add mastodon api tests William Pitcock 2018-05-28 17:45:23 +0000
  • 4084889a2d activitypub transmogrifier: remove debug code William Pitcock 2018-05-28 17:42:58 +0000
  • 1452b2823f user: add a workaround for situations where Pleroma may believe a followee is followed William Pitcock 2018-05-28 16:42:18 +0000
  • 76f80ba8c2 activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused William Pitcock 2018-05-27 13:51:13 +0000
  • a2c4a5a75b mastodon api: allow setting an account locked or not William Pitcock 2018-05-27 10:03:53 +0000
  • ad7188fe92 user: use Enum.uniq on the follow request query William Pitcock 2018-05-27 09:45:12 +0000
  • f328de8eb7 activitypub transmogrifier: send Rejects in the format Mastodon wants William Pitcock 2018-05-27 09:10:46 +0000
  • 876ad6aa38 activitypub transmogrifier: send @context on accept activities William Pitcock 2018-05-27 09:09:35 +0000
  • 760eb72a38 add a bunch of stuff William Pitcock 2018-05-26 18:03:23 +0000
  • 6f89d2d583 stash api controller William Pitcock 2018-05-26 16:16:20 +0000
  • 9c88933422 implement tracking of follow requests William Pitcock 2018-05-26 16:03:32 +0000
  • 6041380774 activitypub transmogrifier: learn locked state in Update messages William Pitcock 2018-05-26 15:03:32 +0000
  • e5206752e1 activitypub: only send accept back automatically if the account is not locked William Pitcock 2018-05-26 14:55:16 +0000
  • 3208611bfc mix: add task for setting an account as locked or not William Pitcock 2018-05-26 14:45:41 +0000
  • 08fc1ba382
         more rewording (x2) squidboi 2018-06-11 14:59:04 -0700
  • 0921489809
         more rewording squidboi 2018-06-11 14:42:57 -0700
  • 01b2dc19cc
         super-minor rewording squidboi 2018-06-11 14:29:50 -0700
  • 837792b015
         added CONFIGURATION.md containing some details about configuring mrf squidboi 2018-06-11 14:27:16 -0700
  • cdf5a668f2 Merge branch 'fix/mix-task-caching' into 'develop' eal 2018-06-11 19:59:30 +0000
  • 18837c2fed make_moderator.ex: set cache on update eal 2018-06-11 22:53:38 +0300
  • 7f79b467b1 Merge branch 'feature/domain-blocks' into 'develop' lambda 2018-06-11 11:19:45 +0000
  • 07f0cfa53f
         add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic squidboi 2018-06-10 16:40:51 -0700
  • 4f9ecfc77a formatting squidboi 2018-06-09 04:28:11 +0000
  • 8903f1ad4d more fixes squidboi 2018-06-08 19:07:14 -0700
  • 16d896f526 fixes squidboi 2018-06-08 19:01:14 -0700
  • b3580b6971 add option to not deny follow if blocked (fixed) squidboi 2018-06-08 18:29:41 -0700
  • e99c73aeba add option to not deny follow if blocked squidboi 2018-06-08 17:47:24 -0700
  • 2847fc8f90 add option to not unfollow on block, and option to not federate outgoing blocks squidboi 2018-06-08 17:12:16 -0700
  • 45a935f0bd Merge branch 'users' into 'develop' lambda 2018-06-08 11:10:10 +0000
  • bb639a362e Merge branch 'feature/rejectnonpublic' into 'develop' lambda 2018-06-08 11:08:50 +0000
  • fa0c2727d8 Fix users lookup/return type Rachel H 2018-06-07 21:23:30 -0700
  • 4a16ade2ee Merge branch 'mastopost' into 'develop' lambda 2018-06-08 06:02:21 +0000
  • e2c4013c88
         s/get_by_ap_id/get_cached_by_ap_id/ squidboi 2018-06-07 22:33:50 -0700
  • 6e7f91bf8f
         final format squidboi 2018-06-07 22:14:39 -0700
  • 82225dfc8d
         even more formatting squidboi 2018-06-07 22:10:11 -0700
  • c86823f724 Merge branch 'bugfix/locked-account-regression' into 'develop' lambda 2018-06-08 05:10:08 +0000
  • 990cde7439
         more formatting squidboi 2018-06-07 22:03:24 -0700
  • 5b9e1f228a
         formatting squidboi 2018-06-07 21:55:58 -0700
  • f69d38e455
         add mrf for dropping follower-only and direct posts squidboi 2018-06-07 21:00:57 -0700
  • 1e9dd6fbc2 user: fix maybe_direct_follow() after user_info() refactoring broke it slightly William Pitcock 2018-06-08 02:47:07 +0000
  • 299ef74f2e tests: add regression test for locking/unlocking account updates William Pitcock 2018-06-08 02:28:08 +0000
  • 47c7e259c4 activitypub transmogrifier: fix locked account state from being clobbered William Pitcock 2018-06-08 02:18:47 +0000
  • a003bdc30a activitypub transmogrifier: learn locked state in Update messages William Pitcock 2018-05-26 15:03:32 +0000
  • 839cb7b424 Merge branch 'develop' into 'mastopost' lambda 2018-06-07 16:29:33 +0000
  • 595ca3bb3a Merge branch 'feature/quarantine' into 'develop' lambda 2018-06-07 14:44:08 +0000
  • b114808a10 Merge branch 'import' into 'develop' lambda 2018-06-07 14:42:32 +0000
  • 09604182d0 add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer. William Pitcock 2018-06-07 03:26:41 +0000
  • 1525a0404b Fix follow errors Rachel H 2018-06-06 21:26:44 -0700
  • 3f0440ac3c
         Dedupe uploads Sir_Boops 2018-04-15 17:37:51 -0600
  • b4292295d7 Allow posting images without text in mastofe Rachel H 2018-06-05 23:47:16 -0700
  • 29c9c8d93b Extract host from ap_id, add index eal 2018-06-06 21:13:40 +0300
  • 0a0c6bf394 Merge branch 'bugfix/webfinger-xml-crash' into 'develop' lambda 2018-06-06 16:44:44 +0000
  • 1620ec502c testsuite: update fixture URIs that were http William Pitcock 2018-06-06 16:36:58 +0000
  • 1abf0f3b3e webfinger: use https as default fallback instead of http William Pitcock 2018-06-01 17:58:20 +0000
  • aaa81d3540 XML: handle erlang errors too William Pitcock 2018-06-01 17:55:25 +0000
  • b5d8213e70 Merge branch 'fix/oauth-http-basic' into 'develop' lambda 2018-06-06 08:27:08 +0000
  • 2cebaa7d3a Add OAuth controller tests D Anzorge 2018-06-06 03:18:11 +0200
  • 3607dc4558 Make token exchange return errors with 400 as status code D Anzorge 2018-06-06 03:14:50 +0200
  • f9719b064c Merge branch 'fix/emoji-picker' into 'develop' eal 2018-06-05 21:18:25 +0000
  • 73904e8f78 Make OAuth token endpoint work with HTTP Basic auth D Anzorge 2018-06-01 18:01:56 +0200
  • 9075b6d25b ActivityPub.ex: filter domain blocked activities. eal 2018-06-03 23:33:33 +0300
  • 04c584391c Merge branch 'develop' into 'develop' lambda 2018-06-03 19:52:48 +0000
  • 4856962434 MastoAPI: add domain blocking. eal 2018-06-03 22:21:23 +0300
  • 8073af6e10 Better error handling for OstatusController. lain 2018-06-03 21:04:44 +0200
  • 87566b6e2f user.ex: add domain blocks. eal 2018-06-03 22:01:37 +0300
  • 13925e0eb3 caddy config example witti 2018-06-03 20:13:33 +0200
  • 06439f64d0 Better error handling for ActivityPubController lain 2018-06-03 19:58:59 +0200
  • 4856ba596f Better error handling for MastodonApiController. lain 2018-06-03 19:28:11 +0200
  • 0f70e83e8c Better error handling in TwitterApiController. lain 2018-06-03 19:11:22 +0200
  • b143694b98
         lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis Haelwenn (lanodan) Monnier 2018-05-01 08:24:30 +0200
  • 9d054d30bc Revert "Update Mastofe." lain 2018-06-02 19:45:23 +0200
  • 726b131b0a Update Mastofe. lain 2018-06-02 16:11:38 +0200
  • da9cbf2c05 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-06-02 15:39:21 +0200
  • dca1d6d162 Merge branch 'fix/user-timeline-reading-user' into 'develop' eal 2018-06-01 09:35:29 +0000
  • 8c609ee3f9 MastoAPI user timelines: render statuses for the logged in user. eal 2018-06-01 12:16:42 +0300
  • 98b8f08783 Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop' lambda 2018-06-01 08:51:04 +0000
  • 935e544e19 TwitterAPI: fix "Follows you" being shown for the wrong user. eal 2018-05-31 15:27:42 +0300
  • 5e76adb07e Fix url guessing attacks. lain 2018-05-30 20:00:27 +0200
  • 349400c06a Fix url guessing attacks. lain 2018-05-30 20:00:27 +0200
  • 5d3fdbc082 MastoAPI: Add streaming for lists. eal 2018-05-30 16:33:37 +0300
  • 196d36a7d5 Merge branch 'fix/dm-timeline-activities' into 'develop' eal 2018-05-30 12:31:59 +0000
  • 7cb2e2971e MastoAPI: fix dm_timeline getting non-create activities. eal 2018-05-30 15:02:22 +0300
  • 8bd7ace420 Merge branch 'patch-3' into 'develop' lambda 2018-05-29 10:58:43 +0000
  • 52b0413719 Merge branch 'fix/link-headers' into 'develop' lambda 2018-05-29 10:58:27 +0000
  • 35cb8969c4 MastoAPI: Fix link headers with restrictive params. eal 2018-05-29 13:29:51 +0300
  • 461f201caa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-05-28 12:39:49 +0200
  • 3ece4a3ebc Only return certain activities in TwitterAPI mentions. lain 2018-05-28 12:38:48 +0200
  • a6fd9c4b00 Update pleroma.nginx Dominik V. Salonen 2018-05-28 10:36:27 +0000
  • 8216d5e40e Merge branch 'feature/mastodon-context-microformat' into 'develop' lambda 2018-05-27 13:16:10 +0000
  • d7eb2e1b65 run mix format William Pitcock 2018-05-27 13:06:38 +0000
  • f569b67cda tests: update for html changes William Pitcock 2018-05-27 13:03:34 +0000
  • a8df7fc690 formatter: use class='mention' on links to user profiles William Pitcock 2018-05-27 12:53:14 +0000