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

Commit Graph

  • 833404f0f5 Use with instead of if in the card rinpatch 2019-02-02 12:04:18 +03:00
  • e4d18f328b merge only if page_url is an absolute path rinpatch 2019-02-02 11:53:46 +03:00
  • cbadf9d333 Fix rich media relative path rinpatch 2019-02-02 11:38:37 +03:00
  • 09e1c8c05d Merge branch 'revert-0a82a7e6' into 'develop' kaniini 2019-02-01 20:23:55 +00:00
  • 486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'" kaniini 2019-02-01 20:22:58 +00:00
  • 28bfb09b01 Merge branch 'hotfix/object-normalize-cache' into 'develop' href 2019-02-01 19:45:55 +00:00
  • ffbf306c9a Merge branch 'streaming-api-url-fix' into 'develop' href 2019-02-01 19:39:50 +00:00
  • af10ef8d4e object: use cached accesses when possible in Object.normalize() William Pitcock 2019-02-01 19:38:57 +00:00
  • a184811a60 Use url() instead of static_url in Endpoint.websocket_url() eugenijm 2019-02-01 22:35:19 +03:00
  • 7e384a2425 Merge branch 'develop' into 'develop' href 2019-02-01 19:18:46 +00:00
  • 9cac8729af update nodeinfo version when requesting 2.1 Luna 2019-02-01 16:03:23 -03:00
  • d747bd9870 Use String.replace_leading instead of String.replace for getting websocket streaming api url. eugenijm 2019-02-01 21:56:18 +03:00
  • 1cdcee89da mix format pass Luna 2019-02-01 14:40:43 -03:00
  • 23b1c64a19 downcase software name in nodeinfo Luna 2019-02-01 14:35:08 -03:00
  • e8c7be38fc add tests for nodeinfo 2.0 compat and 2.1's new field Luna 2019-02-01 14:33:14 -03:00
  • 389e6a878a Merge branch 'bugfix/get_list_return_404' into 'develop' Haelwenn 2019-02-01 17:27:50 +00:00
  • b17ce875cf keep compatibility with nodeinfo 2.0 Luna 2019-02-01 14:23:40 -03:00
  • 74c6119f28
         MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list Haelwenn (lanodan) Monnier 2019-02-01 18:15:15 +01:00
  • cd6db6abe4 use Mix.Project.Config for some Application functions Luna 2019-02-01 14:11:23 -03:00
  • 0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop' kaniini 2019-02-01 17:05:29 +00:00
  • fc7644798d Merge branch 'serve-sw-pleroma.js' into 'develop' lambda 2019-02-01 14:24:07 +00:00
  • fa5ec765d9
         Serve sw-pleroma.js properly href 2019-02-01 11:34:41 +01:00
  • ddab8d45ec Merge branch 'fix-rich-media-toggle' into 'develop' lambda 2019-02-01 09:33:50 +00:00
  • 01d483f9c7 Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle lain 2019-02-01 10:21:17 +01:00
  • b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' href 2019-02-01 09:14:35 +00:00
  • b0c4c082c4 mix format pass Luna 2019-02-01 04:02:40 -03:00
  • c05928dbda use nodeinfo 2.1, add repository field Luna 2019-02-01 03:55:10 -03:00
  • 0340fcaeca Merge branch 'docs/pleroma-api-invite-token' into 'develop' Haelwenn 2019-01-31 22:28:08 +00:00
  • a7c55c61bb
         docs/Pleroma-API.md: Add missing token field documentation Haelwenn (lanodan) Monnier 2019-01-31 23:23:53 +01:00
  • b19b4f8537 Remove default value for rich media. lain 2019-01-31 20:02:08 +01:00
  • e914eeb632 Merge branch 'user-follow-all-unique' into 'develop' kaniini 2019-01-31 18:50:00 +00:00
  • 308b35ebe2
         User.follow_all: ensure its stays unique href 2019-01-31 18:07:46 +01:00
  • 44913c1019 Merge branch 'bugfix/rich-media-non-unicode' into 'develop' lambda 2019-01-31 16:54:48 +00:00
  • 106475f265 test: http mocks: formatting William Pitcock 2019-01-31 16:30:56 +00:00
  • dea33f4aec Merge branch 'develop' into 'develop' kaniini 2019-01-31 16:28:40 +00:00
  • fb9730010e Merge branch 'fix/rich-media-disable-in-config' into 'develop' kaniini 2019-01-31 16:22:26 +00:00
  • 3f5b784596 test: rich media: parser: add malformed data regression test William Pitcock 2019-01-31 16:19:53 +00:00
  • 46dba03098 rich media: parser: only try to validate strings, not numbers (OEmbed) William Pitcock 2019-01-31 16:19:31 +00:00
  • 4e76f9fde1 test: add malformed OGP data fixture William Pitcock 2019-01-31 16:12:35 +00:00
  • dafb6f0b5e rich media: parser: reject OGP fields we cannot safely process William Pitcock 2019-01-31 16:03:56 +00:00
  • 7057891db6 Make rich media support toggleable rinpatch 2019-01-31 18:18:20 +03:00
  • a0dc95d084 Clarify the description of the logo_mask configuration key. Alice 2019-01-31 13:14:22 +00:00
  • bd89cdbe31 Merge branch 'revert-4d3655c4' into 'develop' lambda 2019-01-31 12:16:44 +00:00
  • a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" lambda 2019-01-31 12:16:23 +00:00
  • 4d3655c479 Merge branch 'spc-fix-3' into 'develop' kaniini 2019-01-31 11:29:29 +00:00
  • 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' Haelwenn 2019-01-31 10:16:11 +00:00
  • 5f40f4f74d Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop' Haelwenn 2019-01-31 10:12:48 +00:00
  • de0c1c641a
         [MastodonFE] Update Frontend (glitch) Haelwenn (lanodan) Monnier 2018-09-16 23:17:34 +02:00
  • 58e250d9d2 fix merge Egor Kislitsyn 2019-01-31 15:23:50 +07:00
  • d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs Egor Kislitsyn 2019-01-31 15:07:49 +07:00
  • 95d6118090 Merge branch 'add-wiki-reference-to-readme' into 'develop' kaniini 2019-01-30 21:38:15 +00:00
  • 242748cc54
         Reformat to make markdownlint happy and other little typographic things shibayashi 2019-01-30 22:26:10 +01:00
  • 388475c478
         Add reference to Pleroma Wiki in the Readme shibayashi 2019-01-30 22:15:52 +01:00
  • 6b54a3ec0b Merge branch 'multiple-hackney-pools' into 'develop' lambda 2019-01-30 20:18:05 +00:00
  • 45d22269e7 Merge branch '2019-1-30-update-frontend' into 'develop' lambda 2019-01-30 20:17:22 +00:00
  • 5ea0397e2d
         Fix 4aff4efa typos href 2019-01-30 21:08:41 +01:00
  • 88a40308d3 update frontend lain 2019-01-30 21:04:58 +01:00
  • bd5086731e Merge branch 'multiple-hackney-pools' into 'develop' kaniini 2019-01-30 19:01:57 +00:00
  • 6fe01a3234 Merge branch 'better-following' into 'develop' kaniini 2019-01-30 18:50:00 +00:00
  • c53b96a024 Fix specs. lain 2019-01-30 19:45:31 +01:00
  • 47ec690c54 Use race-condition free mass follow. lain 2019-01-30 19:33:25 +01:00
  • 935e65e261 Use race-condition free following method. lain 2019-01-30 19:21:04 +01:00
  • ab31adf15b tiny improve Egor Kislitsyn 2019-01-30 22:56:59 +07:00
  • 4aff4efa8d
         Use multiple hackney pools href 2019-01-30 12:38:38 +01:00
  • aa98a100b4 Merge branch 'docs/fix-frontend_config' into 'develop' Haelwenn 2019-01-30 10:56:53 +00:00
  • 7db517ff06
         docs/config.md: Fix syntax, pleroma_fe isn’t an atom Haelwenn (lanodan) Monnier 2019-01-30 11:51:12 +01:00
  • cfda532d16 Merge branch 'docs/fix-frontend_config' into 'develop' kaniini 2019-01-30 10:38:41 +00:00
  • 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 +01:00
  • 97694eb451 Merge branch 'docs/fix-pleroma-api-title' into 'develop' lambda 2019-01-29 19:24:30 +00:00
  • 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 +01:00
  • 7a2c4f984b Merge branch 'bugfix/fix-rejects' into 'develop' kaniini 2019-01-29 14:47:36 +00:00
  • d03a116654 Merge branch 'hj-happiness-improvement' into 'develop' kaniini 2019-01-29 13:54:10 +00:00
  • 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 +00:00
  • cbb2b709de activitypub: transmogrifier: fix follow request rejections William Pitcock 2019-01-29 11:57:46 +00:00
  • 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 +03:00
  • ebb3496386 Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' Haelwenn 2019-01-29 05:11:08 +00:00
  • 61d6715714 rich media: oembed: return data in the same format as the other parsers William Pitcock 2019-01-28 21:07:36 +00:00
  • ddb5545202 rich media: kill some testsuite noise William Pitcock 2019-01-28 20:55:33 +00:00
  • 0f11254a06 rich media: parser: add some basic sanity checks on the returned data with pattern matching William Pitcock 2019-01-28 20:31:43 +00:00
  • 83b7062634 rich media: parser: cache negatives William Pitcock 2019-01-28 20:19:07 +00:00
  • 8fb16e9f0f rich media: parser: add copyright header William Pitcock 2019-01-28 19:59:36 +00:00
  • 3e968f9ef2 Format Maxim Filippov 2019-01-28 21:35:02 +03:00
  • 50d6183893 Split hide_network into hide_followers & hide_followings Maxim Filippov 2019-01-28 21:31:08 +03:00
  • 1724a6b34b add spec back Egor Kislitsyn 2019-01-29 00:35:57 +07:00
  • 56533495b5 fix defaults Egor Kislitsyn 2019-01-29 00:33:08 +07:00
  • b2e9700785 cleanup Egor Kislitsyn 2019-01-28 23:12:02 +07:00
  • 55affbca7f add a job queue Egor Kislitsyn 2019-01-28 22:17:17 +07:00
  • 009273fd6e Merge branch 'app-list-changes' into 'develop' kaniini 2019-01-28 14:31:03 +00:00
  • b57b56ff3e App list changes: Separate into two categories, and drop Subway Tooter. scarlett 2019-01-28 14:24:49 +00:00
  • f53d464db0 Put deprecation warnings undre Pleroma.Config. lain 2019-01-28 14:39:54 +01:00
  • d3f9e6f6fe [#534] Merged upstream/develop. Ivan Tashkinov 2019-01-28 15:39:14 +03:00
  • 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. Ivan Tashkinov 2019-01-28 15:25:06 +03:00
  • 8e8a1e1ba8 Return new-style config if old-style config is set to false. lain 2019-01-28 13:07:12 +01:00
  • bcc559e4e6 Update config.md lain 2019-01-28 13:06:28 +01:00
  • f1d58c5c49 Don't run warnings in a task. lain 2019-01-28 13:05:17 +01:00
  • 39b2457734 Change default bg image in new config. lain 2019-01-28 13:04:51 +01:00
  • de0fb88a9c Merge branch 'safe-render-activities' into 'develop' Haelwenn 2019-01-28 11:48:03 +00:00
  • df2f7b39dd
         re f83bae7c: remove unnecessary filter href 2019-01-28 12:24:14 +01:00
  • f231313b70 Add deprecation warning mechanism. lain 2019-01-28 12:09:41 +01:00
  • 74ed1b4d87 Merge branch 'oauth-login-failure-bug' into 'develop' href 2019-01-28 10:49:03 +00:00