moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,272 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

2272 Commits

Author SHA1 Message Date
William Pitcock c9f6eb9a41 user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) 2018-09-20 23:50:56 +00:00
Haelwenn f2727e23ee Merge branch 'bump-mastofe-2018-09-20' into 'develop' 
Update mastodon frontend

Closes https://git.pleroma.social/pleroma/mastofe/issues/33

See: https://git.pleroma.social/pleroma/pleroma/merge_requests/352
 2018-09-20 16:24:32 +00:00
Haelwenn (lanodan) Monnier 83e3afac2c Update mastodon frontend 2018-09-20 16:13:13 +00:00
Haelwenn 7458adc256 Merge branch 'feature/mastodon_api_2.5.0' into 'develop' 
Update mastodon API to 2.5.0

Closes: https://git.pleroma.social/pleroma/pleroma/issues/298
Closes: https://git.pleroma.social/pleroma/pleroma/issues/299

See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351
 2018-09-20 14:54:30 +00:00
Haelwenn (lanodan) Monnier 40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0 2018-09-20 16:48:12 +02:00
Haelwenn (lanodan) Monnier f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables 2018-09-20 16:37:18 +02:00
Haelwenn (lanodan) Monnier 33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements 2018-09-20 16:25:07 +02:00
Haelwenn (lanodan) Monnier a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false) 2018-09-20 16:24:29 +02:00
Haelwenn (lanodan) Monnier 43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count 2018-09-20 16:10:46 +02:00
William Pitcock c9585ec007 twitter api: fix mimetype fallback when attachments use a URI instead of a URL object 2018-09-19 04:59:26 +00:00
William Pitcock 0cac493fdc mastodon api: default attachment type to image if one is not present 2018-09-19 04:59:25 +00:00
Haelwenn 47c9b972b9 Merge branch 'fix/fake-filters' into 'develop' 
Revert "Mastodon API: Fake support for loading filters"

See merge request pleroma/pleroma!348
 2018-09-19 03:53:25 +00:00
Martin Kühl f4fcea5258 Revert "Mastodon API: Fake support for loading filters" 
This reverts commit c1d07da4e1.

The fake support was superseded by 6e030129fb which actually implements the faked filters API.

This change removes the fake support and ensures that the actual implementation is used.
 2018-09-18 11:59:10 +02:00
Dominique Feyer 9b0f2d572b Return 204 response on options request 2018-09-17 12:21:01 +02:00
kaniini 22c366a85f Merge branch 'feature/mediaproxy-inline-images' into 'develop' 
html: support mediaproxy for inline images

Closes #275

See merge request pleroma/pleroma!346
 2018-09-16 02:25:11 +00:00
