akkoma
5 years agoMerge remote-tracking branch 'official/develop' into develop
Hakaba Hitoyo [Thu, 15 Nov 2018 05:04:09 +0000 (14:04 +0900)]
Merge remote-tracking branch 'official/develop' into develop

5 years agoRevert "update pleroma frontend"
Hakaba Hitoyo [Thu, 15 Nov 2018 05:03:52 +0000 (14:03 +0900)]
Revert "update pleroma frontend"

This reverts commit 025301546702a6fe9167e49453c3a9b44607fb75.

5 years agoMerge branch 'fix-media-proxy-filename' into 'develop'
lambda [Wed, 14 Nov 2018 18:17:10 +0000 (18:17 +0000)]
Merge branch 'fix-media-proxy-filename' into 'develop'

media_proxy: use path only to retrieve filename

See merge request pleroma/pleroma!450

5 years agoMerge branch 'update/pleroma-fe-20181114' into 'develop'
kaniini [Wed, 14 Nov 2018 16:10:27 +0000 (16:10 +0000)]
Merge branch 'update/pleroma-fe-20181114' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!451

5 years agoupdate pleroma frontend
William Pitcock [Wed, 14 Nov 2018 16:08:22 +0000 (16:08 +0000)]
update pleroma frontend

5 years agoMerge branch 'twitter-api-direct-messages' into 'develop'
kaniini [Wed, 14 Nov 2018 08:52:08 +0000 (08:52 +0000)]
Merge branch 'twitter-api-direct-messages' into 'develop'

Twitter api direct messages

See merge request pleroma/pleroma!449

5 years agomedia_proxy: use path only to retrieve filename
href [Tue, 13 Nov 2018 22:41:33 +0000 (23:41 +0100)]
media_proxy: use path only to retrieve filename

5 years agoTwitterApi: Add direct message endpoint
lain [Tue, 13 Nov 2018 19:08:50 +0000 (20:08 +0100)]
TwitterApi: Add direct message endpoint

5 years agoMastodonAPI: Add pagination to private messages.
lain [Tue, 13 Nov 2018 18:46:34 +0000 (19:46 +0100)]
MastodonAPI: Add pagination to private messages.

5 years agoMerge branch 'media-proxy-safety' into 'develop'
lambda [Tue, 13 Nov 2018 15:15:05 +0000 (15:15 +0000)]
Merge branch 'media-proxy-safety' into 'develop'

media_proxy: CSP, content-disposition

See merge request pleroma/pleroma!448

5 years agomedia_proxy: CSP, content-disposition
href [Tue, 13 Nov 2018 14:58:02 +0000 (15:58 +0100)]
media_proxy: CSP, content-disposition

* Adds CSP headers to the media proxy endpoint

* Sends `content-disposition: attachment; …` for non-image/video/audio
content types

The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.

* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)

5 years agoMerge branch 'security/cookie-hardening' into 'develop'
lambda [Tue, 13 Nov 2018 13:23:04 +0000 (13:23 +0000)]
Merge branch 'security/cookie-hardening' into 'develop'

Add __Host- prefix when secure flag is enabled

See merge request pleroma/pleroma!446

5 years agoMerge branch 'add-MIX_ENV-to-systemd-example' into 'develop'
lambda [Tue, 13 Nov 2018 12:24:29 +0000 (12:24 +0000)]
Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'

Add MIX_ENV=prod to systemd example file

See merge request pleroma/pleroma!445

5 years agoMerge branch 'whalebird' into 'develop'
lambda [Tue, 13 Nov 2018 12:22:41 +0000 (12:22 +0000)]
Merge branch 'whalebird' into 'develop'

Add Whalebird as a client application in README

See merge request pleroma/pleroma!447

5 years agoAdd __Host- prefix when secure flag is enabled
shibayashi [Mon, 12 Nov 2018 23:32:38 +0000 (00:32 +0100)]
Add __Host- prefix when secure flag is enabled

5 years agoAdd MIX_ENV=prod
shibayashi [Mon, 12 Nov 2018 22:01:06 +0000 (23:01 +0100)]
Add MIX_ENV=prod

5 years agoMerge branch 'twitter-api-null-display-name' into 'develop'
scarlett [Mon, 12 Nov 2018 17:08:54 +0000 (17:08 +0000)]
Merge branch 'twitter-api-null-display-name' into 'develop'

Twitter API: Fall back to user.nickname if user has no name

