akkoma
5 years agoactivitypub: user view: add oauthRegistrationEndpoint to user profiles
William Pitcock [Tue, 12 Feb 2019 21:49:48 +0000 (21:49 +0000)]
activitypub: user view: add oauthRegistrationEndpoint to user profiles

5 years agoactivitypub: user view: fix up endpoints rendering
William Pitcock [Tue, 12 Feb 2019 21:42:32 +0000 (21:42 +0000)]
activitypub: user view: fix up endpoints rendering

5 years agolitepub schema: add oauthRegistrationEndpoint [ci skip]
William Pitcock [Tue, 12 Feb 2019 21:37:37 +0000 (21:37 +0000)]
litepub schema: add oauthRegistrationEndpoint [ci skip]

5 years agouser view: add AP C2S oauth endpoints to local user profiles
William Pitcock [Tue, 12 Feb 2019 21:28:11 +0000 (21:28 +0000)]
user view: add AP C2S oauth endpoints to local user profiles

5 years agorefactored code
Karen Konou [Wed, 13 Feb 2019 15:23:09 +0000 (16:23 +0100)]
refactored code

5 years agoMerge branch 'develop' into hellthread-filter-fix
Karen Konou [Tue, 12 Feb 2019 23:04:26 +0000 (00:04 +0100)]
Merge branch 'develop' into hellthread-filter-fix

5 years agoMerge branch 'mass-follow-fixes' into 'develop'
rinpatch [Wed, 13 Feb 2019 13:04:23 +0000 (13:04 +0000)]
Merge branch 'mass-follow-fixes' into 'develop'

User.follow_all: Respect blocks in both directions.

See merge request pleroma/pleroma!823

5 years agoUser.follow_all: Respect blocks in both directions.
lain [Wed, 13 Feb 2019 12:52:27 +0000 (13:52 +0100)]
User.follow_all: Respect blocks in both directions.

5 years agoUpdate token.ex
Maxim Filippov [Mon, 11 Feb 2019 09:48:24 +0000 (09:48 +0000)]
Update token.ex

5 years agoAdd revoke token
Maxim Filippov [Sun, 10 Feb 2019 21:49:56 +0000 (00:49 +0300)]
Add revoke token

5 years agoAdd OAuth tokens endpoint
Maxim Filippov [Sun, 10 Feb 2019 19:41:06 +0000 (22:41 +0300)]
Add OAuth tokens endpoint

