aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-11-04Merge branch 'missing-tesla-mocks' into 'develop'lain
add missing tesla mocks See merge request pleroma/pleroma!1879
2019-11-04add missing tesla mocksSteven Fuchs
2019-11-04Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini
mix: update fast_sanitize dependency to 1af67547 Closes #1372 See merge request pleroma/pleroma!1934
2019-11-04mix: update fast_sanitize dependency to 1af67547Ariadne Conill
2019-11-04Merge branch 'faster-user-deactivation' into 'develop'kaniini
User: Don't pull remote users follower count immediately after deactivating. Closes #1369 See merge request pleroma/pleroma!1933
2019-11-04Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'lain
Store status data inside flag activity See merge request pleroma/pleroma!1849
2019-11-04User: Don't pull remote users follower count immediately after deactivating.lain
The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369
2019-11-03Merge branch 'chore/update-fast-sanitize' into 'develop'kaniini
update fast sanitize dependency See merge request pleroma/pleroma!1932
2019-11-03update fast sanitize dependencyAriadne Conill
2019-11-03Merge branch 'bugfix/streamer-follows' into 'develop'rinpatch
streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931
2019-11-03Merge branch 'feature/omit-relay-user' into 'develop'kaniini
AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924
2019-11-03Merge branch 'feature/fast_sanitize' into 'develop'kaniini
Switching to FastSanitize See merge request pleroma/pleroma!1916
2019-11-03streamer: use direct object for filter checks when there is no valid child ↵Ariadne Conill
object in an activity We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291
2019-11-02Merge branch 'fix/migration-schema' into 'develop'Haelwenn
Fix bookmark migration using a query with a schema See merge request pleroma/pleroma!1923
2019-11-01Bump fast_sanitize versionrinpatch
2019-11-01Merge branch 'fix/moderation-log-crash' into 'develop'kaniini
Fix moderation log crash Closes #1345 See merge request pleroma/pleroma!1929
2019-11-01Update docsMaxim Filippov
2019-11-01Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-11-01Fix moderation log crashMaxim Filippov
2019-11-01Force password reset for multiple usersMaxim Filippov
2019-11-01Undo dialyzer fixMaxim Filippov
2019-11-01Merge branch 'fix-recipients-from-activity' into 'develop'kaniini
Fix duplicate recipients from activity See merge request pleroma/pleroma!1921
2019-10-31Merge branch 'refactor/db-add-defaults' into 'develop'lain
Set defaults to fields with NULL values Closes #1358 See merge request pleroma/pleroma!1914
2019-10-31Fix countMaxim Filippov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:38:20 +0000