summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-12Merge branch 'feature/unrepeat-tests' into feature/unrepeatsFrancis Dinh
2018-05-12Update test fixtureFrancis Dinh
2018-05-11Revert "Log error when handling unrepeats"Francis Dinh
This reverts commit c17c55e989a47f0722b115ffba48b7a1b45b7628.
2018-05-11Add tests for unrepeatsFrancis Dinh
2018-05-11Log error when handling unrepeatsFrancis Dinh
2018-05-11Probably better way of handling non-follow undos in ostatusFrancis Dinh
2018-05-11Revert "Do not send non-follow undos over ostatus for now"Francis Dinh
This reverts commit 07fdc072382007812dc6af80fa2912f6b6d987b8.
2018-05-11Revert "Use [] instead of nil"Francis Dinh
This reverts commit 42268b0981e47cacd9f27b985dcd0bf08819258b.
2018-05-11Use [] instead of nilFrancis Dinh
2018-05-11Do not send non-follow undos over ostatus for nowFrancis Dinh
2018-05-09Match proper number of values from unannounceFrancis Dinh
2018-05-08Change argument order and call correct # of argsFrancis Dinh
2018-05-08Handle Undo activites containing an AnnounceFrancis Dinh
2018-05-08Federate correct activityFrancis Dinh
2018-05-04Fix formattingFrancis Dinh
2018-04-25Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into ↵Francis Dinh
feature/unrepeats
2018-04-25Formatting fixesFrancis Dinh
2018-04-25Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Francis Dinh
feature/unrepeats
2018-04-25Fix comment grammarFrancis Dinh
2018-04-24Merge branch 'gitignore' into 'develop'lambda
Gitignore See merge request pleroma/pleroma!131
2018-04-24Fix formatting.lain
2018-04-24Add common files to gitignoreRachel H
2018-04-24Merge branch 'feature/message-rewrite-facility' into 'develop'lambda
message rewrite facility See merge request pleroma/pleroma!112
2018-04-24Update .gitlab-ci.ymllambda
2018-04-24Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain
2018-04-24Correct syntax with mix formatDashie
2018-04-24Add User.decrease_note_count and call it from ActivityPub.deleteDashie
2018-04-24Merge branch 'favicon_tag' into 'develop'lambda
Fix endpoint for favicon See merge request pleroma/pleroma!84
2018-04-23update frontendlain
2018-04-23update frontendlain
2018-04-22Embed announce activity data instead of linking to itFrancis Dinh
2018-04-22Revert "Rename make_unannounce_data helper to make_undo_data"Francis Dinh
This reverts commit c649ca89586ec83407b298c20f51a25318d777b9.
2018-04-22Small cleanup.lain
2018-04-22Merge branch 'develop' into fix/note-count-not-updatinglain
2018-04-22Rename make_unannounce_data helper to make_undo_dataFrancis Dinh
This makes it a bit more easier to adapt for unlikes as well in the future.
2018-04-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-21Formatter: Use proper escaping for links.lain
2018-04-21Update note count in ActivityPub.create.eal
2018-04-21Merge branch '146-enable-custom-panel-by-default-and-have-default-content' ↵lambda
into 'develop' Resolve "Enable custom panel by default and have default content" Closes #146 See merge request pleroma/pleroma!124
2018-04-21Merge branch 'readme-update' into 'develop'lambda
Elaborate on setup steps and CLI commands. See merge request pleroma/pleroma!126
2018-04-21Merge branch 'nginx-certbot-doc' into 'develop'lambda
Add info about certbot with the webroot plugin to pleroma.nginx See merge request pleroma/pleroma!125
2018-04-21Update README.mdlambda
2018-04-21Formatting fixes.lain
2018-04-21add formatterlain
2018-04-21.lain
2018-04-21.lain
2018-04-21..lain
2018-04-21Update CI.lain
2018-04-21Make search use id index too.lain
Seems to be faster in general, query planner chooses well.
2018-04-20Use correct activity for undoFrancis Dinh