Commit graph

  • 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
  • f7ba393bb9 Merge branch 'feature/nodeinfo_federation_info' into 'develop' kaniini 2018-10-05 20:41:16 +0000
  • f2efc8dcfb
    nodeinfo_controller: Fix JSON rendering Haelwenn (lanodan) Monnier 2018-10-05 22:32:53 +0200
  • 28651df478
    MRF Transparency Haelwenn (lanodan) Monnier 2018-10-04 13:37:17 +0200
  • 56d31db130
    Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one Haelwenn (lanodan) Monnier 2018-10-01 11:51:12 +0200
  • 8226953f1d
    [Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple Haelwenn (lanodan) Monnier 2018-09-05 23:06:55 +0200
  • 4f03bb2299 Merge branch 'bugfix/fix-mrf-reject-match' into 'develop' kaniini 2018-09-30 05:32:56 +0000
  • 4db1bc2c0e activitypub: fix error condition match William Pitcock 2018-09-30 05:25:28 +0000
  • a32e013909 Relax form-action content security policy barrucadu 2018-09-28 22:17:19 +0000
  • ab2e5ba989 Merge branch 'bugfix/magnet-links' into 'develop' Haelwenn 2018-09-28 19:20:54 +0000
  • a3cffd3566
    formatter: Stop using phoenix HTML and format it ourselves Haelwenn (lanodan) Monnier 2018-09-28 17:20:28 +0200
  • 34b6d444d6 Merge branch 'feature/twitter_api/fields' into 'develop' Haelwenn 2018-09-28 09:25:27 +0000
  • a74daabfae
    [Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields Haelwenn (lanodan) Monnier 2018-09-28 11:17:33 +0200
  • 82b57ebad1
    [Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" Haelwenn (lanodan) Monnier 2018-09-27 20:17:44 +0200
  • dbc9feecbf Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop' kaniini 2018-09-28 00:51:45 +0000
  • 707077edde activitypub: don't fall back to OStatus fetching when MRF rejects an object William Pitcock 2018-09-28 00:44:15 +0000
  • db989d1fa4 Merge branch 'security/ap-unsigned-create' into 'develop' kaniini 2018-09-28 00:14:53 +0000
  • 5c312ad677 activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else William Pitcock 2018-09-28 00:01:54 +0000
  • 6258ddaa60 Merge branch 'bugfix/kroeg' into 'develop' kaniini 2018-09-27 20:25:35 +0000
  • c739737998
    transmogrifier: get_actor called without casting attributedTo in actor and actor is nil Haelwenn (lanodan) Monnier 2018-09-27 11:51:36 +0200
  • 9446b02bdf
    transmogrifier: Just make attachement maps into a list and reroll Haelwenn (lanodan) Monnier 2018-09-27 11:38:30 +0200
  • e53da692fb
    transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on Haelwenn (lanodan) Monnier 2018-09-27 11:10:54 +0200
  • d830a243a3
    transmogrifier: more robustly handle dereferencing pointer URIs William Pitcock 2018-09-27 07:14:15 +0000
  • 4c3a80de96
    transmogrifier: Use oneliners when applicable Haelwenn (lanodan) Monnier 2018-09-26 21:01:33 +0200
  • ed8dfa3029
    transmogrifier: reformat cond block by hand William Pitcock 2018-09-26 18:47:18 +0000
  • eebe33e86a
    transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor Haelwenn (lanodan) Monnier 2018-09-26 11:27:00 +0200
  • f3291acc91
    transmogrifier: pro-actively add support for Hashtag without array in tag Haelwenn (lanodan) Monnier 2018-09-26 10:21:58 +0200
  • 2c820e10b8
    transmogrifier_test: incoming notices with tag not being an array (kroeg) Haelwenn (lanodan) Monnier 2018-09-26 07:48:34 +0200
  • 22927f3a34
    transmogrifier: Use a cond, add proactive support for arrays Haelwenn (lanodan) Monnier 2018-09-25 17:12:29 +0200
  • 0aac72f1d3
    [Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map Haelwenn (lanodan) Monnier 2018-09-21 14:46:49 +0200
  • 28e8a8ab36
    [Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg] Haelwenn (lanodan) Monnier 2018-09-21 14:36:29 +0200
  • f8a0cb9c0b
    [Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg] Haelwenn (lanodan) Monnier 2018-09-21 12:57:31 +0200
  • a4abb124ea
    [Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg] Haelwenn (lanodan) Monnier 2018-09-21 12:43:35 +0200
  • 523757be52
    [Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg] Haelwenn (lanodan) Monnier 2018-09-21 11:41:20 +0200
  • 3de12c194f Merge branch 'fix/s3/filenames-with-spaces' into 'develop' kaniini 2018-09-24 14:17:21 +0000
  • f77ec96707 Uploaders.S3: Replace unsafe characters in object key Martin Kühl 2018-09-24 15:38:32 +0200
  • 7252055078 Merge branch 'update/pleroma-fe-20180922' into 'develop' kaniini 2018-09-22 05:08:37 +0000
  • bb213a85c5 update pleroma frontend William Pitcock 2018-09-22 05:07:20 +0000
  • d94ee5cd50 Mastodon API: Support push subscription CRUD Martin Kühl 2018-09-18 11:56:46 +0200
  • c2d592c9c5 Assign token to connection Martin Kühl 2018-09-18 11:39:06 +0200
  • 3193423be9 Merge branch 'feature/html-scrub-policy-tests' into 'develop' kaniini 2018-09-22 03:50:39 +0000
  • 85b59d07b6 test: add smoketests for the scrubbing policies William Pitcock 2018-09-22 03:44:19 +0000
  • 7f0e291483 html: twittertext: add missing catchall scrub function William Pitcock 2018-09-22 03:19:43 +0000
  • 7e12ef0ab0 Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop' kaniini 2018-09-22 03:30:00 +0000
  • 56577d8b48 twitter api: add no_rich_text option to userview for account prefs William Pitcock 2018-09-22 03:20:25 +0000
  • ec6a7799d8 Merge branch 'feature/rich-text-optout-backend' into 'develop' kaniini 2018-09-22 03:08:19 +0000
  • bd03644ca8 test: add tests for new User.html_filter_policy() William Pitcock 2018-09-22 03:01:01 +0000
  • df00a364fb mastodon api: formatting William Pitcock 2018-09-22 02:48:42 +0000
  • c2b69798dd twitter api: add support for disabling rich text William Pitcock 2018-09-22 02:17:19 +0000
  • 958e085acb mastodon api: add support for user-supplied html policy William Pitcock 2018-09-22 02:14:25 +0000
  • 2f5b026548 twitter api: add support for user-specified html policy William Pitcock 2018-09-22 02:13:54 +0000
  • 735cdfb848 user: add User.html_filter_policy() William Pitcock 2018-09-22 01:37:05 +0000
  • 8ae9424edb html: default to using normal scrub policy if provided scrub policy is nil William Pitcock 2018-09-22 01:10:53 +0000
  • 4cb6331843 Merge branch 'feature/dynamic-user-refresh' into 'develop' kaniini 2018-09-21 00:00:28 +0000
  • 0fe165165f Merge branch 'task-204-on-options-request' into 'develop' kaniini 2018-09-20 23:54:51 +0000
  • 8e28e8a18f mix: remove fix_ap_users task, now obsolete William Pitcock 2018-09-20 23:51:06 +0000
  • 200ab27e7a test: add test proving that users are refreshed when stale William Pitcock 2018-09-20 23:49:08 +0000
  • c9f6eb9a41 user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) William Pitcock 2018-09-19 06:13:18 +0000
  • f2727e23ee Merge branch 'bump-mastofe-2018-09-20' into 'develop' Haelwenn 2018-09-20 16:24:32 +0000
  • 83e3afac2c Update mastodon frontend Haelwenn (lanodan) Monnier 2018-09-20 18:10:13 +0200
  • 7458adc256 Merge branch 'feature/mastodon_api_2.5.0' into 'develop' Haelwenn 2018-09-20 14:54:30 +0000
  • 40c51f118f
    [Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0 Haelwenn (lanodan) Monnier 2018-09-20 16:48:12 +0200
  • f74725df41
    [Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables Haelwenn (lanodan) Monnier 2018-09-20 16:37:18 +0200
  • 33a1e92584
    [Pleroma.Web.Router]: Fake /api/v1/endorsements Haelwenn (lanodan) Monnier 2018-09-20 16:25:07 +0200
  • a8eaecadee
    [Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false) Haelwenn (lanodan) Monnier 2018-09-20 16:22:31 +0200