5 years agoMerge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'
kaniini [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'

Mark streaming feature for desktop apps in Clients.md

See merge request pleroma/pleroma!818

5 years agoMark streaming feature for desktop apps in Clients.md
Hakaba Hitoyo [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Mark streaming feature for desktop apps in Clients.md

5 years agoMerge branch 'bugfix/mdii-uploader' into 'develop'
kaniini [Wed, 13 Feb 2019 07:32:56 +0000 (07:32 +0000)]
Merge branch 'bugfix/mdii-uploader' into 'develop'

Bugfix for MDII Uploader

See merge request pleroma/pleroma!822

5 years agobugfix mdii uploader
hakabahitoyo [Wed, 13 Feb 2019 06:46:42 +0000 (15:46 +0900)]
bugfix mdii uploader

5 years agoadded checks for public url and follower collections
Karen Konou [Tue, 12 Feb 2019 22:25:09 +0000 (23:25 +0100)]
added checks for public url and follower collections

5 years agoMerge branch 'feature/csp_mastofe-dev' into 'develop'
kaniini [Tue, 12 Feb 2019 22:41:46 +0000 (22:41 +0000)]
Merge branch 'feature/csp_mastofe-dev' into 'develop'

Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev

See merge request pleroma/pleroma!820

5 years agoPlugs.HTTPSecurityPlug: Add webpacker to connect-src
Haelwenn (lanodan) Monnier [Sat, 2 Feb 2019 18:06:26 +0000 (19:06 +0100)]
Plugs.HTTPSecurityPlug: Add webpacker to connect-src

5 years agoPlugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
Haelwenn (lanodan) Monnier [Fri, 1 Feb 2019 12:10:50 +0000 (13:10 +0100)]
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode

This is needed to run dev mode mastofe at the same time

5 years agoconfig/dev.exs: Don’t put secure cookies on dev
Haelwenn (lanodan) Monnier [Thu, 22 Nov 2018 06:12:13 +0000 (07:12 +0100)]
config/dev.exs: Don’t put secure cookies on dev

5 years agoMerge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
Haelwenn [Tue, 12 Feb 2019 02:44:23 +0000 (02:44 +0000)]
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'

Fix CSP check for 'upgrade-insecure-requests'

See merge request pleroma/pleroma!814

5 years agoMerge branch 'doc/mark-streaming-feature-for-apps' into 'develop'
Haelwenn [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'

Mark streaming feature for mobile/web apps in Clients.md

See merge request pleroma/pleroma!816

[ci skip]

5 years agoMark streaming feature for mobile/web apps in Clients.md
Hakaba Hitoyo [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Mark streaming feature for mobile/web apps in Clients.md

5 years agoFormatting
Mark Felder [Tue, 12 Feb 2019 00:37:22 +0000 (00:37 +0000)]
Formatting

5 years agoFix compile
Mark Felder [Tue, 12 Feb 2019 00:25:12 +0000 (00:25 +0000)]
Fix compile

5 years agoWIP: Fix Twitter Cards
Mark Felder [Mon, 11 Feb 2019 23:59:04 +0000 (23:59 +0000)]
WIP: Fix Twitter Cards

Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.

Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.

Profiles are now represented as Summary Cards

Posts with images are now represented as Summart with Large Image Cards

Posts with video and audio attachments are represented as Player Cards.

This now passes the Twitter Card Validator.

Validator and Docs are below

https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards

5 years agoUse url[:scheme] instead of protocol to determine if https is enabled
shibayashi [Mon, 11 Feb 2019 23:08:52 +0000 (00:08 +0100)]
Use url[:scheme] instead of protocol to determine if https is enabled

5 years agoMerge branch 'bugfix/keyword-policy-check-summary' into 'develop'
kaniini [Mon, 11 Feb 2019 18:45:15 +0000 (18:45 +0000)]
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'

Filter summary field in KeywordPolicy

See merge request pleroma/pleroma!812

5 years agoFilter summary in keywordpolicy
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy

5 years agoMerge branch 'feature/thread-muting' into 'develop'
rinpatch [Mon, 11 Feb 2019 15:02:14 +0000 (15:02 +0000)]
Merge branch 'feature/thread-muting' into 'develop'

Feature/thread muting

See merge request pleroma/pleroma!796

5 years agoMerge branch 'feature/rich-media-limits' into 'develop'
lambda [Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)]
Merge branch 'feature/rich-media-limits' into 'develop'

rich media: tighten fetching timeouts and size limits

See merge request pleroma/pleroma!809

5 years agoMerge branch 'develop' into feature/thread-muting
Karen Konou [Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)]
Merge branch 'develop' into feature/thread-muting

5 years agoRefactor as per Rin's suggestions, add endpoint tests
Karen Konou [Mon, 11 Feb 2019 10:59:51 +0000 (11:59 +0100)]
Refactor as per Rin's suggestions, add endpoint tests

5 years agoMerge branch 'revert-e0de0fcf' into 'develop'
lambda [Mon, 11 Feb 2019 08:22:54 +0000 (08:22 +0000)]
Merge branch 'revert-e0de0fcf' into 'develop'

Revert "Merge branch 'object-creation' into 'develop'"

See merge request pleroma/pleroma!810

5 years agoRevert "Merge branch 'object-creation' into 'develop'"
lambda [Mon, 11 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Revert "Merge branch 'object-creation' into 'develop'"

This reverts merge request !802

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
Egor Kislitsyn [Mon, 11 Feb 2019 06:54:21 +0000 (13:54 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex

5 years agotest: Change `lenght(…) == 0` to `Enum.empty?(…)`
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 23:08:48 +0000 (00:08 +0100)]
test: Change `lenght(…) == 0` to `Enum.empty?(…)`

5 years agotest: de-group alias/es
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:57:38 +0000 (22:57 +0100)]
test: de-group alias/es

5 years ago.credo.exs: Add test directory as well
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:56:47 +0000 (22:56 +0100)]
.credo.exs: Add test directory as well

5 years agorich media: tighten fetching timeouts and size limits
William Pitcock [Sun, 10 Feb 2019 21:37:51 +0000 (21:37 +0000)]
rich media: tighten fetching timeouts and size limits

5 years agoMerge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
kaniini [Sun, 10 Feb 2019 21:28:41 +0000 (21:28 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'

Update Mastodon Frontend to 2019-02-10 bundle

See merge request pleroma/pleroma!806

5 years agoMerge branch 'feather_mention' into 'develop'
kaniini [Sun, 10 Feb 2019 21:16:29 +0000 (21:16 +0000)]
Merge branch 'feather_mention' into 'develop'

Add Feather to the clients list

See merge request pleroma/pleroma!804

5 years agoMerge branch 'fix/credo-issues' into 'develop'
kaniini [Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)]
Merge branch 'fix/credo-issues' into 'develop'

Fix credo issues

See merge request pleroma/pleroma!786

5 years agoMerge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths...
kaniini [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'

Update service files of OpenRC and systemd to new recommended paths

See merge request pleroma/pleroma!798

5 years agoUpdate service files of OpenRC and systemd to new recommended paths
shibayashi [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Update service files of OpenRC and systemd to new recommended paths

5 years agoUpdate Mastodon Frontend to 2019-02-10 bundle
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 18:55:22 +0000 (19:55 +0100)]
Update Mastodon Frontend to 2019-02-10 bundle

See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]

5 years agoadd feather to webclients
succfemboi [Sun, 10 Feb 2019 15:18:04 +0000 (16:18 +0100)]
add feather to webclients

5 years agoMerge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
lambda [Sun, 10 Feb 2019 14:21:12 +0000 (14:21 +0000)]
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'

Recommend the acme-challenge path that is used in the installation guides

See merge request pleroma/pleroma!803

5 years agoMerge branch 'docs/pleroma-clients' into 'develop'
lambda [Sun, 10 Feb 2019 13:47:26 +0000 (13:47 +0000)]
Merge branch 'docs/pleroma-clients' into 'develop'

docs/Clients.md: Add documentation about clients supporting pleroma

See merge request pleroma/pleroma!726

5 years agodocs/Clients.md: Add Nekonium
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:42:32 +0000 (14:42 +0100)]
docs/Clients.md: Add Nekonium

[ci skip]

5 years agodocs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:24:48 +0000 (14:24 +0100)]
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically

[ci skip]

5 years agodocs/Clients.md: Add Social (GNOME)
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:39:29 +0000 (18:39 +0100)]
docs/Clients.md: Add Social (GNOME)

