summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-29Merge branch 'enable-ci-cache' into 'develop'lambda
[CI] Enable CI caching for _build and deps See merge request pleroma/pleroma!482
2018-11-29Only jobs for one branch are allowed to use the same cacherinpatch
2018-11-29Cache _buildrinpatch
2018-11-29Add dependency cachingrinpatch
2018-11-28Merge branch 'fix-list-stream-privacy' into 'develop'lambda
Streamer: Don't send unwanted DMs to list streams See merge request pleroma/pleroma!478
2018-11-27Merge branch 'revert-02e43d44' into 'develop'kaniini
Revert "Merge branch 'chore/mix-lock-update' into 'develop'" See merge request pleroma/pleroma!481
2018-11-27Revert "Merge branch 'chore/mix-lock-update' into 'develop'"kaniini
This reverts merge request !480
2018-11-27Merge branch 'chore/mix-lock-update' into 'develop'kaniini
Add ex_doc & makeup_elixir to mix.lock See merge request pleroma/pleroma!480
2018-11-28Add ex_doc & makeup_elixir to mix.lockMaxim Filippov
2018-11-27Streamer: Don't send unwanted DMs to list streamsKokaKiwi
2018-11-27Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'kaniini
fix: version string: force git abbrev size to 8 chars Closes #389 See merge request pleroma/pleroma!472
2018-11-27Merge branch 'ogg-theora-detection' into 'develop'kaniini
Add Theora detection to upload.ex See merge request pleroma/pleroma!479
2018-11-27 Fix lint errorrinpatch
2018-11-27Add Theora detection to upload.exrinpatch
2018-11-27Merge branch 'feature/mrf-user-allowlist' into 'develop'Haelwenn
MRF: user allowlist module See merge request pleroma/pleroma!477
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 'feature/retry-queue' into 'develop'Haelwenn
Federator: add retry queue. See merge request pleroma/pleroma!323
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-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-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-18Federator: add retry queue.eal
2018-11-17Merge branch 'security/as2-object-render-hardening' into 'develop'lambda
activitypub: object view: avoid leaking private details See merge request pleroma/pleroma!463
2018-11-17activitypub: object view: avoid leaking private detailsWilliam Pitcock
2018-11-17Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'lambda
ostatus controller: respond with AS2 objects instead of activities to notice URIs Closes #289 and #383 See merge request pleroma/pleroma!462
2018-11-17ostatus controller: respond with AS2 objects instead of activities to notice ↵William Pitcock
URIs
2018-11-17Merge branch 'security/spoofing-hardening' into 'develop'lambda
security: spoofing hardening Closes #380, #381, and #382 See merge request pleroma/pleroma!461
2018-11-17tests: federator: fix formattingWilliam Pitcock
2018-11-17activitypub: transmogrifier: make deletes secureWilliam Pitcock
2018-11-17Web.AdminAPI.AdminAPIControllerTest: New TestHaelwenn (lanodan) Monnier