summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-17mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989Ariadne Conill
2019-07-17Merge branch 'feature/mention-mrf' into 'develop'kaniini
Add MRF MentionPolicy for dropping posts which mention specific actors See merge request pleroma/pleroma!1439
2019-07-17Add MRF MentionPolicy for dropping posts which mention specific actorsRX14
2019-07-16Merge branch 'feature/1078-password-reset' into 'develop'kaniini
Feature/1078 password reset Closes #1078 See merge request pleroma/pleroma!1431
2019-07-16mastoapi password resetAlexander Strizhakov
added rate limit to password reset configure rate limit in runtime
2019-07-16Merge branch 'tests/upload_filters' into 'develop'kaniini
added tests for Pleroma.Upload.Filter See merge request pleroma/pleroma!1434
2019-07-16added tests for Pleroma.Upload.FilterMaksim
2019-07-16Merge branch '1094-relation-actions-rate-limiting' into 'develop'kaniini
[#1094] Rate-limited follow & unfollow actions. Closes #1094 See merge request pleroma/pleroma!1436
2019-07-16Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-16[#1094] Rate-limited follow & unfollow actions.Ivan Tashkinov
2019-07-16Merge branch 'add-deactivated-to-account-view' into 'develop'kaniini
Add `pleroma.deactivated` to the Account entity (Mastodon API) See merge request pleroma/pleroma!1433
2019-07-16Add `pleroma.deactivated` to the Account entity (Mastodon API)Eugenij
2019-07-16Merge branch 'add-blocked-by-to-relationship' into 'develop'kaniini
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`) See merge request pleroma/pleroma!1429
2019-07-16Add the `blocked_by` attribute to the relationship API (`GET ↵Eugenij
/api/v1/accounts/relationships`)
2019-07-16Merge branch 'feature/addressable-lists' into 'develop'kaniini
Fix typo See merge request pleroma/pleroma!1432
2019-07-16Fix typoEgor Kislitsyn
2019-07-16Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch
Status View: Poll ids are strings. See merge request pleroma/pleroma!1430
2019-07-16Mastodon Controller: Fix tests.lain
2019-07-16Status View: Poll ids are strings.lain
All ids in mastodon are strings, in general.
2019-07-15Merge branch 'match-file-name' into 'develop'feld
try to always match the filename for proxy url See merge request pleroma/pleroma!1405
2019-07-15Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop'feld
Remove dead link from the installation docs See merge request pleroma/pleroma!1428
2019-07-15Remove dead link from the installation docsEugenij
2019-07-15Merge branch 'tests/mastodon-common-api' into 'develop'kaniini
Add more tests for MastodonAPIController and CommonAPI See merge request pleroma/pleroma!1425
2019-07-15Add more tests for MastodonAPIController and CommonAPISergey Suprunenko
2019-07-15Merge branch 'fix/1091-notifications-query' into 'develop'kaniini
Notifications query fix Closes #1091 See merge request pleroma/pleroma!1427
2019-07-15query fixAlex S
2019-07-15Merge branch 'sha512-crypt' into 'develop'kaniini
detect and use sha512-crypt for stored password hash. See merge request pleroma/pleroma!1422
2019-07-15Merge branch 'develop' into match-file-nameSachin Joshi
# Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15formattingMoonman
2019-07-15Merge branch 'update-tzdata' into 'develop'kaniini
Dependencies: Update tzdata and related packages. See merge request pleroma/pleroma!1423
2019-07-15Merge branch 'admin-configure-atom-keys' into 'develop'kaniini
admin configure - atom keys with leading : See merge request pleroma/pleroma!1424
2019-07-15Merge branch 'tests/http_signature' into 'develop'kaniini
tests for Pleroma.Signature See merge request pleroma/pleroma!1426
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-15Merge branch 'feature/addressable-lists' into 'develop'kaniini
[#802] Add addressable lists See merge request pleroma/pleroma!1113
2019-07-15migrating task refactorAlex S
2019-07-15atom keys with leading :Alex S
2019-07-15List messages must be visible for mentioned usersEgor Kislitsyn
2019-07-15Dependencies: Update tzdata and related packages.lain
2019-07-15Add `listMessage` to to the JSON-LD contextEgor Kislitsyn
2019-07-15Update documentationEgor Kislitsyn
2019-07-15Add an explanation comment to Publisher.publish/2Egor Kislitsyn
2019-07-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-07-15Support `list` visibility in StatusViewEgor Kislitsyn
2019-07-14Merge branch 'tests/media_proxy' into 'develop'kaniini
added tests for Web.MediaProxy See merge request pleroma/pleroma!1418
2019-07-14added tests for Web.MediaProxyMaksim
2019-07-14Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'kaniini
Unfollow should also unsubscribe Closes #1086 See merge request pleroma/pleroma!1419
2019-07-14Unfollow should also unsubscribeSergey Suprunenko
2019-07-14Merge branch 'security/ir-generic-containment' into 'develop'kaniini
security: IR-based generic object containment See merge request pleroma/pleroma!1417
2019-07-14tests: fix object containment violations in the transmogrifier testsAriadne Conill
Some objects were not completely rewritten in the tests, which caused object containment violations. Fix them by rewriting the object IDs to be in an appropriate namespace.
2019-07-14security: detect object containment violations at the IR levelAriadne Conill
It is more efficient to check for object containment violations at the IR level instead of in the protocol handlers. OStatus containment is especially a tricky situation, as the containment rules don't match those of IR and ActivityPub. Accordingly, we just always do a final containment check at the IR level before the object is added to the IR object graph.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 02:27:06 +0000