[ci skip]

5 years agodocs/Clients.md: Add per-type sections
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:28:25 +0000 (18:28 +0100)]
docs/Clients.md: Add per-type sections

helps differenciate between Electrons and others like Brutaldon.
[ci skip]

5 years agodocs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:20:10 +0000 (18:20 +0100)]
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore

5 years agoWIP: docs/Clients.md: Add documentation about clients supporting pleroma
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 04:50:08 +0000 (05:50 +0100)]
WIP: docs/Clients.md: Add documentation about clients supporting pleroma

[ci skip]

5 years agorefactor, status view updating, error handling
Karen Konou [Sun, 10 Feb 2019 08:31:20 +0000 (09:31 +0100)]
refactor, status view updating, error handling

5 years agoMerge branch 'object-creation' into 'develop'
rinpatch [Sun, 10 Feb 2019 07:39:27 +0000 (07:39 +0000)]
Merge branch 'object-creation' into 'develop'

Do object insertion through Cachex

See merge request pleroma/pleroma!802

5 years agoRecommend the acme-challenge path that is used in the installation guides
shibayashi [Sat, 9 Feb 2019 22:08:27 +0000 (23:08 +0100)]
Recommend the acme-challenge path that is used in the installation guides

5 years agoMerge branch 'follow-enhancements' into 'develop'
kaniini [Sat, 9 Feb 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'follow-enhancements' into 'develop'

Respect blocks in mass follow.

See merge request pleroma/pleroma!797

5 years agoDo object insertion through Cachex
lain [Sat, 9 Feb 2019 21:01:08 +0000 (22:01 +0100)]
Do object insertion through Cachex

So we don't flood our postgres logs with errors. Should also make things
slightly faster.

5 years agoAdd unique index and unique constraint check, uniqueness test fails
Karen Konou [Sat, 9 Feb 2019 19:52:11 +0000 (20:52 +0100)]
Add unique index and unique constraint check, uniqueness test fails

5 years agoMerged "check mute" test into the other two
Karen Konou [Sat, 9 Feb 2019 17:34:00 +0000 (18:34 +0100)]
Merged "check mute" test into the other two

5 years agoelixir too new for CI's mix format lol
Karen Konou [Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)]
elixir too new for CI's mix format lol

5 years agoit works!!
Karen Konou [Sat, 9 Feb 2019 16:47:57 +0000 (17:47 +0100)]
it works!!

5 years agoMix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:30:42 +0000 (16:30 +0100)]
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)

5 years agode-group import/s
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:20:18 +0000 (16:20 +0100)]
de-group import/s

5 years agode-group alias/es
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:16:26 +0000 (16:16 +0100)]
de-group alias/es

5 years ago[#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
Ivan Tashkinov [Sat, 9 Feb 2019 14:32:33 +0000 (17:32 +0300)]
[#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.

5 years ago[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
Ivan Tashkinov [Sat, 9 Feb 2019 14:09:08 +0000 (17:09 +0300)]
[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.

5 years agoHTML.Scrubber.Default: Consistency
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 13:39:27 +0000 (14:39 +0100)]
HTML.Scrubber.Default: Consistency

5 years agoStash
Haelwenn (lanodan) Monnier [Fri, 8 Feb 2019 16:18:44 +0000 (17:18 +0100)]
Stash

5 years agoWeb.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:19:35 +0000 (21:19 +0100)]
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it

5 years agoMix.Tasks.Pleroma.Uploads: Fix typo in documentation
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:24:57 +0000 (21:24 +0100)]
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation

5 years agoWeb.Federator: Fix unused variable
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:04:11 +0000 (21:04 +0100)]
Web.Federator: Fix unused variable

