summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-26Merge branch 'fix/pleromafe-title' into 'develop'kaniini
Replace hardcoded <title> See merge request pleroma/pleroma!476
2018-11-26config: document mrf_user_allowlistWilliam Pitcock
2018-11-26nodeinfo: add mrf_user_allowlist dataWilliam Pitcock
2018-11-26MRF: add user allowlist moduleWilliam Pitcock
2018-11-26Replace this hardcoded <title>Mark Felder
2018-11-26Merge branch 'bugfix/csp-no-https' into 'develop'kaniini
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https See merge request pleroma/pleroma!475
2018-11-26Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there ↵Haelwenn (lanodan) Monnier
is https This fixes running mastofe with MIX_ENV=dev
2018-11-26Merge branch 'add-manifest-src-to-csp' into 'develop'Haelwenn
Add manifest-src to CSP to allow manifest.json See merge request pleroma/pleroma!474
2018-11-26Add manifest-src to allow manifest.jsonshibayashi
2018-11-25Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'kaniini
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints See merge request pleroma/pleroma!471
2018-11-24version string: force git abbrev size to 8 charshref
Fixes #389 Older git versions defaults to 7 chars.
2018-11-24Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocketHaelwenn (lanodan) Monnier
2018-11-24Web.Streamer: Get unauthenticated statuses representationHaelwenn (lanodan) Monnier
2018-11-24Web.MastodonAPI.MastodonSocket: Put access_token at function-levelHaelwenn (lanodan) Monnier
2018-11-24Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpointsHaelwenn (lanodan) Monnier
reported by soka on CRTNet
2018-11-22Merge branch 'feature/admin-api' into 'develop'kaniini
Add a admin API See merge request pleroma/pleroma!366
2018-11-21Merge branch 'feature/improve-version' into 'develop'kaniini
Improved version string See merge request pleroma/pleroma!467
2018-11-20Merge branch 'runtime-fixes' into 'develop'kaniini
Various runtime configuration fixes See merge request pleroma/pleroma!468
2018-11-20Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into ↵lain
validate-user-info
2018-11-20Raise on usage of old function.lain
2018-11-20Fix most mastodon api bugs.lain
2018-11-20tests: fix up some more broken mastodon api testcasesWilliam Pitcock
2018-11-20Merge branch 'feature/retry-queue' into 'develop'Haelwenn
Federator: add retry queue. See merge request pleroma/pleroma!323
2018-11-20mastodon api: fix up quite a few test failuresWilliam Pitcock
2018-11-20activitypub: fix restrict_blocked()William Pitcock
2018-11-20mastodon api: account view: fix testsWilliam Pitcock
2018-11-20streamer: fix fetching the user's block listWilliam Pitcock
2018-11-20oauth plug: fix deactivated checkWilliam Pitcock
2018-11-20common api: fix moderator check when deleting postsWilliam Pitcock
2018-11-20user: fix user.info lookup in User.locked?()William Pitcock
2018-11-20Fix Notification tests.lain
2018-11-20Merge branch 'fix/mediaproxy-empty-url' into 'develop'kaniini
mediaproxy: fix empty url & add some tests See merge request pleroma/pleroma!466
2018-11-20Fix formatter tests.lain
2018-11-20Improved version stringhref
2018-11-20mediaproxy: fix empty url & add some testshref
2018-11-19RetryQueue: tiny refractor, add testseal
2018-11-19Various runtime configuration fixeshref
2018-11-18Several twitter api fixes.lain
2018-11-18Fix user updating from AP.lain
2018-11-18Mix format.lain
2018-11-18Fix most User tests.lain
2018-11-18Fix setting of keys.lain
2018-11-18Fix following locked users.lain
2018-11-18Fix note count update.lain
2018-11-18Fix follower count test.lain
2018-11-18Fix user deactivation test.lain
2018-11-18Fix blocking.lain
2018-11-18Merge branch 'update/pleroma-fe-20181118' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!464
2018-11-18update pleroma frontendWilliam Pitcock
2018-11-18Formatting.lain