Commit graph

Select branches

Hide pull requests

stable

Mono Color

• c02d03a4c2 Merge branch 'bugfix/webfinger-refactoring' into 'develop' lambda 2018-06-13 07:02:12 +00:00
• 59f95a7095 webfinger: refactor webfinger() functions William Pitcock 2018-06-13 06:37:02 +00:00
• 2586426fa0
  newlines squidboi 2018-06-12 21:40:22 -07:00
• a2f7c02108 split lines, explicitly advised against editing default config files squidboi 2018-06-12 21:38:28 -07:00
• ddc654d587 update frontend lain 2018-06-12 19:37:31 +02:00
• 3326205f95 set_moderator: ensureall applications are started. eal 2018-06-12 15:42:40 +03:00
• 958cf5da94 Merge branch 'patch-2' into 'develop' lambda 2018-06-12 12:11:04 +00:00
• 9c1cf1befb formatting Henry Jameson 2018-06-12 15:01:40 +03:00
• 991b8a6b9d Replace avi.png with the Pleroma logo Artik Banana 2018-06-12 11:55:38 +00:00
• f42ffbe9a8 Initial invites support + tests. Henry Jameson 2018-06-12 14:52:54 +03:00
• 3f42806b1b Merge branch 'develop' into 'develop' lambda 2018-06-12 08:26:26 +00:00
• f34232da86 Update sample_config.eex lambda 2018-06-12 07:23:45 +00:00
• 564c73ab24 Merge branch 'feature/list-streaming' into 'develop' lambda 2018-06-12 07:19:45 +00:00
• a6e0c31518 Merge branch 'feature/locked-accounts-part-1' into 'develop' lambda 2018-06-12 07:18:19 +00:00
• 01240fd8b6 Merge branch 'patch-2' into 'develop' lambda 2018-06-12 07:12:39 +00:00
• 9810471237 router: remove stub /domain_blocks entry William Pitcock 2018-06-11 23:40:19 +00:00
• 93c614bf13 * Removed TLSv1 and TLSv1.1 * Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves Artik Banana 2018-06-11 23:01:14 +00:00
• c645a8de2b Security upgrades: * Removed TLSv1 and TLSv1.1 * Added OCSP Stapling * Added SSL Cache * Changed ciphers * Specified ECDH curves Artik Banana 2018-06-11 22:56:54 +00:00
• c773f42ca4 tests: update twitterapi user view tests for new locked variable William Pitcock 2018-06-07 19:43:52 +00:00
• f8e0942745 twitter api: add approve/deny endpoints William Pitcock 2018-06-07 00:04:03 +00:00
• d116af3bee tests: add tests for /api/pleroma/friend_requests William Pitcock 2018-06-06 23:46:55 +00:00
• e08cf21e5b twitter api: add friend requests list api William Pitcock 2018-05-29 15:30:06 +00:00
• ba8dab7542 twitterapi: user view: return if an account is locked or not William Pitcock 2018-05-29 14:13:34 +00:00
• 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 +00:00
• 5eed1ea181 run mix format William Pitcock 2018-05-28 18:31:48 +00:00
• 993312cdb3 twitterapi: add profile setting for locked/unlocked accounts William Pitcock 2018-05-28 18:19:20 +00:00
• a0c5b42e29 tests: assert the state prior to mutating it as well as afterward William Pitcock 2018-05-28 17:51:50 +00:00
• c99b9b9d92 testsuite: add mastodon api tests William Pitcock 2018-05-28 17:45:23 +00:00
• 4084889a2d activitypub transmogrifier: remove debug code William Pitcock 2018-05-28 17:42:58 +00:00
• 1452b2823f user: add a workaround for situations where Pleroma may believe a followee is followed William Pitcock 2018-05-28 16:42:18 +00:00
• 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 +00:00
• a2c4a5a75b mastodon api: allow setting an account locked or not William Pitcock 2018-05-27 10:03:53 +00:00
• ad7188fe92 user: use Enum.uniq on the follow request query William Pitcock 2018-05-27 09:45:12 +00:00
• f328de8eb7 activitypub transmogrifier: send Rejects in the format Mastodon wants William Pitcock 2018-05-27 09:10:46 +00:00
• 876ad6aa38 activitypub transmogrifier: send @context on accept activities William Pitcock 2018-05-27 09:09:35 +00:00
• 760eb72a38 add a bunch of stuff William Pitcock 2018-05-26 18:03:23 +00:00
• 6f89d2d583 stash api controller William Pitcock 2018-05-26 16:16:20 +00:00
• 9c88933422 implement tracking of follow requests William Pitcock 2018-05-26 16:03:32 +00:00
• 6041380774 activitypub transmogrifier: learn locked state in Update messages William Pitcock 2018-05-26 15:03:32 +00:00
• e5206752e1 activitypub: only send accept back automatically if the account is not locked William Pitcock 2018-05-26 14:55:16 +00:00
• 3208611bfc mix: add task for setting an account as locked or not William Pitcock 2018-05-26 14:45:41 +00:00
• 08fc1ba382
  more rewording (x2) squidboi 2018-06-11 14:59:04 -07:00