Closes #375

See merge request pleroma/pleroma!444

5 years agoTwitter API: Add tests for nil names.
scarlett [Mon, 12 Nov 2018 16:40:34 +0000 (16:40 +0000)]
Twitter API: Add tests for nil names.

5 years agoAdd Whalebird as a client application in README
AkiraFukushima [Mon, 12 Nov 2018 16:02:49 +0000 (01:02 +0900)]
Add Whalebird as a client application in README

5 years agoTwitter API: Fall back to user.nickname if user has no name
scarlett [Mon, 12 Nov 2018 15:38:39 +0000 (15:38 +0000)]
Twitter API: Fall back to user.nickname if user has no name

5 years agoMerge branch 'feature/csp-plug' into 'develop'
kaniini [Mon, 12 Nov 2018 15:30:42 +0000 (15:30 +0000)]
Merge branch 'feature/csp-plug' into 'develop'

migrate CSP management to CSPPlug

See merge request pleroma/pleroma!441

5 years agosample config: chase http_security change
William Pitcock [Mon, 12 Nov 2018 15:17:04 +0000 (15:17 +0000)]
sample config: chase http_security change

5 years agohttp security: allow referrer-policy to be configured
William Pitcock [Mon, 12 Nov 2018 15:14:46 +0000 (15:14 +0000)]
http security: allow referrer-policy to be configured

5 years agorename CSPPlug to HTTPSecurityPlug.
William Pitcock [Mon, 12 Nov 2018 15:08:02 +0000 (15:08 +0000)]
rename CSPPlug to HTTPSecurityPlug.

5 years agoMerge branch 'update-readme' into 'develop'
Haelwenn [Sun, 11 Nov 2018 16:44:04 +0000 (16:44 +0000)]
Merge branch 'update-readme' into 'develop'

Update README.md

See merge request pleroma/pleroma!443

5 years agoUpdate README.md
shibayashi [Sun, 11 Nov 2018 16:31:16 +0000 (17:31 +0100)]
Update README.md

5 years agoMerge branch 'fix-list-streaming' into 'develop'
kaniini [Sun, 11 Nov 2018 13:41:48 +0000 (13:41 +0000)]
Merge branch 'fix-list-streaming' into 'develop'

Mastodon API: Fix list streaming

See merge request pleroma/pleroma!442

5 years agoMastodon API: Fix list streaming
KokaKiwi [Sun, 11 Nov 2018 03:33:14 +0000 (04:33 +0100)]
Mastodon API: Fix list streaming

5 years agoconfig docs: typo fix
William Pitcock [Sun, 11 Nov 2018 07:27:36 +0000 (07:27 +0000)]
config docs: typo fix

5 years agotests: add tests for CSPPlug
William Pitcock [Sun, 11 Nov 2018 07:26:31 +0000 (07:26 +0000)]
tests: add tests for CSPPlug

5 years agoexample configs: kill STS/CT headers
William Pitcock [Sun, 11 Nov 2018 06:56:46 +0000 (06:56 +0000)]
example configs: kill STS/CT headers

5 years agocsp plug: add support for certificate transparency
William Pitcock [Sun, 11 Nov 2018 06:53:42 +0000 (06:53 +0000)]
csp plug: add support for certificate transparency

5 years agocsp plug: add sts support
William Pitcock [Sun, 11 Nov 2018 06:50:28 +0000 (06:50 +0000)]
csp plug: add sts support

5 years agosample config: document how to make CSPPlug send STS headers (off by default to allow...
William Pitcock [Sun, 11 Nov 2018 06:42:14 +0000 (06:42 +0000)]
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)

5 years agoconfig: add default parameters for CSPPlug
William Pitcock [Sun, 11 Nov 2018 06:37:18 +0000 (06:37 +0000)]
config: add default parameters for CSPPlug

5 years agoexample configs: remove obsolete CSP configuration
William Pitcock [Sun, 11 Nov 2018 06:12:26 +0000 (06:12 +0000)]
example configs: remove obsolete CSP configuration

5 years agoplugs: add CSPPlug
William Pitcock [Sun, 11 Nov 2018 06:10:21 +0000 (06:10 +0000)]
plugs: add CSPPlug

5 years agoMerge branch 'bugfix/corsplug-config' into 'develop'
kaniini [Sun, 11 Nov 2018 05:49:49 +0000 (05:49 +0000)]
Merge branch 'bugfix/corsplug-config' into 'develop'

