Mark Felder [Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)]
Merge branch 'develop' into fix/twittercards
href [Tue, 19 Feb 2019 16:39:42 +0000 (17:39 +0100)]
Embed player suitable for Twitter Cards
lambda [Tue, 19 Feb 2019 14:20:58 +0000 (14:20 +0000)]
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
lambda [Tue, 19 Feb 2019 14:08:19 +0000 (14:08 +0000)]
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
lambda [Tue, 19 Feb 2019 14:07:16 +0000 (14:07 +0000)]
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
rinpatch [Tue, 19 Feb 2019 10:52:15 +0000 (13:52 +0300)]
mark ap_id unique_constraint
rinpatch [Tue, 19 Feb 2019 10:23:13 +0000 (13:23 +0300)]
properly check for follower address in is_private?
eugenijm [Tue, 19 Feb 2019 07:43:37 +0000 (10:43 +0300)]
Update user cache when user tags are updated
kaniini [Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)]
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
kaniini [Mon, 18 Feb 2019 04:11:46 +0000 (04:11 +0000)]
Merge branch 'patch-image-description' into 'develop'
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
kaniini [Mon, 18 Feb 2019 04:02:41 +0000 (04:02 +0000)]
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
kaniini [Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)]
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
kaniini [Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)]
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
kaniini [Mon, 18 Feb 2019 03:59:46 +0000 (03:59 +0000)]
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
Maxim Filippov [Sun, 17 Feb 2019 21:10:48 +0000 (00:10 +0300)]
Fix test
Maxim Filippov [Sun, 17 Feb 2019 20:57:35 +0000 (23:57 +0300)]
Render only "id", "valid_until" and "app_name" in TokenView
lambda [Sun, 17 Feb 2019 17:53:57 +0000 (17:53 +0000)]
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'
mix.exs: Add docs/Clients.md to docs.extras
See merge request pleroma/pleroma!835
lambda [Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)]
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
lambda [Sun, 17 Feb 2019 17:38:25 +0000 (17:38 +0000)]
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
lambda [Sun, 17 Feb 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
lambda [Sun, 17 Feb 2019 17:01:22 +0000 (17:01 +0000)]
Update Differences-in-MastodonAPI-Responses.md
lambda [Sun, 17 Feb 2019 16:57:57 +0000 (16:57 +0000)]
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
lain [Sun, 17 Feb 2019 16:47:24 +0000 (17:47 +0100)]
More speedup, test fixes.
rinpatch [Sun, 17 Feb 2019 11:33:44 +0000 (14:33 +0300)]
more tests for HellthreadPolicy
lain [Sun, 17 Feb 2019 10:36:14 +0000 (11:36 +0100)]
Speed up docker postgres.
rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy
rinpatch [Sun, 17 Feb 2019 09:07:49 +0000 (12:07 +0300)]
Fix formating
rinpatch [Sun, 17 Feb 2019 07:34:00 +0000 (10:34 +0300)]
Add differences in MastoAPI responses to mix.exs extras
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 22:11:12 +0000 (23:11 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 11:31:12 +0000 (12:31 +0100)]
[MastoAPI] Add switching of frontend flavours
Haelwenn (lanodan) Monnier [Sat, 16 Feb 2019 18:39:03 +0000 (19:39 +0100)]
mix.exs: Add docs/Clients.md to docs.extras
[ci skip]
rinpatch [Sat, 16 Feb 2019 18:14:07 +0000 (21:14 +0300)]
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
rinpatch [Sat, 16 Feb 2019 17:39:04 +0000 (17:39 +0000)]
Merge branch 'welcome-message' into 'develop'
Add optional welcome message.
See merge request pleroma/pleroma!832
rinpatch [Sat, 16 Feb 2019 17:38:25 +0000 (20:38 +0300)]
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
lain [Sat, 16 Feb 2019 16:25:06 +0000 (17:25 +0100)]
WelcomeMessage: specify that the user has to be local.
lain [Sat, 16 Feb 2019 16:24:48 +0000 (17:24 +0100)]
WelcomeMessage: Get rid of Ecto reference.
lain [Sat, 16 Feb 2019 16:24:31 +0000 (17:24 +0100)]
Check that the welcome message is sent from the correct user.
lain [Sat, 16 Feb 2019 16:01:15 +0000 (17:01 +0100)]
Add option to return all friends in twitter api.
Mainly useful for user export.
lain [Sat, 16 Feb 2019 15:42:34 +0000 (16:42 +0100)]
Add optional welcome message.
lambda [Fri, 15 Feb 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'bugfix/oauth-token-padding' into 'develop'
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
rinpatch [Fri, 15 Feb 2019 13:18:35 +0000 (13:18 +0000)]
Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
Karen Konou [Fri, 15 Feb 2019 13:05:20 +0000 (14:05 +0100)]
Readd threshold is not 0 check, optmization?
Karen Konou [Fri, 15 Feb 2019 12:43:14 +0000 (13:43 +0100)]
Rename test, add check for follower collection when delisting
rinpatch [Fri, 15 Feb 2019 12:27:03 +0000 (12:27 +0000)]
Merge branch 'bugfix/actor-containment' into 'develop'
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
Karen Konou [Fri, 15 Feb 2019 11:47:50 +0000 (12:47 +0100)]
Add tests, change default config values, fix a bug
eugenijm [Sat, 9 Feb 2019 23:26:29 +0000 (02:26 +0300)]
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
William Pitcock [Thu, 14 Feb 2019 19:59:12 +0000 (19:59 +0000)]
test: user: add a test for whether user search returns a user or not
William Pitcock [Thu, 14 Feb 2019 19:58:24 +0000 (19:58 +0000)]
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
get_or_fetch() handles the nickname verses URI differences transparently.
lambda [Thu, 14 Feb 2019 19:54:16 +0000 (19:54 +0000)]
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
William Pitcock [Thu, 14 Feb 2019 19:42:33 +0000 (19:42 +0000)]
activitypub: clean up logging statements a little
Wim Vanderbauwhede [Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into patch-image-description
href [Thu, 14 Feb 2019 10:10:13 +0000 (10:10 +0000)]
Merge branch 'fix/mediaproxy-s3' into 'develop'
Fix S3 links encoding in Mediaproxy
Closes #580
See merge request pleroma/pleroma!828
Egor Kislitsyn [Thu, 14 Feb 2019 10:02:47 +0000 (17:02 +0700)]
Fix queue name
Egor Kislitsyn [Thu, 14 Feb 2019 08:55:21 +0000 (15:55 +0700)]
fix S3 links encoding in Mediaproxy
kaniini [Thu, 14 Feb 2019 03:55:26 +0000 (03:55 +0000)]
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test
See merge request pleroma/pleroma!808
Haelwenn [Thu, 14 Feb 2019 03:40:33 +0000 (03:40 +0000)]
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827
William Pitcock [Thu, 14 Feb 2019 03:22:54 +0000 (03:22 +0000)]
tests: update tests for totalItems leak fix
William Pitcock [Thu, 14 Feb 2019 03:13:07 +0000 (03:13 +0000)]
activitypub: user view: formatting
William Pitcock [Thu, 14 Feb 2019 03:03:41 +0000 (03:03 +0000)]
activitypub: user view: report totalItems=0 for follows/followers when hidden
William Pitcock [Thu, 14 Feb 2019 03:02:45 +0000 (03:02 +0000)]
activitypub: user view: remove totalItems from user outbox
(this is based on a counter in User.Info, but the counter is not reliable.)
William Pitcock [Thu, 14 Feb 2019 03:01:39 +0000 (03:01 +0000)]
activitypub: user view: remove totalInbox from user inbox view
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
kaniini [Thu, 14 Feb 2019 02:50:06 +0000 (02:50 +0000)]
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
William Pitcock [Thu, 14 Feb 2019 02:41:21 +0000 (02:41 +0000)]
activitypub: user view: do not expose oAuth endpoints for instance users
William Pitcock [Thu, 14 Feb 2019 01:05:25 +0000 (01:05 +0000)]
oauth: never use base64 padding when returning tokens to applications
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
William Pitcock [Thu, 14 Feb 2019 00:59:18 +0000 (00:59 +0000)]
tests: add some reserialization tests based on IR differences
William Pitcock [Thu, 14 Feb 2019 00:34:20 +0000 (00:34 +0000)]
activitypub: transmogrifier: correctly handle nil inReplyTo value
William Pitcock [Thu, 14 Feb 2019 00:27:35 +0000 (00:27 +0000)]
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
kaniini [Wed, 13 Feb 2019 23:42:11 +0000 (23:42 +0000)]
Merge branch 'feature/better-login-errors' into 'develop'
Improve login error for OAuth flow
See merge request pleroma/pleroma!824
Mark Felder [Wed, 13 Feb 2019 22:33:22 +0000 (22:33 +0000)]
Improve login error for OAuth flow
William Pitcock [Wed, 13 Feb 2019 19:48:24 +0000 (19:48 +0000)]
tests: add tests for endpoints
William Pitcock [Wed, 13 Feb 2019 19:20:41 +0000 (19:20 +0000)]
activitypub: user view: use route helpers instead of hardcoded URIs
William Pitcock [Tue, 12 Feb 2019 21:49:48 +0000 (21:49 +0000)]
activitypub: user view: add oauthRegistrationEndpoint to user profiles
William Pitcock [Tue, 12 Feb 2019 21:42:32 +0000 (21:42 +0000)]
activitypub: user view: fix up endpoints rendering
William Pitcock [Tue, 12 Feb 2019 21:37:37 +0000 (21:37 +0000)]
litepub schema: add oauthRegistrationEndpoint [ci skip]
William Pitcock [Tue, 12 Feb 2019 21:28:11 +0000 (21:28 +0000)]
user view: add AP C2S oauth endpoints to local user profiles
Karen Konou [Wed, 13 Feb 2019 15:23:09 +0000 (16:23 +0100)]
refactored code
Karen Konou [Tue, 12 Feb 2019 23:04:26 +0000 (00:04 +0100)]
Merge branch 'develop' into hellthread-filter-fix
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
lain [Wed, 13 Feb 2019 12:52:27 +0000 (13:52 +0100)]
User.follow_all: Respect blocks in both directions.
Maxim Filippov [Mon, 11 Feb 2019 09:48:24 +0000 (09:48 +0000)]
Update token.ex
Maxim Filippov [Sun, 10 Feb 2019 21:49:56 +0000 (00:49 +0300)]
Add revoke token
Maxim Filippov [Sun, 10 Feb 2019 19:41:06 +0000 (22:41 +0300)]
Add OAuth tokens endpoint
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
Hakaba Hitoyo [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Mark streaming feature for desktop apps in Clients.md
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
hakabahitoyo [Wed, 13 Feb 2019 06:46:42 +0000 (15:46 +0900)]
bugfix mdii uploader
Karen Konou [Tue, 12 Feb 2019 22:25:09 +0000 (23:25 +0100)]
added checks for public url and follower collections
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
Haelwenn (lanodan) Monnier [Sat, 2 Feb 2019 18:06:26 +0000 (19:06 +0100)]
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
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
Haelwenn (lanodan) Monnier [Thu, 22 Nov 2018 06:12:13 +0000 (07:12 +0100)]
config/dev.exs: Don’t put secure cookies on dev
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
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]
Hakaba Hitoyo [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Mark streaming feature for mobile/web apps in Clients.md
Mark Felder [Tue, 12 Feb 2019 00:37:22 +0000 (00:37 +0000)]
Formatting
Mark Felder [Tue, 12 Feb 2019 00:25:12 +0000 (00:25 +0000)]
Fix compile
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
shibayashi [Mon, 11 Feb 2019 23:08:52 +0000 (00:08 +0100)]
Use url[:scheme] instead of protocol to determine if https is enabled
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
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy
projects / akkoma / log