summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-02-14Merge remote-tracking branch 'upstream/develop' into patch-image-descriptionWim Vanderbauwhede
2019-02-14Merge branch 'fix/mediaproxy-s3' into 'develop'href
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
2019-02-14Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn
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
2019-02-14activitypub: user view: remove totalInbox from user inbox viewWilliam Pitcock
2019-02-14Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini
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
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 ob...William Pitcock
2019-02-13Merge branch 'feature/better-login-errors' into 'develop'kaniini
2019-02-13Improve login error for OAuth flowMark Felder
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
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
2019-02-13Mark streaming feature for desktop apps in Clients.mdHakaba Hitoyo
2019-02-13Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini
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
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
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
2019-02-12Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn
2019-02-12Mark streaming feature for mobile/web apps in Clients.mdHakaba Hitoyo
2019-02-12Use url[:scheme] instead of protocol to determine if https is enabledshibayashi
2019-02-11Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini
2019-02-11Filter summary in keywordpolicyrinpatch
2019-02-11Merge branch 'feature/thread-muting' into 'develop'rinpatch
2019-02-11Merge branch 'feature/rich-media-limits' into 'develop'lambda
2019-02-11Merge branch 'develop' into feature/thread-mutingKaren Konou