properly configure CORSPlug

See merge request pleroma/pleroma!440

5 years agonginx example config: remove CORS headers, now managed by CORSPlug.
William Pitcock [Sun, 11 Nov 2018 05:42:30 +0000 (05:42 +0000)]
nginx example config: remove CORS headers, now managed by CORSPlug.

5 years agoconfig: properly configure CORSPlug.
William Pitcock [Sun, 11 Nov 2018 05:40:55 +0000 (05:40 +0000)]
config: properly configure CORSPlug.

5 years agoMerge branch 'bugfix/oauth-padding' into 'develop'
kaniini [Sun, 11 Nov 2018 05:34:45 +0000 (05:34 +0000)]
Merge branch 'bugfix/oauth-padding' into 'develop'

hotfix: oauth: fix token decode regression

Closes #373

See merge request pleroma/pleroma!439

5 years agooauth: fix token decode regression
William Pitcock [Sun, 11 Nov 2018 05:11:27 +0000 (05:11 +0000)]
oauth: fix token decode regression

5 years agoMerge branch 'bugfix/json-ld-object-sanitization' into 'develop'
lambda [Sat, 10 Nov 2018 12:37:18 +0000 (12:37 +0000)]
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'

JSON-LD: object sanitization

See merge request pleroma/pleroma!438

5 years agoMerge branch 'feature/documentation' into 'develop'
kaniini [Sat, 10 Nov 2018 12:25:08 +0000 (12:25 +0000)]
Merge branch 'feature/documentation' into 'develop'

Add ex_doc documentation to Pleroma

See merge request pleroma/pleroma!416

5 years agotests: add test for internal data stripping
William Pitcock [Sat, 10 Nov 2018 12:16:10 +0000 (12:16 +0000)]
tests: add test for internal data stripping

5 years agoactivitypub: transmogrifier: sanitize internal representation details from outgoing...
William Pitcock [Sat, 10 Nov 2018 12:08:53 +0000 (12:08 +0000)]
activitypub: transmogrifier: sanitize internal representation details from outgoing objects

this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data.  accordingly, it seems better to just remove
it.

5 years agolib/mix/tasks: s/@doc/@moduledoc/
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:28:50 +0000 (15:28 +0100)]
lib/mix/tasks: s/@doc/@moduledoc/

5 years agolib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:26:11 +0000 (15:26 +0100)]
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy

5 years agolib/mix/tasks: Add remaining documentation for mix tasks
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:21:09 +0000 (15:21 +0100)]
lib/mix/tasks: Add remaining documentation for mix tasks

5 years agoconfig/config.md: Add lines inspired/copied from CONFIGURATION.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:59:44 +0000 (14:59 +0100)]
config/config.md: Add lines inspired/copied from CONFIGURATION.md

5 years agoREADME.md: Add note about config/config.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:47:04 +0000 (14:47 +0100)]
README.md: Add note about config/config.md

5 years agoREADME.md: Put the systemd’s .service note to the relevant section
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:45:22 +0000 (14:45 +0100)]
README.md: Put the systemd’s .service note to the relevant section

5 years agoREADME.md: Add note for OpenRC
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:43:42 +0000 (14:43 +0100)]
README.md: Add note for OpenRC

5 years agoconfig/config.md: scope_options_enabled also addresses subject
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:33:05 +0000 (14:33 +0100)]
config/config.md: scope_options_enabled also addresses subject

5 years agoconfig/config.md: Fill all the blanks
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:27:21 +0000 (14:27 +0100)]
config/config.md: Fill all the blanks

5 years agoconfig/config.md: Complete it [WIP]
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 09:32:43 +0000 (10:32 +0100)]
config/config.md: Complete it [WIP]

5 years agoconfig/config.md: Create
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 09:13:29 +0000 (10:13 +0100)]
config/config.md: Create

5 years agoDocument the mix tasks in ex_doc instead
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 08:32:48 +0000 (09:32 +0100)]
Document the mix tasks in ex_doc instead

5 years agoDocument mix tasks
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 23:02:18 +0000 (01:02 +0200)]
Document mix tasks

5 years agoAdd ex_doc
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 22:05:05 +0000 (00:05 +0200)]
Add ex_doc

5 years agoactivitypub: object view: sanitize both the activity and the object when an activity...
William Pitcock [Sat, 10 Nov 2018 12:04:09 +0000 (12:04 +0000)]
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering

