949e35e26d
[ #468 ] OAuth scopes-related data migration simplification.
2019-02-14 14:28:26 +03:00
1d17082ab2
Merge branch 'fix/mediaproxy-s3' into 'develop'
...
Fix S3 links encoding in Mediaproxy
Closes #580
See merge request pleroma/pleroma!828
2019-02-14 10:10:13 +00:00
3f32d7b937
Fix queue name
2019-02-14 17:02:47 +07:00
907306174b
fix S3 links encoding in Mediaproxy
2019-02-14 15:55:21 +07:00
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
2019-02-14 03:55:26 +00:00
6652389e80
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
...
activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827
2019-02-14 03:40:33 +00:00
e031cc6473
tests: update tests for totalItems leak fix
2019-02-14 03:22:54 +00:00
72ba5b4ab7
activitypub: user view: formatting
2019-02-14 03:13:07 +00:00
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
2019-02-14 03:10:00 +00:00
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
2019-02-14 03:02:45 +00:00
ee2fa1a314
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.
2019-02-14 03:01:39 +00:00
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
2019-02-14 02:50:06 +00:00
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
2019-02-14 02:41:21 +00:00
e9ef4b8da6
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.
2019-02-14 01:10:04 +00:00
889ad95a2a
tests: add some reserialization tests based on IR differences
2019-02-14 00:59:18 +00:00
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
2019-02-14 00:35:54 +00:00
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
2019-02-14 00:35:53 +00:00
1ef4741861
Merge branch 'feature/better-login-errors' into 'develop'
...
Improve login error for OAuth flow
See merge request pleroma/pleroma!824
2019-02-13 23:42:11 +00:00
f62c1d6266
Improve login error for OAuth flow
2019-02-13 22:33:22 +00:00
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
2019-02-14 00:29:29 +03:00
d54c483964
tests: add tests for endpoints
2019-02-13 19:48:24 +00:00
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
2019-02-13 19:34:43 +00:00
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
2019-02-13 19:34:43 +00:00
db8abd958d
activitypub: user view: fix up endpoints rendering
2019-02-13 19:34:43 +00:00
dd989962e6
litepub schema: add oauthRegistrationEndpoint [ci skip]
2019-02-13 19:34:43 +00:00
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
2019-02-13 19:34:43 +00:00
bef9b9cb66
refactored code
2019-02-13 16:23:09 +01:00
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
2019-02-13 16:22:14 +01:00
99f955cd9e
Merge branch 'mass-follow-fixes' into 'develop'
...
User.follow_all: Respect blocks in both directions.
See merge request pleroma/pleroma!823
2019-02-13 13:04:23 +00:00
88a4de24f9
User.follow_all: Respect blocks in both directions.
2019-02-13 13:52:27 +01:00
760fec4cb8
Update token.ex
2019-02-13 12:59:56 +03:00
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
33f8f3c33a
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
2019-02-13 07:51:14 +00:00
16b7c07115
Mark streaming feature for desktop apps in Clients.md
2019-02-13 07:51:14 +00:00
4bdb2d44c2
Merge branch 'bugfix/mdii-uploader' into 'develop'
...
Bugfix for MDII Uploader
See merge request pleroma/pleroma!822
2019-02-13 07:32:56 +00:00
b7bc666200
bugfix mdii uploader
2019-02-13 15:46:42 +09:00
1d727cd069
added checks for public url and follower collections
2019-02-13 00:01:34 +01:00
0534463cef
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
2019-02-12 22:41:46 +00:00
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
2019-02-12 22:12:12 +01:00
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
...
This is needed to run dev mode mastofe at the same time
2019-02-12 22:12:11 +01:00
71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
2019-02-12 21:50:47 +01:00
c71b3a1b12
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
...
Fix CSP check for 'upgrade-insecure-requests'
See merge request pleroma/pleroma!814
2019-02-12 02:44:23 +00:00
e1983fca8d
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]
2019-02-12 02:35:15 +00:00
84f22d1cb8
Mark streaming feature for mobile/web apps in Clients.md
2019-02-12 02:35:15 +00:00
c984e8272a
Formatting
2019-02-12 00:37:22 +00:00
4956ab5ea3
Fix compile
2019-02-12 00:25:12 +00:00
ac7ef0999d
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
2019-02-11 23:59:04 +00:00
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
2019-02-12 00:08:52 +01:00
39548c3824
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'
...
Filter summary field in KeywordPolicy
See merge request pleroma/pleroma!812
2019-02-11 18:45:15 +00:00
Ivan Tashkinov