aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-10Merge branch 'issue/1339' into 'develop'lain
[#1339] add subject to atom feed See merge request pleroma/pleroma!1961
2019-11-10Apply suggestion to config/config.exslain
2019-11-10Apply suggestion to config/config.exslain
2019-11-10Merge branch 'refactor/readme' into 'develop'lain
Partial readme rewrite See merge request pleroma/pleroma!1958
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-10Merge branch 'refactor/cheatsheet' into 'develop'kaniini
Big config cheatsheet revamp See merge request pleroma/pleroma!1959
2019-11-10Big config cheatsheet revamprinpatch
Categorize things, remove old deprecation warnings, consistently place dots in unordered lists, fix links, etc.
2019-11-10readme: replace banner logo with the one using paths for textrinpatch
2019-11-10readme: Add logo bannerrinpatch
2019-11-09readme: remove unnecessary headingrinpatch
2019-11-09readme: Remove unnecessary description and add a missing dotrinpatch
2019-11-09Add #pleroma-dev to matrix section as wellrinpatch
2019-11-09Partial readme rewriterinpatch
Remove the outdated generic installation guide and point to platform-specific ones instead, update contact info, protocols we support, etc.
2019-11-08Merge branch 'chore/update-fe' into 'develop'rinpatch
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 See merge request pleroma/pleroma!1956
2019-11-09Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642rinpatch
2019-11-08Merge branch 'bugfix/containment-no-id' into 'develop'rinpatch
object containment: handle all cases where ID is invalid (missing, nil, non-string) Closes #1387 See merge request pleroma/pleroma!1955
2019-11-08object containment: handle all cases where ID is invalid (missing, nil, ↵Ariadne Conill
non-string)
2019-11-08Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'rinpatch
Bump fast_sanitize See merge request pleroma/pleroma!1953
2019-11-08Bump fast_sanitizerinpatch
Fixes build fails on freebsd
2019-11-08Merge branch 'chore/add-multifetch' into 'develop'kaniini
nodeinfo: add multifetch feature (ref pleroma-fe!977). See merge request pleroma/pleroma!1952
2019-11-08nodeinfo: add multifetch feature (ref pleroma-fe!977).Ariadne Conill
2019-11-08Merge branch 'chore/bump-fast-sanitize-again' into 'develop'rinpatch
Bump fast_sanitize to 0.1.2 See merge request pleroma/pleroma!1951
2019-11-08Bump fast_sanitize to 0.1.2rinpatch
Fixes build issues on macOS
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-07Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch
Bump fast_sanitize to 0.1.1 Closes #1378 See merge request pleroma/pleroma!1949
2019-11-08Bump fast_sanitize to 0.1.1rinpatch
The parser C-Node has been completely rewritten to not use the deprecated `erl_interface` api. Closes #1378 since Nodex was ripped out and the replacement randomizes master node name.
2019-11-07Merge branch 'recipients-filter' into 'develop'kaniini
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` See merge request pleroma/pleroma!1948
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-06Merge branch 'fix/unwrapped-object-return' into 'develop'rinpatch
Fetcher: fix local check returning unwrapped object See merge request pleroma/pleroma!1947
2019-11-07Fetcher: fix local check returning unwrapped objectrinpatch
This resulted in error messages about failed refetches being logged.
2019-11-06Merge branch 'fix/trailing-format-plug-oauth' into 'develop'rinpatch
Fix TrailingFormatPlug not being active for /api/oauth_tokens Closes #1385 See merge request pleroma/pleroma!1944
2019-11-06Merge branch 'changelog-cleanup' into 'develop'rinpatch
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md See merge request pleroma/pleroma!1945
2019-11-06Merge branch 'fix/saner-static-cache-control' into 'develop'rinpatch
Set better Cache-Control header for static content Closes #1382 See merge request pleroma/pleroma!1943
2019-11-06Fix TrailingFormatPlug not being active for /api/oauth_tokensrinpatch
2019-11-06Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.Ivan Tashkinov
2019-11-06Set better Cache-Control header for static contentrinpatch
Closes #1382
2019-11-06Merge branch 'feature/multiple-users-force-password-reset' into 'develop'feld
Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928
2019-11-06Merge branch 'fix/object-reinject-set-cache' into 'develop'rinpatch
Object Fetcher: set cache after reinjecting See merge request pleroma/pleroma!1942
2019-11-06Object Fetcher: set cache after reinjectingrinpatch
Probably fixes the issue hj had, where polls would have different counters between endpoints.
2019-11-06Merge branch 'ci/remove-docs-build' into 'develop'Haelwenn
CI: Remove the docs-build job See merge request pleroma/pleroma!1941
2019-11-05CI: Remove the docs-build jobrinpatch
The artifacts it produces were no longer used since we switched to mkdocs.
2019-11-05Merge branch 'chore/bump-htmlentities' into 'develop'rinpatch
Bump HtmlEntities to 0.5 See merge request pleroma/pleroma!1939
2019-11-05Bump HtmlEntities to 0.5rinpatch
This release brings a major performance imrovement, see https://github.com/martinsvalin/html_entities/pull/17
2019-11-05Merge branch 'develop' into feature/multiple-users-force-password-resetMaxim Filippov
2019-11-04Merge branch 'failing-search-fixes' into 'develop'rinpatch
User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935
2019-11-04Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'lain
Add `pleroma.direct_conversation_id` to the `conversation` event payload See merge request pleroma/pleroma!1925
2019-11-04User Search: Remove superfluous setweight and random test.lain
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the ↵eugenijm
`conversation` stream event payload.
2019-11-04Merge branch 'transmogrifier-test-errors' into 'develop'lain
capture test log where errors are expected See merge request pleroma/pleroma!1915
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-26 18:10:47 +0000