aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-29markdown: clean up html generated by earmarkAriadne Conill
2019-07-29Merge branch 'refactor/use-constants' into 'develop'lain
refactoring: begin to use constants See merge request pleroma/pleroma!1500
2019-07-29Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini
Add `mailerEnabled` to the NodeInfo metadata See merge request pleroma/pleroma!1502
2019-07-29Add `mailerEnabled` to the NodeInfo metadataEugenij
2019-07-29Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini
Redirect not logged-in users to the MastoFE login page on private instances Closes #1045 See merge request pleroma/pleroma!1503
2019-07-29Redirect not logged-in users to the MastoFE login page on private instancesSergey Suprunenko
2019-07-29Merge branch 'tests/ostatus_controller' into 'develop'kaniini
added tests for OstatusController See merge request pleroma/pleroma!1501
2019-07-29added tests for OstatusControllerMaksim
2019-07-29constants: add as_public constant and use it everywhereAriadne Conill
2019-07-29mix: add ex_const dependencyAriadne Conill
2019-07-28Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request pleroma/pleroma!1498
2019-07-28transmogrifier: use User.delete() instead of handrolled user deletion code ↵Ariadne Conill
for remote users Closes #1104
2019-07-28Merge branch 'confirmation-resend' into 'develop'kaniini
add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492
2019-07-28add account confirmation email resend in mastodon apiSachin Joshi
2019-07-28Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini
fixed User.update_and_set_cache for stale user See merge request pleroma/pleroma!1493
2019-07-28fixed User.update_and_set_cache for stale userMaksim
2019-07-28Merge branch 'develop' into 'develop'kaniini
Fix HTTP sig tweak on KeyId See merge request pleroma/pleroma!1496
2019-07-28Merge branch 'feature/hackney-303-redirect' into 'develop'kaniini
Handle 303 redirects Closes #1127 See merge request pleroma/pleroma!1497
2019-07-28Handle 303 redirectsSergey Suprunenko
2019-07-28Fix HTTP sig tweak on KeyIdThomas Sileo
2019-07-26Merge branch 'issue/1097' into 'develop'rinpatch
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/ See merge request pleroma/pleroma!1495
2019-07-26[#1097] added redirect: /pleroma/admin -> /pleroma/admin/Maksim
2019-07-26Merge branch 'changelog/1484-base_url-remove-media' into 'develop'Haelwenn
Changelog: !1484 base_url removed /media/ See merge request pleroma/pleroma!1494
2019-07-26CHANGELOG.md: Add entry for !1484Haelwenn (lanodan) Monnier
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484 [ci skip]
2019-07-25Merge branch 'develop' into feature/hide-follows-remoterinpatch
2019-07-25Merge branch 'tests/filter_dedupe' into 'develop'kaniini
fixed test for elixir 1.7.4 See merge request pleroma/pleroma!1487
2019-07-25fixed test for elixir 1.7.4Maksim
2019-07-24Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini
Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472
2019-07-24Merge branch 'fix/put-correct-activity-url' into 'develop'kaniini
Show the url advertised in the Activity in the Status JSON response Closes #1077 See merge request pleroma/pleroma!1485
2019-07-24Show the url advertised in the Activity in the Status JSON responseSergey Suprunenko
2019-07-25Add WebFinger test for AP-only accountkPherox
2019-07-24Merge branch 'fix/Upload_base_url' into 'develop'kaniini
Fix/upload base url See merge request pleroma/pleroma!1484
2019-07-24Do not prepend /media/ when using base_urlfeld
This ensures admin has full control over the path where media resides.
2019-07-24WIPMike Verdone
2019-07-25Change to not require `magic-public-key` on WebFingerkPherox
2019-07-24Merge branch 'tests/web_finger' into 'develop'kaniini
tests WebFinger See merge request pleroma/pleroma!1483
2019-07-24tests WebFingerMaksim
2019-07-24Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) See merge request pleroma/pleroma!1481
2019-07-24Add `domain_blocking` to the relationship API (GET ↵Eugenij
/api/v1/accounts/relationships)
2019-07-24Revert "squash! Expose expires_at datetime in mastoAPI only for the activity ↵Mike Verdone
actor" This reverts commit 2981821db834448bf9b2ba26590314e36201664c.
2019-07-24fixup! Update changelogMike Verdone
2019-07-24squash! Expose expires_at datetime in mastoAPI only for the activity actorMike Verdone
NOTE: rewrite the commit msg
2019-07-24Update changelog to document expiring posts featureMike Verdone
2019-07-24Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-24Expose expires_at datetime in mastoAPI only for the activity actorMike Verdone
In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so.
2019-07-24Require that ephemeral posts live for at least one hourMike Verdone
If we didn't put some kind of lifetime requirement on these, I guess you could annoy people by sending large numbers of ephemeral posts that provoke notifications but then disappear before anyone can read them.
2019-07-24Add support for activity expiration to common and Masto APIMike Verdone
The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.
2019-07-24Merge branch 'develop' into 'develop'lain
Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482
2019-07-24Add activity expiration workerMike Verdone
This is a worker that runs every minute and deletes expired activities. It's based heavily on the scheduled activities worker.
2019-07-24Add activity expirations tableMike Verdone
Add a table to store activity expirations. An activity can have zero or one expirations. The expiration has a scheduled_at field which stores the time at which the activity should expire and be deleted.
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:56 +0000