5 years agoCredo fixes: alias grouping/ordering
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:20:02 +0000 (20:20 +0100)]
Credo fixes: alias grouping/ordering

5 years agoCredo fixes: parameter consistency
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:19:39 +0000 (20:19 +0100)]
Credo fixes: parameter consistency

5 years agoMake credo happy
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 17:44:18 +0000 (18:44 +0100)]
Make credo happy

5 years agoadded another test
Karen Konou [Sat, 9 Feb 2019 13:34:42 +0000 (14:34 +0100)]
added another test

5 years agoMade a test!
Karen Konou [Sat, 9 Feb 2019 13:23:51 +0000 (14:23 +0100)]
Made a test!

5 years agoDo autofollow first.
lain [Sat, 9 Feb 2019 12:39:57 +0000 (13:39 +0100)]
Do autofollow first.

5 years agoRespect blocks in mass follow.
lain [Sat, 9 Feb 2019 12:24:23 +0000 (13:24 +0100)]
Respect blocks in mass follow.

5 years agoMerge branch 'add-media-path-to-caddy-cache' into 'develop'
lambda [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Merge branch 'add-media-path-to-caddy-cache' into 'develop'

Add /media to Caddy cache

See merge request pleroma/pleroma!791

5 years agoAdd /media to Caddy cache
shibayashi [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Add /media to Caddy cache

5 years agoMerge branch 'feature/keyword-policy' into 'develop'
lambda [Sat, 9 Feb 2019 11:38:37 +0000 (11:38 +0000)]
Merge branch 'feature/keyword-policy' into 'develop'

Add keyword policy

See merge request pleroma/pleroma!794

5 years agooof
rinpatch [Sat, 9 Feb 2019 05:12:30 +0000 (08:12 +0300)]
oof

5 years agoAdd tests and fix a typo in docs
rinpatch [Fri, 8 Feb 2019 17:23:26 +0000 (20:23 +0300)]
Add tests and fix a typo in docs

5 years agohelp i am not good with git
Karen Konou [Fri, 8 Feb 2019 12:21:34 +0000 (13:21 +0100)]
help i am not good with git

5 years agoAdded thread unmuting (still a bit buggy maybe)
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)

5 years agoMerge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
lambda [Fri, 8 Feb 2019 12:18:05 +0000 (12:18 +0000)]
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'

Split hide_network only for local users

See merge request pleroma/pleroma!781

5 years agoAdded thread unmuting (still a bit buggy maybe)
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)

5 years agofix typo in config.md
rinpatch [Fri, 8 Feb 2019 12:12:44 +0000 (15:12 +0300)]
fix typo in config.md

5 years agowow
rinpatch [Fri, 8 Feb 2019 12:12:13 +0000 (15:12 +0300)]
wow

5 years agoMerge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
lambda [Fri, 8 Feb 2019 12:10:35 +0000 (12:10 +0000)]
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'

Mark streaming feature for iOS apps in readme

See merge request pleroma/pleroma!790

5 years agoMerge branch 'oauth2_strengthening' into 'develop'
lambda [Fri, 8 Feb 2019 12:09:43 +0000 (12:09 +0000)]
Merge branch 'oauth2_strengthening' into 'develop'

OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix

See merge request pleroma/pleroma!793

5 years agoMerge branch 'develop' into feature/thread-muting
Karen Konou [Fri, 8 Feb 2019 11:44:02 +0000 (12:44 +0100)]
Merge branch 'develop' into feature/thread-muting

5 years agoWhat idiot did that? (me)
rinpatch [Fri, 8 Feb 2019 10:16:50 +0000 (13:16 +0300)]
What idiot did that? (me)

5 years agoMerge branch 'develop' into feature/keyword-policy
rinpatch [Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)]
Merge branch 'develop' into feature/keyword-policy

5 years agorename ftl_removal to federated_timeline_removal to keep consistent naming with Simpl...
rinpatch [Fri, 8 Feb 2019 10:12:09 +0000 (13:12 +0300)]
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy

5 years agoAdd default config for keyword policy
rinpatch [Fri, 8 Feb 2019 09:48:39 +0000 (12:48 +0300)]
Add default config for keyword policy

5 years agoAdd keyword policy
rinpatch [Fri, 8 Feb 2019 09:38:24 +0000 (12:38 +0300)]
Add keyword policy