• 0921489809
  more rewording squidboi 2018-06-11 14:42:57 -07:00
• 01b2dc19cc
  super-minor rewording squidboi 2018-06-11 14:29:50 -07:00
• 837792b015
  added CONFIGURATION.md containing some details about configuring mrf squidboi 2018-06-11 14:27:16 -07:00
• cdf5a668f2 Merge branch 'fix/mix-task-caching' into 'develop' eal 2018-06-11 19:59:30 +00:00
• 18837c2fed make_moderator.ex: set cache on update eal 2018-06-11 22:53:38 +03:00
• 7f79b467b1 Merge branch 'feature/domain-blocks' into 'develop' lambda 2018-06-11 11:19:45 +00:00
• 07f0cfa53f
  add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic squidboi 2018-06-10 16:40:51 -07:00
• 4f9ecfc77a formatting squidboi 2018-06-09 04:28:11 +00:00
• 8903f1ad4d more fixes squidboi 2018-06-08 19:07:14 -07:00
• 16d896f526 fixes squidboi 2018-06-08 19:01:14 -07:00
• b3580b6971 add option to not deny follow if blocked (fixed) squidboi 2018-06-08 18:29:41 -07:00
• e99c73aeba add option to not deny follow if blocked squidboi 2018-06-08 17:47:24 -07:00
• 2847fc8f90 add option to not unfollow on block, and option to not federate outgoing blocks squidboi 2018-06-08 17:12:16 -07:00
• 45a935f0bd Merge branch 'users' into 'develop' lambda 2018-06-08 11:10:10 +00:00
• bb639a362e Merge branch 'feature/rejectnonpublic' into 'develop' lambda 2018-06-08 11:08:50 +00:00
• fa0c2727d8 Fix users lookup/return type Rachel H 2018-06-07 21:23:30 -07:00
• 4a16ade2ee Merge branch 'mastopost' into 'develop' lambda 2018-06-08 06:02:21 +00:00
• e2c4013c88
  s/get_by_ap_id/get_cached_by_ap_id/ squidboi 2018-06-07 22:33:50 -07:00
• 6e7f91bf8f
  final format squidboi 2018-06-07 22:14:39 -07:00
• 82225dfc8d
  even more formatting squidboi 2018-06-07 22:10:11 -07:00
• c86823f724 Merge branch 'bugfix/locked-account-regression' into 'develop' lambda 2018-06-08 05:10:08 +00:00
• 990cde7439
  more formatting squidboi 2018-06-07 22:03:24 -07:00
• 5b9e1f228a
  formatting squidboi 2018-06-07 21:55:58 -07:00
• f69d38e455
  add mrf for dropping follower-only and direct posts squidboi 2018-06-07 21:00:57 -07:00