William Pitcock 5acfa2e091 config: pass inline images through mediaproxy (closes #275) 2018-09-16 02:16:17 +00:00
William Pitcock a7d0ecdc7c html: add policy which transforms inline images to pass through the media proxy 2018-09-16 02:16:16 +00:00
William Pitcock cd13fa17fd html: allow scrubbing policies to be stackable 2018-09-16 02:16:14 +00:00
kaniini 2881275291 Merge branch 'feature/mrf-scrub' into 'develop' 
MRF: html scrubbing filter

See merge request pleroma/pleroma!345
 2018-09-16 01:31:03 +00:00
William Pitcock 342ed84446 MRF: add policy for normalizing HTML markup (local and remote) to a specific policy 2018-09-16 01:25:36 +00:00
William Pitcock 95376ac1fe html: add the ability to override the default scrub policy 2018-09-16 01:25:35 +00:00
kaniini 8eed5938d5 Merge branch 'update-pleroma-frontend' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!344
 2018-09-16 01:09:38 +00:00
kaniini c2650f0ffb Merge branch 'feature/html-scrub-policy' into 'develop' 
html scrub policy

See merge request pleroma/pleroma!339
 2018-09-16 01:05:09 +00:00
hakabahitoyo f829b18273 update-pleroma-frontend 2018-09-14 10:47:10 +09:00
Haelwenn 90661e20cf Merge branch 'patch-3' into 'develop' 
Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342
 2018-09-12 18:01:11 +00:00
shadowfacts 85b8590109 Update status_view_test.exs 2018-09-10 23:40:29 +00:00
shadowfacts 39aed5348a Add visible_in_picker to status emojis 2018-09-10 23:32:19 +00:00
kaniini da3f930543 Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop' 
activitypub: transmogrifier: allow profile updates from bots

See merge request pleroma/pleroma!341
 2018-09-10 02:03:01 +00:00
William Pitcock d3248e13e3 activitypub: transmogrifier: allow profile updates from bots 2018-09-10 01:57:03 +00:00
kaniini b0a5637254 Merge branch 'refactor/mrf-pattern-matching' into 'develop' 
MRF: significant refactoring

See merge request pleroma/pleroma!340
 2018-09-10 01:22:06 +00:00
William Pitcock e0b8c0ccba MRF: reject non-public: use pattern match to remove unnecessary if block 2018-09-10 01:16:03 +00:00
William Pitcock 88094c266d MRF: simple policy: refactor module to use guards and pattern matching 2018-09-10 01:16:02 +00:00
William Pitcock 97253df3ee MRF: simple policy: contain media removal/nsfw ops to create activities only 2018-09-10 01:16:01 +00:00
William Pitcock e82ce2a4b3 formatting 2018-09-10 00:28:40 +00:00
William Pitcock 358f88e10a html: allow inline images by default (because of custom emoji) 2018-09-10 00:24:19 +00:00
William Pitcock 40e2f6e500 html: add default scrubbing profile and configuration knobs 2018-09-10 00:14:57 +00:00
William Pitcock ac486fc59b everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly 2018-09-10 00:14:47 +00:00
William Pitcock 255f46d7ab html: new module providing a configurable markup scrubbing policy 2018-09-10 00:13:57 +00:00
kaniini 7b96d20328 Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop' 
Add missing URL encoding in create authorization redirect

See merge request pleroma/pleroma!338
 2018-09-09 23:09:43 +00:00
Dominique Feyer 801d645c6b TASK: Fix formatting 2018-09-09 23:42:28 +02:00
Dominique Feyer b79c126ee0 Add missing URL encoding in create authorization redirect 2018-09-09 23:31:47 +02:00
kaniini 3f64ba5fc8 Merge branch 'bugfix/test-circular-reference' into 'develop' 
test: user enabled plug tests: fix circular reference

See merge request pleroma/pleroma!336
 2018-09-09 13:06:17 +00:00
William Pitcock a4fe14de02 tests: break the cycle using pleroma.factory 2018-09-09 12:56:25 +00:00
William Pitcock fc92bb28b4 tests: try breaking the cycle a different way 2018-09-09 12:43:58 +00:00
William Pitcock 33a5294fad test: user enabled plug tests: fix circular reference 2018-09-09 12:23:48 +00:00
kaniini f55ffc7893 Merge branch 'update/pleroma-fe-20180909' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!335
 2018-09-09 12:15:14 +00:00
William Pitcock e5546c282f update pleroma frontend 2018-09-09 12:14:34 +00:00
kaniini b564c23d92 Merge branch 'suggestion-api-restriction' into 'develop' 
Make limit for /api/v1/suggestions

See merge request pleroma/pleroma!334
 2018-09-09 11:38:33 +00:00
Hakaba Hitoyo 4e1bb7bccb make limit for /api/v1/suggestions 2018-09-09 13:57:23 +09:00
lambda 045953225e Merge branch 'moonman/pleroma-sha512-crypt' into 'develop' 
auth overhaul and legacy GS auth

See merge request pleroma/pleroma!331
 2018-09-08 09:20:34 +00:00