kaniini [Sat, 22 Sep 2018 05:08:37 +0000 (05:08 +0000)]
Merge branch 'update/pleroma-fe-
20180922' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!357
William Pitcock [Sat, 22 Sep 2018 05:07:20 +0000 (05:07 +0000)]
update pleroma frontend
kaniini [Sat, 22 Sep 2018 03:50:39 +0000 (03:50 +0000)]
Merge branch 'feature/html-scrub-policy-tests' into 'develop'
html: add scrub policy tests
See merge request pleroma/pleroma!356
William Pitcock [Sat, 22 Sep 2018 03:44:19 +0000 (03:44 +0000)]
test: add smoketests for the scrubbing policies
William Pitcock [Sat, 22 Sep 2018 03:19:43 +0000 (03:19 +0000)]
html: twittertext: add missing catchall scrub function
kaniini [Sat, 22 Sep 2018 03:30:00 +0000 (03:30 +0000)]
Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
twitter api: add no_rich_text option to userview for account prefs
See merge request pleroma/pleroma!355
William Pitcock [Sat, 22 Sep 2018 03:20:25 +0000 (03:20 +0000)]
twitter api: add no_rich_text option to userview for account prefs
kaniini [Sat, 22 Sep 2018 03:08:19 +0000 (03:08 +0000)]
Merge branch 'feature/rich-text-optout-backend' into 'develop'
backend support for opting out of rich text on a per-account basis
See merge request pleroma/pleroma!354
William Pitcock [Sat, 22 Sep 2018 03:01:01 +0000 (03:01 +0000)]
test: add tests for new User.html_filter_policy()
William Pitcock [Sat, 22 Sep 2018 02:48:42 +0000 (02:48 +0000)]
mastodon api: formatting
William Pitcock [Sat, 22 Sep 2018 02:17:19 +0000 (02:17 +0000)]
twitter api: add support for disabling rich text
William Pitcock [Sat, 22 Sep 2018 02:14:25 +0000 (02:14 +0000)]
mastodon api: add support for user-supplied html policy
William Pitcock [Sat, 22 Sep 2018 02:13:54 +0000 (02:13 +0000)]
twitter api: add support for user-specified html policy
William Pitcock [Sat, 22 Sep 2018 01:37:05 +0000 (01:37 +0000)]
user: add User.html_filter_policy()
William Pitcock [Sat, 22 Sep 2018 01:10:53 +0000 (01:10 +0000)]
html: default to using normal scrub policy if provided scrub policy is nil
kaniini [Fri, 21 Sep 2018 00:00:28 +0000 (00:00 +0000)]
Merge branch 'feature/dynamic-user-refresh' into 'develop'
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
kaniini [Thu, 20 Sep 2018 23:54:51 +0000 (23:54 +0000)]
Merge branch 'task-204-on-options-request' into 'develop'
Return 204 response on options request
See merge request pleroma/pleroma!347
William Pitcock [Thu, 20 Sep 2018 23:51:06 +0000 (23:51 +0000)]
mix: remove fix_ap_users task, now obsolete
William Pitcock [Thu, 20 Sep 2018 23:49:08 +0000 (23:49 +0000)]
test: add test proving that users are refreshed when stale
William Pitcock [Wed, 19 Sep 2018 06:13:18 +0000 (06:13 +0000)]
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
Haelwenn [Thu, 20 Sep 2018 16:24:32 +0000 (16:24 +0000)]
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
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 16:10:13 +0000 (18:10 +0200)]
Update mastodon frontend
Haelwenn [Thu, 20 Sep 2018 14:54:30 +0000 (14:54 +0000)]
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
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:48:12 +0000 (16:48 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:37:18 +0000 (16:37 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:25:07 +0000 (16:25 +0200)]
[Pleroma.Web.Router]: Fake /api/v1/endorsements
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:22:31 +0000 (16:22 +0200)]
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:10:46 +0000 (16:10 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
William Pitcock [Wed, 19 Sep 2018 04:58:17 +0000 (04:58 +0000)]
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
William Pitcock [Wed, 19 Sep 2018 04:57:28 +0000 (04:57 +0000)]
mastodon api: default attachment type to image if one is not present
Haelwenn [Wed, 19 Sep 2018 03:53:25 +0000 (03:53 +0000)]
Merge branch 'fix/fake-filters' into 'develop'
Revert "Mastodon API: Fake support for loading filters"
See merge request pleroma/pleroma!348
Martin Kühl [Tue, 18 Sep 2018 09:57:33 +0000 (11:57 +0200)]
Revert "Mastodon API: Fake support for loading filters"
This reverts commit
c1d07da4e18cc2acd11a5a131e1482aec5996552.
The fake support was superseded by
6e030129fb33926e6a5bd75c27af6f657f9da2a5 which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
Dominique Feyer [Mon, 17 Sep 2018 10:21:01 +0000 (12:21 +0200)]
Return 204 response on options request
kaniini [Sun, 16 Sep 2018 02:25:11 +0000 (02:25 +0000)]
Merge branch 'feature/mediaproxy-inline-images' into 'develop'
html: support mediaproxy for inline images
Closes #275
See merge request pleroma/pleroma!346
William Pitcock [Sun, 16 Sep 2018 02:13:54 +0000 (02:13 +0000)]
config: pass inline images through mediaproxy (closes #275)
William Pitcock [Sun, 16 Sep 2018 02:07:32 +0000 (02:07 +0000)]
html: add policy which transforms inline images to pass through the media proxy
William Pitcock [Sun, 16 Sep 2018 02:07:01 +0000 (02:07 +0000)]
html: allow scrubbing policies to be stackable
kaniini [Sun, 16 Sep 2018 01:31:03 +0000 (01:31 +0000)]
Merge branch 'feature/mrf-scrub' into 'develop'
MRF: html scrubbing filter
See merge request pleroma/pleroma!345
William Pitcock [Mon, 10 Sep 2018 00:48:28 +0000 (00:48 +0000)]
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
William Pitcock [Mon, 10 Sep 2018 00:33:44 +0000 (00:33 +0000)]
html: add the ability to override the default scrub policy
kaniini [Sun, 16 Sep 2018 01:09:38 +0000 (01:09 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!344
kaniini [Sun, 16 Sep 2018 01:05:09 +0000 (01:05 +0000)]
Merge branch 'feature/html-scrub-policy' into 'develop'
html scrub policy
See merge request pleroma/pleroma!339
hakabahitoyo [Fri, 14 Sep 2018 01:47:10 +0000 (10:47 +0900)]
update-pleroma-frontend
Haelwenn [Wed, 12 Sep 2018 18:01:11 +0000 (18:01 +0000)]
Merge branch 'patch-3' into 'develop'
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
shadowfacts [Mon, 10 Sep 2018 23:40:29 +0000 (23:40 +0000)]
Update status_view_test.exs
shadowfacts [Mon, 10 Sep 2018 23:32:19 +0000 (23:32 +0000)]
Add visible_in_picker to status emojis
kaniini [Mon, 10 Sep 2018 02:03:01 +0000 (02:03 +0000)]
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
activitypub: transmogrifier: allow profile updates from bots
See merge request pleroma/pleroma!341
William Pitcock [Mon, 10 Sep 2018 01:57:03 +0000 (01:57 +0000)]
activitypub: transmogrifier: allow profile updates from bots
kaniini [Mon, 10 Sep 2018 01:22:06 +0000 (01:22 +0000)]
Merge branch 'refactor/mrf-pattern-matching' into 'develop'
MRF: significant refactoring
See merge request pleroma/pleroma!340
William Pitcock [Mon, 10 Sep 2018 01:13:38 +0000 (01:13 +0000)]
MRF: reject non-public: use pattern match to remove unnecessary if block
William Pitcock [Mon, 10 Sep 2018 01:06:44 +0000 (01:06 +0000)]
MRF: simple policy: refactor module to use guards and pattern matching
William Pitcock [Mon, 10 Sep 2018 00:53:37 +0000 (00:53 +0000)]
MRF: simple policy: contain media removal/nsfw ops to create activities only
William Pitcock [Mon, 10 Sep 2018 00:28:40 +0000 (00:28 +0000)]
formatting
William Pitcock [Mon, 10 Sep 2018 00:23:23 +0000 (00:23 +0000)]
html: allow inline images by default (because of custom emoji)
William Pitcock [Mon, 10 Sep 2018 00:05:26 +0000 (00:05 +0000)]
html: add default scrubbing profile and configuration knobs
William Pitcock [Sun, 9 Sep 2018 23:40:24 +0000 (23:40 +0000)]
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
William Pitcock [Sun, 9 Sep 2018 23:29:00 +0000 (23:29 +0000)]
html: new module providing a configurable markup scrubbing policy
kaniini [Sun, 9 Sep 2018 23:09:43 +0000 (23:09 +0000)]
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
Dominique Feyer [Sun, 9 Sep 2018 21:42:28 +0000 (23:42 +0200)]
TASK: Fix formatting
Dominique Feyer [Sun, 9 Sep 2018 21:31:47 +0000 (23:31 +0200)]
Add missing URL encoding in create authorization redirect
kaniini [Sun, 9 Sep 2018 13:06:17 +0000 (13:06 +0000)]
Merge branch 'bugfix/test-circular-reference' into 'develop'
test: user enabled plug tests: fix circular reference
See merge request pleroma/pleroma!336
William Pitcock [Sun, 9 Sep 2018 12:56:25 +0000 (12:56 +0000)]
tests: break the cycle using pleroma.factory
William Pitcock [Sun, 9 Sep 2018 12:43:58 +0000 (12:43 +0000)]
tests: try breaking the cycle a different way
William Pitcock [Sun, 9 Sep 2018 12:22:00 +0000 (12:22 +0000)]
test: user enabled plug tests: fix circular reference
kaniini [Sun, 9 Sep 2018 12:15:14 +0000 (12:15 +0000)]
Merge branch 'update/pleroma-fe-
20180909' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!335
William Pitcock [Sun, 9 Sep 2018 12:09:52 +0000 (12:09 +0000)]
update pleroma frontend
kaniini [Sun, 9 Sep 2018 11:38:33 +0000 (11:38 +0000)]
Merge branch 'suggestion-api-restriction' into 'develop'
Make limit for /api/v1/suggestions
See merge request pleroma/pleroma!334
Hakaba Hitoyo [Sun, 9 Sep 2018 04:57:23 +0000 (13:57 +0900)]
make limit for /api/v1/suggestions
lambda [Sat, 8 Sep 2018 09:20:34 +0000 (09:20 +0000)]
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
kaniini [Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)]
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
kaniini [Fri, 7 Sep 2018 23:55:01 +0000 (23:55 +0000)]
Merge branch 'improve-server-config-examples' into 'develop'
Improve server config examples
See merge request pleroma/pleroma!307
kaniini [Fri, 7 Sep 2018 23:49:36 +0000 (23:49 +0000)]
Merge branch 'feature/custom_media_url' into 'develop'
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
kaniini [Fri, 7 Sep 2018 23:47:43 +0000 (23:47 +0000)]
Merge branch 'fix/tusk' into 'develop'
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
Martin Kühl [Wed, 5 Sep 2018 18:14:16 +0000 (20:14 +0200)]
Mastodon API: Fake support for loading filters
Martin Kühl [Wed, 5 Sep 2018 18:13:50 +0000 (20:13 +0200)]
Mastodon API: Add unsupported attributes to relationship responses
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
lambda [Thu, 6 Sep 2018 06:50:15 +0000 (06:50 +0000)]
Merge branch 'fix/test-failure-due-to/306' into 'develop'
Fix the tests
See merge request pleroma/pleroma!332
lain [Wed, 5 Sep 2018 20:42:50 +0000 (22:42 +0200)]
Fix warning.
lain [Wed, 5 Sep 2018 20:31:57 +0000 (22:31 +0200)]
Add LegacyAuthenticationPlug to router.
lain [Wed, 5 Sep 2018 20:30:14 +0000 (22:30 +0200)]
Update legacy passwords automatically.
Martin Kühl [Wed, 5 Sep 2018 20:20:59 +0000 (22:20 +0200)]
Fix the tests
lain [Wed, 5 Sep 2018 20:00:41 +0000 (22:00 +0200)]
Update Mix.lock
lain [Wed, 5 Sep 2018 19:57:56 +0000 (21:57 +0200)]
Add Plugs to router.
lain [Wed, 5 Sep 2018 19:53:53 +0000 (21:53 +0200)]
Add UserEnabledPlug.
lain [Wed, 5 Sep 2018 19:42:42 +0000 (21:42 +0200)]
Add SetUserSessionIdPlug.
Haelwenn [Wed, 5 Sep 2018 18:20:26 +0000 (18:20 +0000)]
Merge branch 'fix/sign-in-with-toot' into 'develop'
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
lain [Wed, 5 Sep 2018 17:13:53 +0000 (19:13 +0200)]
Add new plugs to router.
lain [Wed, 5 Sep 2018 17:06:28 +0000 (19:06 +0200)]
Add EnsureUserKeyPlug, smaller fixes
lain [Wed, 5 Sep 2018 16:53:38 +0000 (18:53 +0200)]
Simplify AuthenticationPlug
lain [Wed, 5 Sep 2018 16:37:02 +0000 (18:37 +0200)]
Add SessionAuthenticationPlug.
lain [Wed, 5 Sep 2018 16:17:33 +0000 (18:17 +0200)]
Add LegacyAuthenticationPlug
lain [Wed, 5 Sep 2018 15:59:19 +0000 (17:59 +0200)]
Add EnsureAuthenticatedPlug
lain [Wed, 5 Sep 2018 15:44:38 +0000 (17:44 +0200)]
Add UserFetcherPlug.
lain [Wed, 5 Sep 2018 15:30:05 +0000 (17:30 +0200)]
Add BasicAuthDecoderPlug
Moon Man [Wed, 5 Sep 2018 06:29:19 +0000 (02:29 -0400)]
pinned crypt dependency to specific commit
Moon Man [Wed, 5 Sep 2018 05:37:48 +0000 (01:37 -0400)]
change cond to if else
Moon Man [Wed, 5 Sep 2018 04:21:44 +0000 (00:21 -0400)]
auth against sha512-crypt password hashes, upgrade to pbkdf2
shibayashi [Mon, 3 Sep 2018 19:41:21 +0000 (21:41 +0200)]
installation/pleroma-apache.conf: OCSP stapling needs to be outside of the virtualhost directive
kaniini [Mon, 3 Sep 2018 15:00:56 +0000 (15:00 +0000)]
Merge branch 'feature/staff-discovery-api' into 'develop'
staff discovery api
See merge request pleroma/pleroma!326
kaniini [Mon, 3 Sep 2018 14:55:42 +0000 (14:55 +0000)]
Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
William Pitcock [Mon, 3 Sep 2018 14:40:14 +0000 (14:40 +0000)]
tests: add test for staffAccounts presence in nodeinfo
projects / akkoma / log