• 1e9dd6fbc2 user: fix maybe_direct_follow() after user_info() refactoring broke it slightly William Pitcock 2018-06-08 02:47:07 +00:00
• 299ef74f2e tests: add regression test for locking/unlocking account updates William Pitcock 2018-06-08 02:28:08 +00:00
• 47c7e259c4 activitypub transmogrifier: fix locked account state from being clobbered William Pitcock 2018-06-08 02:18:47 +00:00
• a003bdc30a activitypub transmogrifier: learn locked state in Update messages William Pitcock 2018-05-26 15:03:32 +00:00
• 839cb7b424 Merge branch 'develop' into 'mastopost' lambda 2018-06-07 16:29:33 +00:00
• 595ca3bb3a Merge branch 'feature/quarantine' into 'develop' lambda 2018-06-07 14:44:08 +00:00
• b114808a10 Merge branch 'import' into 'develop' lambda 2018-06-07 14:42:32 +00:00
• 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 +00:00
• 1525a0404b Fix follow errors Rachel H 2018-06-06 21:26:44 -07:00
• 3f0440ac3c
  Dedupe uploads Sir_Boops 2018-04-15 17:37:51 -06:00
• b4292295d7 Allow posting images without text in mastofe Rachel H 2018-06-05 23:47:16 -07:00
• 29c9c8d93b Extract host from ap_id, add index eal 2018-06-06 21:13:40 +03:00
• 0a0c6bf394 Merge branch 'bugfix/webfinger-xml-crash' into 'develop' lambda 2018-06-06 16:44:44 +00:00
• 1620ec502c testsuite: update fixture URIs that were http William Pitcock 2018-06-06 16:36:58 +00:00
• 1abf0f3b3e webfinger: use https as default fallback instead of http William Pitcock 2018-06-01 17:58:20 +00:00
• aaa81d3540 XML: handle erlang errors too William Pitcock 2018-06-01 17:55:25 +00:00
• b5d8213e70 Merge branch 'fix/oauth-http-basic' into 'develop' lambda 2018-06-06 08:27:08 +00:00
• 2cebaa7d3a Add OAuth controller tests D Anzorge 2018-06-06 03:18:11 +02:00
• 3607dc4558 Make token exchange return errors with 400 as status code D Anzorge 2018-06-06 03:14:50 +02:00
• f9719b064c Merge branch 'fix/emoji-picker' into 'develop' eal 2018-06-05 21:18:25 +00:00
• 73904e8f78 Make OAuth token endpoint work with HTTP Basic auth D Anzorge 2018-06-01 18:01:56 +02:00
• 9075b6d25b ActivityPub.ex: filter domain blocked activities. eal 2018-06-03 23:33:33 +03:00
• 04c584391c Merge branch 'develop' into 'develop' lambda 2018-06-03 19:52:48 +00:00
• 4856962434 MastoAPI: add domain blocking. eal 2018-06-03 22:21:23 +03:00
• 8073af6e10 Better error handling for OstatusController. lain 2018-06-03 21:04:44 +02:00
• 87566b6e2f user.ex: add domain blocks. eal 2018-06-03 22:01:37 +03:00
• 13925e0eb3 caddy config example witti 2018-06-03 20:13:33 +02:00
• 06439f64d0 Better error handling for ActivityPubController lain 2018-06-03 19:58:59 +02:00
• 4856ba596f Better error handling for MastodonApiController. lain 2018-06-03 19:28:11 +02:00
• 0f70e83e8c Better error handling in TwitterApiController. lain 2018-06-03 19:11:22 +02:00
• 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 +02:00
• 9d054d30bc Revert "Update Mastofe." lain 2018-06-02 19:45:23 +02:00
• 726b131b0a Update Mastofe. lain 2018-06-02 16:11:38 +02:00
• da9cbf2c05 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-06-02 15:39:21 +02:00