Commit graph

  • 658036881d Merge branch 'feature/unsubscribe-user-task' into 'develop' kaniini 2018-10-28 19:54:21 +0000
  • 69192f36ff mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots) William Pitcock 2018-10-28 19:47:56 +0000
  • 39103a91be Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop' kaniini 2018-10-28 05:52:51 +0000
  • 6aeeb322ae Merge branch 'psql-setup-cleanup' into 'develop' kaniini 2018-10-28 05:49:55 +0000
  • 72ea54de6e activitypub: fix possible false positives with broken thread filtering William Pitcock 2018-10-28 05:45:33 +0000
  • a494508320 Cleanup postgresql setup script Greizgh 2018-10-27 14:31:51 +0200
  • 310a4bc25c Merge branch 'update-pleroma-frontend' into 'develop' kaniini 2018-10-26 19:03:49 +0000
  • 72a880431f update pleroma frontend hakabahitoyo 2018-10-26 23:35:06 +0900
  • 0253015467 update pleroma frontend hakabahitoyo 2018-10-26 23:28:15 +0900
  • 44762daf51 Merge branch 'feature/broken-thread-filtering' into 'develop' kaniini 2018-10-26 06:45:38 +0000
  • 9b39670683 Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop' kaniini 2018-10-26 06:39:23 +0000
  • c302c619b9 http: fix mediaproxy William Pitcock 2018-10-26 06:38:08 +0000
  • 2ac13061af testsuite: formatting William Pitcock 2018-10-26 06:37:00 +0000
  • 0d0c1dcf44 tests: add testsuite for broken thread filter William Pitcock 2018-10-26 06:35:06 +0000
  • 26eb11c172 activitypub: add support for filtering broken threads out of timelines William Pitcock 2018-10-26 06:16:51 +0000
  • ae7c79cfc2 Merge branch 'bugfix/fd-exhaustion' into 'develop' kaniini 2018-10-26 03:14:57 +0000
  • 7338368ad9 http: enable keepalive / connection pooling (closes #336) William Pitcock 2018-10-26 03:06:42 +0000
  • 2d957b985f Merge branch 'bugfix/unshared-inbox-check' into 'develop' kaniini 2018-10-26 01:36:07 +0000
  • f6cb963df2 activitypub utils: fix recipient check when the message is unaddressed (mastodon) William Pitcock 2018-10-26 01:24:22 +0000
  • 72031e80d7 Merge branch 'feature/nodeinfo-frontend-config' into 'develop' kaniini 2018-10-25 23:49:04 +0000
  • 7906dfe5a0
    [Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings Haelwenn (lanodan) Monnier 2018-09-07 02:45:26 +0200
  • 57330dd91b
    [Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features Haelwenn (lanodan) Monnier 2018-09-04 18:15:02 +0200
  • 9fe9c09883 Merge branch 'finmoji-optional' into 'develop' kaniini 2018-10-25 18:24:07 +0000
  • ae5beb7b64 Make finmoji optional scarlett 2018-10-25 17:58:46 +0100
  • 63556150e1 Merge branch 'bugfix/user-inbox-bcc' into 'develop' kaniini 2018-10-25 05:30:52 +0000
  • b1d1f9bc27 tests: add test for user inbox William Pitcock 2018-10-25 05:24:17 +0000
  • ce70eb8c00 activitypub utils: fix user splicing William Pitcock 2018-10-25 05:24:01 +0000
  • 2f1f1a4f30 activitypub: splice users into recipient lists when they receive messages at their personal inbox William Pitcock 2018-10-25 05:02:21 +0000
  • 9e9b1bd5ea Merge branch 'bugfix/ap-uri-user-search' into 'develop' kaniini 2018-10-25 04:38:46 +0000
  • 79b1e4465f Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop' Haelwenn 2018-10-25 04:35:29 +0000
  • 5383887bd4 transmogrifier: do not try to contain origin of something which doesn't have one William Pitcock 2018-10-25 04:27:33 +0000
  • b386888a0e
    [Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4 Haelwenn (lanodan) Monnier 2018-10-25 06:05:13 +0200
  • 4646794ee2 Merge branch 'feature/add-in-reply-to-profileurl' into 'develop' kaniini 2018-10-25 04:16:40 +0000
  • 6cfba7db8d tests: twitterapi: add additional fields William Pitcock 2018-10-25 04:06:42 +0000
  • 1ed25c963a twitterapi: activity view: add the other in_reply_to fields William Pitcock 2018-10-25 04:04:04 +0000
  • 1b480e3514 user: add helper for fetching profile url (which may be different than ap id) William Pitcock 2018-10-25 04:01:59 +0000
  • b112112c11
    [Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4 Haelwenn (lanodan) Monnier 2018-10-25 05:52:45 +0200
  • b0a940d5a2
    [Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments Haelwenn (lanodan) Monnier 2018-10-25 05:18:10 +0200
  • 2da0ffeb28
    lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil Haelwenn (lanodan) Monnier 2018-08-30 14:49:42 +0200
  • 0c10be8731
    [Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json Haelwenn (lanodan) Monnier 2018-08-29 20:16:01 +0200
  • 3b0e9287a5
    [Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views Haelwenn (lanodan) Monnier 2018-08-29 21:07:12 +0200
  • a8137159c2 Merge branch 'feature/in-reply-to-screen-name' into 'develop' kaniini 2018-10-25 03:11:19 +0000
  • 9563f3766d tests: update for new in_reply_to_screen_name field William Pitcock 2018-10-25 03:03:44 +0000
  • fee43ae5e7 twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper William Pitcock 2018-10-25 02:54:29 +0000
  • f3f736afc4 activity: add helper to fetch an activity's parent William Pitcock 2018-10-25 02:47:55 +0000
  • 4b2a586942 Merge branch 'update-pleroma-frontend' into 'develop' kaniini 2018-10-25 00:16:15 +0000
  • 8cc08b94ec Merge branch 'security/add-security-directives-to-systemd-example' into 'develop' kaniini 2018-10-25 00:15:29 +0000
  • 043cb7138e
    Add a little bit more detail in the comments. shibayashi 2018-10-25 00:57:47 +0200
  • 0a58428de6
    Add some security related directives to the systemd service example shibayashi 2018-10-25 00:37:31 +0200
  • 7cb227dc62 update pleroma-fe scarlett 2018-10-23 12:15:48 +0100
  • f6dda65dda update pleroma-fe scarlett 2018-10-23 12:15:48 +0100
  • 945ce9910d Merge branch 'bugfix/html-scrub-comments' into 'develop' kaniini 2018-10-23 00:56:09 +0000
  • bcae57afd2 Merge branch 'new-frontend-options' into 'develop' kaniini 2018-10-23 00:50:28 +0000
  • 8613db0e3b html: ensure comments are correctly scrubbed William Pitcock 2018-10-23 00:48:49 +0000
  • 3e79d941c8 Defaults for new frontend options in config.exs scarlett 2018-10-21 12:54:37 +0100
  • a253c1466e New frontend options scarlett 2018-10-21 12:52:52 +0100
  • aaf3fc1575 Merge branch 'pleroma-list-belongs' into 'develop' eal 2018-10-20 10:14:08 +0000
  • 5e9a0e2460 Fix some typos in the list test. eal 2018-10-20 13:03:45 +0300
  • a249cbf187 Add a test for List.get_lists_account_belongs AkiraFukushima 2018-10-19 21:24:15 +0900
  • e8c698af41 Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs AkiraFukushima 2018-10-19 01:46:26 +0900
  • ad3181895c Merge branch 'bugfix/html-scrub-schemes' into 'develop' kaniini 2018-10-18 14:36:40 +0000
  • 595d855f0e html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility William Pitcock 2018-10-18 14:29:31 +0000
  • 2154c5dcd8
    lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes Haelwenn (lanodan) Monnier 2018-10-18 07:36:58 +0200
  • 6098070234 Merge branch 'bugfix/osada-mention' into 'develop' kaniini 2018-10-17 19:33:15 +0000
  • 958c5e02e8 tests: add a testcase for matching osada users in the formatter William Pitcock 2018-10-17 19:27:05 +0000
  • 582dbe5c8d formatter: fix matching osada users William Pitcock 2018-10-17 19:15:20 +0000
  • c7140c67c7 Merge branch 'import-maybe-direct-follow' into 'develop' Haelwenn 2018-10-17 04:24:13 +0000
  • 7562912f6a Use maybe_direct_follow for follow imports scarlett 2018-10-17 04:16:11 +0100
  • d7654c77de
    lib/pleroma/html.ex: Use a function as a variable (broken for some reason) Haelwenn (lanodan) Monnier 2018-10-16 03:34:33 +0200
  • 50e0a9ae56
    lib/pleroma/html.ex: Fix scheme lists Haelwenn (lanodan) Monnier 2018-10-16 03:00:37 +0200
  • c93571b87e Merge branch 'feature/markdown-enable-tags' into 'develop' kaniini 2018-10-14 20:42:23 +0000
  • 30efa86c05 common api: enable tag linking in markdown mode William Pitcock 2018-10-14 20:36:11 +0000
  • e0c035589a Merge branch 'security/clear-oauth-with-password' into 'develop' kaniini 2018-10-14 19:29:58 +0000
  • eacab0fb05
    Delete Tokens and Authorizations on password change Haelwenn (lanodan) Monnier 2018-10-14 01:45:11 +0200
  • 117e005409 Merge branch 'security/fix-local-locked-accounts' into 'develop' kaniini 2018-10-11 10:56:12 +0000
  • 51eaece3ea user: break out local cases for maybe_direct_follow William Pitcock 2018-10-11 10:49:54 +0000
  • ebc32045f0 test: add regression test for #316 William Pitcock 2018-10-11 10:35:32 +0000
  • 2c29329d39 user: local users are always AP-enabled (closes #316) William Pitcock 2018-10-11 10:35:11 +0000
  • 3a77336d89 Merge branch 'bugfix/length-enforce-subjects' into 'develop' kaniini 2018-10-10 08:00:23 +0000
  • 111841ad34 common api: take the combination of the subject and content for length limit enforcement William Pitcock 2018-10-10 07:53:20 +0000
  • 5294b11ef0 Merge branch 'feature/mrf-transparency-opt-out' into 'develop' Haelwenn 2018-10-07 01:34:16 +0000
  • 08d5ad71b6 nodeinfo: allow opting out of MRF transparency William Pitcock 2018-10-07 01:23:38 +0000
  • 4a3a46074d Merge branch 'security/follow-always-async' into 'develop' kaniini 2018-10-07 01:16:05 +0000
  • b638cc50b6 Merge branch 'patch-2' into 'develop' kaniini 2018-10-07 01:10:12 +0000
  • a15eac05a6 Merge branch 'update-pleroma-frontend' into 'develop' kaniini 2018-10-07 01:09:33 +0000
  • 7b3fff9af8 {mastodon api, twitter api}: make the follow handshake timeout configurable William Pitcock 2018-10-07 01:05:59 +0000
  • be7bb90bef update-pleroma-frontend hakabahitoyo 2018-10-07 09:58:08 +0900
  • 7f530f6f80 mastodon api: relationship view: better handle no pre-existing follow activity William Pitcock 2018-10-05 23:50:13 +0000
  • e69faf550c user: add wait_and_refresh() for async three-way handshake case William Pitcock 2018-10-05 23:40:49 +0000
  • 3e751496e3 mastodon api: account view: fetch follow state and use it to populate requested field William Pitcock 2018-10-05 23:31:49 +0000
  • a71b822013 activitypub: always track following state for async reasons William Pitcock 2018-10-05 23:31:00 +0000
  • 8ce217776d activitypub transmogrifier: better manage follow state William Pitcock 2018-10-05 23:30:34 +0000
  • 4f7a468659 user: only pre-create follow relationships on OStatus William Pitcock 2018-10-05 22:53:59 +0000
  • 614e47aa7c Merge branch 'revert-d31bbb1c' into 'develop' kaniini 2018-10-05 21:17:46 +0000
  • 497814cbbb test: update test for new html scrub policy William Pitcock 2018-10-05 21:11:22 +0000
  • bd76d9cee6 nodeinfo: add accepted post formats to metadata William Pitcock 2018-10-05 21:05:37 +0000
  • 285ac80c36 config: allow for accepted post formats to be configured William Pitcock 2018-10-05 21:02:17 +0000
  • 52b05137c5 formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly William Pitcock 2018-09-09 23:40:24 +0000
  • 16307da311 twitterapi: frontend config: add formattingOptionsEnabled William Pitcock 2018-09-09 12:12:31 +0000
  • b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'" William Pitcock 2018-09-02 00:14:25 +0000