summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-14Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda
activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826
2019-02-14activitypub: clean up logging statements a littleWilliam Pitcock
2019-02-14Merge remote-tracking branch 'upstream/develop' into patch-image-descriptionWim Vanderbauwhede
2019-02-14[#468] Refactored OAuth scopes parsing / defaults handling.Ivan Tashkinov
2019-02-14[#468] OAuth scopes-related data migration simplification.Ivan Tashkinov
2019-02-14Merge branch 'fix/mediaproxy-s3' into 'develop'href
Fix S3 links encoding in Mediaproxy Closes #580 See merge request pleroma/pleroma!828
2019-02-14Fix queue nameEgor Kislitsyn
2019-02-14fix S3 links encoding in MediaproxyEgor Kislitsyn
2019-02-14Merge branch 'fix/credo-issues-test' into 'develop'kaniini
Fix credo issues in ./test See merge request pleroma/pleroma!808
2019-02-14Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn
activitypub: user inbox/outbox: `totalItems` removal See merge request pleroma/pleroma!827
2019-02-14tests: update tests for totalItems leak fixWilliam Pitcock
2019-02-14activitypub: user view: formattingWilliam Pitcock
2019-02-14activitypub: user view: report totalItems=0 for follows/followers when hiddenWilliam Pitcock
2019-02-14activitypub: user view: remove totalItems from user outboxWilliam Pitcock
(this is based on a counter in User.Info, but the counter is not reliable.)
2019-02-14activitypub: user view: remove totalInbox from user inbox viewWilliam Pitcock
It is not really feasible to quickly calculate the totalItems value and it shouldn't be trusted anyway.
2019-02-14Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini
ActivityPub C2S oauth endpoints See merge request pleroma/pleroma!821
2019-02-14activitypub: user view: do not expose oAuth endpoints for instance usersWilliam Pitcock
2019-02-14oauth: never use base64 padding when returning tokens to applicationsWilliam Pitcock
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-14tests: add some reserialization tests based on IR differencesWilliam Pitcock
2019-02-14activitypub: transmogrifier: correctly handle nil inReplyTo valueWilliam Pitcock
2019-02-14activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag ↵William Pitcock
objects
2019-02-13Merge branch 'feature/better-login-errors' into 'develop'kaniini
Improve login error for OAuth flow See merge request pleroma/pleroma!824
2019-02-13Improve login error for OAuth flowMark Felder
2019-02-14[#468] User UI for OAuth permissions restriction. Standardized storage ↵Ivan Tashkinov
format for `scopes` fields, updated usages.
2019-02-13tests: add tests for endpointsWilliam Pitcock
2019-02-13activitypub: user view: use route helpers instead of hardcoded URIsWilliam Pitcock
2019-02-13activitypub: user view: add oauthRegistrationEndpoint to user profilesWilliam Pitcock
2019-02-13activitypub: user view: fix up endpoints renderingWilliam Pitcock
2019-02-13litepub schema: add oauthRegistrationEndpoint [ci skip]William Pitcock
2019-02-13user view: add AP C2S oauth endpoints to local user profilesWilliam Pitcock
2019-02-13refactored codeKaren Konou
2019-02-13Merge branch 'develop' into hellthread-filter-fixKaren Konou
2019-02-13Merge branch 'mass-follow-fixes' into 'develop'rinpatch
User.follow_all: Respect blocks in both directions. See merge request pleroma/pleroma!823
2019-02-13User.follow_all: Respect blocks in both directions.lain
2019-02-13Update token.exMaxim Filippov
2019-02-13Add revoke tokenMaxim Filippov
2019-02-13Add OAuth tokens endpointMaxim Filippov
2019-02-13Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'kaniini
Mark streaming feature for desktop apps in Clients.md See merge request pleroma/pleroma!818
2019-02-13Mark streaming feature for desktop apps in Clients.mdHakaba Hitoyo
2019-02-13Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini
Bugfix for MDII Uploader See merge request pleroma/pleroma!822
2019-02-13bugfix mdii uploaderhakabahitoyo
2019-02-13added checks for public url and follower collectionsKaren Konou
2019-02-12Merge branch 'feature/csp_mastofe-dev' into 'develop'kaniini
Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev See merge request pleroma/pleroma!820
2019-02-12Plugs.HTTPSecurityPlug: Add webpacker to connect-srcHaelwenn (lanodan) Monnier
2019-02-12Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev modeHaelwenn (lanodan) Monnier
This is needed to run dev mode mastofe at the same time
2019-02-12config/dev.exs: Don’t put secure cookies on devHaelwenn (lanodan) Monnier
2019-02-12Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn
Fix CSP check for 'upgrade-insecure-requests' See merge request pleroma/pleroma!814
2019-02-12Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn
Mark streaming feature for mobile/web apps in Clients.md See merge request pleroma/pleroma!816 [ci skip]
2019-02-12Mark streaming feature for mobile/web apps in Clients.mdHakaba Hitoyo
2019-02-12FormattingMark Felder