5 years agoMerge branch 'bugfix/ostatus-as2-reflection' into 'develop'
kaniini [Sat, 10 Nov 2018 11:50:02 +0000 (11:50 +0000)]
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'

ostatus: only federate activities concerning note objects

See merge request pleroma/pleroma!437

5 years agoMerge branch 'bugfix/local-jsonld-context' into 'develop'
kaniini [Sat, 10 Nov 2018 11:37:44 +0000 (11:37 +0000)]
Merge branch 'bugfix/local-jsonld-context' into 'develop'

Host LitePub JSON-LD context locally

See merge request pleroma/pleroma!435

5 years agoendpoint: move CORSPlug in front of Plug.Static
William Pitcock [Sat, 10 Nov 2018 11:23:50 +0000 (11:23 +0000)]
endpoint: move CORSPlug in front of Plug.Static

5 years agoendpoint: fix formatting
William Pitcock [Sat, 10 Nov 2018 11:18:25 +0000 (11:18 +0000)]
endpoint: fix formatting

5 years agoMerge branch 'tests/prismo-url-map' into 'develop'
kaniini [Sat, 10 Nov 2018 11:17:12 +0000 (11:17 +0000)]
Merge branch 'tests/prismo-url-map' into 'develop'

Test that prismo url-map transforms into a string

See merge request pleroma/pleroma!414

5 years agoadd missing prismo testcase data
William Pitcock [Sat, 10 Nov 2018 11:06:29 +0000 (11:06 +0000)]
add missing prismo testcase data

5 years agotests: add tests for new OStatus.is_representable? function
William Pitcock [Sat, 10 Nov 2018 10:39:42 +0000 (10:39 +0000)]
tests: add tests for new OStatus.is_representable? function

5 years agofederator: don't federate anything other than Note objects to OStatus
William Pitcock [Sat, 10 Nov 2018 10:05:41 +0000 (10:05 +0000)]
federator: don't federate anything other than Note objects to OStatus

5 years agoMerge branch 'bugfix/no-cc-mentions' into 'develop'
lambda [Fri, 9 Nov 2018 16:00:24 +0000 (16:00 +0000)]
Merge branch 'bugfix/no-cc-mentions' into 'develop'

align to/cc addressing pattern with friendica, hubzilla instead of mastodon

Closes #341

See merge request pleroma/pleroma!436

5 years agoactivitypub: utils: use same object type list for mention extraction as insertion
William Pitcock [Fri, 9 Nov 2018 13:39:44 +0000 (13:39 +0000)]
activitypub: utils: use same object type list for mention extraction as insertion

5 years agotests: add testing for new notification behavior
William Pitcock [Fri, 9 Nov 2018 09:33:12 +0000 (09:33 +0000)]
tests: add testing for new notification behavior

5 years agonotification: add fallback get_notified_from_activity()
William Pitcock [Fri, 9 Nov 2018 09:07:40 +0000 (09:07 +0000)]
notification: add fallback get_notified_from_activity()

5 years agoactivitypub: utils: wrap Note objects in a Create when extracting mentions
William Pitcock [Fri, 9 Nov 2018 08:55:52 +0000 (08:55 +0000)]
activitypub: utils: wrap Note objects in a Create when extracting mentions

5 years agouser: remove obsolete User.get_notified_from_activity().
William Pitcock [Fri, 9 Nov 2018 08:42:49 +0000 (08:42 +0000)]
user: remove obsolete User.get_notified_from_activity().

5 years agoactivitypub: utils: switch to using new Notification.get_notified_from_activity().
William Pitcock [Fri, 9 Nov 2018 08:42:33 +0000 (08:42 +0000)]
activitypub: utils: switch to using new Notification.get_notified_from_activity().

5 years agonotification: implement new Notification.get_notified_from_activity()
William Pitcock [Fri, 9 Nov 2018 08:41:26 +0000 (08:41 +0000)]
notification: implement new Notification.get_notified_from_activity()

5 years agouser: factor out user set fetching from User.get_notified_from_activity()
William Pitcock [Fri, 9 Nov 2018 08:23:45 +0000 (08:23 +0000)]
user: factor out user set fetching from User.get_notified_from_activity()

5 years agouser: implement AS2 mention extraction + unify Announce handling
William Pitcock [Thu, 8 Nov 2018 20:01:42 +0000 (20:01 +0000)]
user: implement AS2 mention extraction + unify Announce handling

