summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-10-31AdminAPI: Omit relay user from users listMaxim Filippov
2019-10-31Fix "the call ... will never return" warningMaxim Filippov
2019-10-30Bump fast_sanitize dependency so this builds on more than just LinuxMark Felder
2019-10-30Merge branch 'develop' into feature/fast_sanitizeMark Felder
2019-10-30Remove following column from the migrationsRoman Chvanikov
2019-10-30Update test for get_recipients_from_activitykPherox
2019-10-30Merge branch 'fix/blocked-follows' into 'develop'rinpatch
Add a migration to fix blocked follows Closes #1359 See merge request pleroma/pleroma!1922
2019-10-30Fix bookmark migration using a query with a schemarinpatch
This resulted in failures when updating from Pleroma <1.0 because of all the new fields that were added to the user schema.
2019-10-30Add a migration to fix blocked followsEgor Kislitsyn
2019-10-30Fix duplicate recipientskPherox
2019-10-30Rip out the rest of htmlsanitizeexrinpatch
2019-10-29Remove commented-out coderinpatch
2019-10-29Fix XSS emoji testrinpatch
2019-10-29Merge branch 'fix/migrations-same-module-name' into 'develop'rinpatch
Fix two migrations sharing the same module name See merge request pleroma/pleroma!1919
2019-10-29Bump fast_sanitize dependencyrinpatch
2019-10-29Fix two migrations sharing the same module namerinpatch
This makes ecto execute only the latter one.
2019-10-29Merge branch 'fix-follow-requests' into 'develop'rinpatch
FIx follow requests Closes #1357 See merge request pleroma/pleroma!1918
2019-10-29Migrate missing follow requestskPherox
2019-10-29Bump fast_sanitize versionrinpatch
2019-10-29Add test follow activity for locked accountkPherox
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 14:59:52 +0000