Commit graph

  • 3f5b784596 test: rich media: parser: add malformed data regression test William Pitcock 2019-01-31 16:19:53 +0000
  • 46dba03098 rich media: parser: only try to validate strings, not numbers (OEmbed) William Pitcock 2019-01-31 16:19:31 +0000
  • 4e76f9fde1 test: add malformed OGP data fixture William Pitcock 2019-01-31 16:12:35 +0000
  • dafb6f0b5e rich media: parser: reject OGP fields we cannot safely process William Pitcock 2019-01-31 16:03:56 +0000
  • 7057891db6 Make rich media support toggleable rinpatch 2019-01-31 18:18:20 +0300
  • a0dc95d084 Clarify the description of the logo_mask configuration key. Alice 2019-01-31 13:14:22 +0000
  • bd89cdbe31 Merge branch 'revert-4d3655c4' into 'develop' lambda 2019-01-31 12:16:44 +0000
  • a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" lambda 2019-01-31 12:16:23 +0000
  • 4d3655c479 Merge branch 'spc-fix-3' into 'develop' kaniini 2019-01-31 11:29:29 +0000
  • 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' Haelwenn 2019-01-31 10:16:11 +0000
  • 5f40f4f74d Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop' Haelwenn 2019-01-31 10:12:48 +0000
  • de0c1c641a
    [MastodonFE] Update Frontend (glitch) Haelwenn (lanodan) Monnier 2018-09-16 23:17:34 +0200
  • 58e250d9d2 fix merge Egor Kislitsyn 2019-01-31 15:23:50 +0700
  • d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs Egor Kislitsyn 2019-01-31 15:07:49 +0700
  • 95d6118090 Merge branch 'add-wiki-reference-to-readme' into 'develop' kaniini 2019-01-30 21:38:15 +0000
  • 242748cc54
    Reformat to make markdownlint happy and other little typographic things shibayashi 2019-01-30 22:26:10 +0100
  • 388475c478
    Add reference to Pleroma Wiki in the Readme shibayashi 2019-01-30 22:15:52 +0100
  • 6b54a3ec0b Merge branch 'multiple-hackney-pools' into 'develop' lambda 2019-01-30 20:18:05 +0000
  • 45d22269e7 Merge branch '2019-1-30-update-frontend' into 'develop' lambda 2019-01-30 20:17:22 +0000
  • 5ea0397e2d
    Fix 4aff4efa typos href 2019-01-30 21:08:41 +0100
  • 88a40308d3 update frontend lain 2019-01-30 21:04:58 +0100
  • bd5086731e Merge branch 'multiple-hackney-pools' into 'develop' kaniini 2019-01-30 19:01:57 +0000
  • 6fe01a3234 Merge branch 'better-following' into 'develop' kaniini 2019-01-30 18:50:00 +0000
  • c53b96a024 Fix specs. lain 2019-01-30 19:45:31 +0100
  • 47ec690c54 Use race-condition free mass follow. lain 2019-01-30 19:33:25 +0100
  • 935e65e261 Use race-condition free following method. lain 2019-01-30 19:21:04 +0100
  • ab31adf15b tiny improve Egor Kislitsyn 2019-01-30 22:56:59 +0700
  • 4aff4efa8d
    Use multiple hackney pools href 2019-01-30 12:38:38 +0100
  • aa98a100b4 Merge branch 'docs/fix-frontend_config' into 'develop' Haelwenn 2019-01-30 10:56:53 +0000
  • 7db517ff06
    docs/config.md: Fix syntax, pleroma_fe isn’t an atom Haelwenn (lanodan) Monnier 2019-01-30 11:51:12 +0100
  • cfda532d16 Merge branch 'docs/fix-frontend_config' into 'develop' kaniini 2019-01-30 10:38:41 +0000
  • aa492af6c2
    docs/config.md: Fix typo, provide an example key with camelCase and where to find more Haelwenn (lanodan) Monnier 2019-01-30 11:33:06 +0100
  • 97694eb451 Merge branch 'docs/fix-pleroma-api-title' into 'develop' lambda 2019-01-29 19:24:30 +0000
  • 3f9d0c08ea
    docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it Haelwenn (lanodan) Monnier 2019-01-29 19:11:34 +0100
  • 7a2c4f984b Merge branch 'bugfix/fix-rejects' into 'develop' kaniini 2019-01-29 14:47:36 +0000
  • d03a116654 Merge branch 'hj-happiness-improvement' into 'develop' kaniini 2019-01-29 13:54:10 +0000
  • 57549f6043 activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target William Pitcock 2019-01-29 12:21:02 +0000
  • cbb2b709de activitypub: transmogrifier: fix follow request rejections William Pitcock 2019-01-29 11:57:46 +0000
  • 92753b0cd9 [#534] Made federation push sender be determined basing on content instead of referer header. Updated tests. Ivan Tashkinov 2019-01-29 13:12:28 +0300
  • ebb3496386 Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' Haelwenn 2019-01-29 05:11:08 +0000
  • 61d6715714 rich media: oembed: return data in the same format as the other parsers William Pitcock 2019-01-28 21:07:36 +0000
  • ddb5545202 rich media: kill some testsuite noise William Pitcock 2019-01-28 20:55:33 +0000
  • 0f11254a06 rich media: parser: add some basic sanity checks on the returned data with pattern matching William Pitcock 2019-01-28 20:31:43 +0000
  • 83b7062634 rich media: parser: cache negatives William Pitcock 2019-01-28 20:19:07 +0000
  • 8fb16e9f0f rich media: parser: add copyright header William Pitcock 2019-01-28 19:59:36 +0000
  • 3e968f9ef2 Format Maxim Filippov 2019-01-28 21:35:02 +0300
  • 50d6183893 Split hide_network into hide_followers & hide_followings Maxim Filippov 2019-01-28 21:31:08 +0300
  • 1724a6b34b add spec back Egor Kislitsyn 2019-01-29 00:35:57 +0700
  • 56533495b5 fix defaults Egor Kislitsyn 2019-01-29 00:33:08 +0700
  • b2e9700785 cleanup Egor Kislitsyn 2019-01-28 23:12:02 +0700
  • 55affbca7f add a job queue Egor Kislitsyn 2019-01-28 22:17:17 +0700
  • 009273fd6e Merge branch 'app-list-changes' into 'develop' kaniini 2019-01-28 14:31:03 +0000
  • b57b56ff3e App list changes: Separate into two categories, and drop Subway Tooter. scarlett 2019-01-28 14:24:49 +0000
  • f53d464db0 Put deprecation warnings undre Pleroma.Config. lain 2019-01-28 14:39:54 +0100
  • d3f9e6f6fe [#534] Merged upstream/develop. Ivan Tashkinov 2019-01-28 15:39:14 +0300
  • 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. Ivan Tashkinov 2019-01-28 15:25:06 +0300
  • 8e8a1e1ba8 Return new-style config if old-style config is set to false. lain 2019-01-28 13:07:12 +0100
  • bcc559e4e6 Update config.md lain 2019-01-28 13:06:28 +0100
  • f1d58c5c49 Don't run warnings in a task. lain 2019-01-28 13:05:17 +0100
  • 39b2457734 Change default bg image in new config. lain 2019-01-28 13:04:51 +0100
  • de0fb88a9c Merge branch 'safe-render-activities' into 'develop' Haelwenn 2019-01-28 11:48:03 +0000
  • df2f7b39dd
    re f83bae7c: remove unnecessary filter href 2019-01-28 12:24:14 +0100
  • f231313b70 Add deprecation warning mechanism. lain 2019-01-28 12:09:41 +0100
  • 74ed1b4d87 Merge branch 'oauth-login-failure-bug' into 'develop' href 2019-01-28 10:49:03 +0000
  • 1825118fd4 Correctly handle invalid credentials on auth login. lain 2019-01-28 11:41:47 +0100
  • b380b4898d Merge branch 'patch-2' into 'develop' Haelwenn 2019-01-28 08:23:21 +0000
  • 9e43a28bc3 Update the openrc service's retry with the correct format vaartis 2019-01-28 08:18:11 +0000
  • 9560abea10 [#534] Refactoring / tweaks per MR review. Ivan Tashkinov 2019-01-28 11:03:52 +0300
  • ddc7ae2c1a mastodon api: card: force OGP images through mediaproxy William Pitcock 2019-01-28 06:42:27 +0000
  • 339c26e12b test: add status posting with OGP link preview test William Pitcock 2019-01-28 06:19:00 +0000
  • ebeabdcc72 rich media: helpers: clean up unused aliases William Pitcock 2019-01-28 06:10:25 +0000
  • 91ef64a1ec activitypub: prime OGP crawler cache when new messages are inserted into the database William Pitcock 2019-01-28 06:07:18 +0000
  • 8e42251e06 rich media: add helpers module, use instead of MastodonAPI module William Pitcock 2019-01-28 06:04:54 +0000
  • 24a103a1fe mastodon api: formatting William Pitcock 2019-01-27 12:39:20 +0000
  • 6096846f5f API: kill /api/rich_media/parse endpoint William Pitcock 2019-01-27 12:34:49 +0000
  • 020b3b29d9 test: update twitterapi tests William Pitcock 2019-01-27 12:27:46 +0000
  • 07a9a891ad twitter api: fix up activity representer William Pitcock 2019-01-27 12:27:37 +0000
  • 364cf5369b test: update mastodon status view tests William Pitcock 2019-01-27 12:21:51 +0000
  • de42646634 rich media: add try/rescue to ensure we catch parsing and fetching failures William Pitcock 2019-01-27 12:21:05 +0000
  • 5d895093fd twitter api: embed card in twitterapi posts William Pitcock 2019-01-27 12:16:08 +0000
  • 5a37ddc2dc mastodon api: embed card in status object William Pitcock 2019-01-27 12:15:41 +0000
  • 132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data William Pitcock 2019-01-27 09:37:11 +0000
  • cda1470e02
    [MastoAPI][GlitchAPI] Add bookmarks Haelwenn (lanodan) Monnier 2018-09-19 02:04:56 +0200
  • 872241d7c5
    /web/index template: Modify for glitch-soc Haelwenn (lanodan) Monnier 2018-09-19 02:10:54 +0200
  • 6db792124b Merge branch 'notice-404-to-fe' into 'develop' rinpatch 2019-01-27 22:01:20 +0000
  • 71bb90073b
    /notice/:id - send the FE index even if 404 href 2019-01-27 22:51:50 +0100
  • 16ab1437d6 Merge branch 'safe-render-activities' into 'develop' lambda 2019-01-27 20:10:09 +0000
  • 2e277dd4ad Fix objects. lain 2019-01-27 21:03:15 +0100
  • ea12371a01 Merge branch 'discard-invalid-likes' into 'develop' kaniini 2019-01-27 19:10:15 +0000
  • 77f2137383
    Transmogrifier: fix incoming objects with invalid likes href 2019-01-27 19:27:16 +0100
  • f83bae7c22
    Views: wrap activity rendering in a rescue href 2019-01-27 19:15:35 +0100
  • 00fd9c9e5c Merge branch 'hotfix/favorites-index' into 'develop' kaniini 2019-01-27 15:22:08 +0000
  • 9af798ad40 Merge branch 'flake-random-worker-id' into 'develop' kaniini 2019-01-27 15:16:06 +0000
  • 15d12a69a4 add activities likes index, fixes favorites API call William Pitcock 2019-01-27 15:15:33 +0000
  • e0e0cc5ab0
    Flake: random worker id href 2019-01-27 16:04:36 +0100
  • 6c41c54d1b Merge branch 'docs/emoji-endpoint-similarities' into 'develop' rinpatch 2019-01-27 14:28:51 +0000
  • 37520e1e79
    docs/Pleroma-API.md: Add note about emoji endpoints similarities Haelwenn (lanodan) Monnier 2019-01-27 14:30:21 +0100
  • 5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop' kaniini 2019-01-27 12:45:50 +0000
  • b58e4ddb10 Merge branch 'features/masto-account-view-rights' into 'develop' Haelwenn 2019-01-27 09:45:51 +0000
  • a65c188593
    Web.MastodonAPI.AccountView: Add is_moderator and is_admin Haelwenn (lanodan) Monnier 2019-01-27 10:21:13 +0100