5 years agoactivitypub: transmogrifier: unify mention extraction
William Pitcock [Thu, 8 Nov 2018 19:31:59 +0000 (19:31 +0000)]
activitypub: transmogrifier: unify mention extraction

5 years agouser: add optional local_only param to get_notified_from_activity()
William Pitcock [Thu, 8 Nov 2018 19:30:55 +0000 (19:30 +0000)]
user: add optional local_only param to get_notified_from_activity()

5 years agoPleroma.Web.Endpoint: Whitelist schemas directory
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 19:22:12 +0000 (20:22 +0100)]
Pleroma.Web.Endpoint: Whitelist schemas directory

5 years agoMove /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 19:21:45 +0000 (20:21 +0100)]
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld

5 years agotests: flip testing to/cc for mentions
William Pitcock [Thu, 8 Nov 2018 19:17:15 +0000 (19:17 +0000)]
tests: flip testing to/cc for mentions

5 years agocommon api: utils: flip to/cc for mentions
William Pitcock [Thu, 8 Nov 2018 19:17:01 +0000 (19:17 +0000)]
common api: utils: flip to/cc for mentions

5 years agoactivitypub: transmogrifier: only consider `to` users as mention targets
William Pitcock [Thu, 8 Nov 2018 18:56:14 +0000 (18:56 +0000)]
activitypub: transmogrifier: only consider `to` users as mention targets

5 years agouser: only consider `to` recipients as mention targets
William Pitcock [Thu, 8 Nov 2018 18:55:50 +0000 (18:55 +0000)]
user: only consider `to` recipients as mention targets

5 years agoPleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead...
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 18:38:38 +0000 (19:38 +0100)]
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one

5 years agopriv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/conte...
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 18:34:01 +0000 (19:34 +0100)]
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld

5 years agoMerge branch 'feature/jsonld-context-cleanup' into 'develop'
kaniini [Thu, 8 Nov 2018 17:42:05 +0000 (17:42 +0000)]
Merge branch 'feature/jsonld-context-cleanup' into 'develop'

jsonld context cleanup

Closes #369

See merge request pleroma/pleroma!434

5 years agoutils: use litepub @context instead of that huge mess
William Pitcock [Thu, 8 Nov 2018 16:52:14 +0000 (16:52 +0000)]
utils: use litepub @context instead of that huge mess

5 years agouser view: unify a @context entry that was missed
William Pitcock [Thu, 8 Nov 2018 16:51:48 +0000 (16:51 +0000)]
user view: unify a @context entry that was missed

5 years agoMerge branch 'small-jsonld-refactor' into 'develop'
lambda [Thu, 8 Nov 2018 16:23:58 +0000 (16:23 +0000)]
Merge branch 'small-jsonld-refactor' into 'develop'

Small jsonld refactor

See merge request pleroma/pleroma!433

5 years agoUnify json ld header handling.
lain [Thu, 8 Nov 2018 15:39:38 +0000 (16:39 +0100)]
Unify json ld header handling.

5 years agoSmall refactor.
lain [Thu, 8 Nov 2018 15:05:28 +0000 (16:05 +0100)]
Small refactor.

5 years agoMerge branch 'feature/qvitter-notifications-dismiss' into 'develop'
kaniini [Wed, 7 Nov 2018 22:33:06 +0000 (22:33 +0000)]
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'

qvitter notifications: add new "read notifications" API

See merge request pleroma/pleroma!431

5 years agoMerge branch 'runtime-config' into 'develop'
kaniini [Wed, 7 Nov 2018 22:32:34 +0000 (22:32 +0000)]
Merge branch 'runtime-config' into 'develop'

Runtime configuration

See merge request pleroma/pleroma!430

5 years agoMerge branch 'mastodon-api-relationships-without-id-param' into 'develop'
lambda [Wed, 7 Nov 2018 16:04:01 +0000 (16:04 +0000)]
Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'

Mastodon API: relationships without id param

See merge request pleroma/pleroma!432

5 years ago/api/v1/accounts/relationships Return an empty array if no id in params
href [Wed, 7 Nov 2018 15:27:07 +0000 (16:27 +0100)]
/api/v1/accounts/relationships Return an empty array if no id in params

This copies Mastodon API behaviour & fixes Mastalab app.

5 years agoRuntime config: MRF changes
href [Wed, 7 Nov 2018 09:40:24 +0000 (10:40 +0100)]
Runtime config: MRF changes