summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-13Format.lain
2018-05-13Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuseslain
2018-05-13Merge branch 'patch-2' into 'develop'lambda
Nginx config - secure defaults See merge request pleroma/pleroma!146
2018-05-13Merge branch 'feld-varnish' into 'develop'lambda
More varnish fixes See merge request pleroma/pleroma!149
2018-05-13Merge branch 'feature/chain-policies' into 'develop'lambda
chain policies See merge request pleroma/pleroma!150
2018-05-13Merge branch 'no-self-notification' into 'develop'lambda
Do not create notification for yourself Closes #121 See merge request pleroma/pleroma!148
2018-05-13Use original status id instead of announce idFrancis Dinh
2018-05-12api/v1/timelines/direct implementationcsaurus
2018-05-12Stream function to handle direct messages.csaurus
2018-05-12Detect and try to stream incoming "direct" messagescsaurus
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-11do not create notification for yourselfPierrick Brun
2018-05-11Merge branch 'patch-1' into 'develop'lambda
Remove alias directive in service file See merge request pleroma/pleroma!151
2018-05-11Use [] instead of nilFrancis Dinh
2018-05-11Do not send non-follow undos over ostatus for nowFrancis Dinh
2018-05-11Remove alias directive in service fileNormandy
Systemd will complain otherwise.
2018-05-10format & made get_policies/1 privatehref
2018-05-10Chain policieshref
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy or a list of policies - Made a behaviour for MRF policies
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-07Don't strip headers from backend for /notice/ eitherMark Felder
2018-05-07Caching notice URLs does not produce pleasant resultsMark Felder
2018-05-07More warning fixes.lain
2018-05-06Merge branch 'feld-varnish' into 'develop'lambda
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/ See merge request pleroma/pleroma!110
2018-05-06Merge branch 'feld-warnings' into 'develop'lambda
Clean up warnings See merge request pleroma/pleroma!144
2018-05-06Merge branch 'fix/unsafe-variables' into 'develop'lambda
Get rid of unsafe variables. See merge request pleroma/pleroma!145
2018-05-06Added headers for a more secure default.Artik Banana
2018-05-06Get rid of unsafe variables.eal
2018-05-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-05-05Streamer: Don't send out stream events for blocked users.lain
2018-05-05Unify wss uri generation.lain
2018-05-05Merge branch 'feld-test.secret' into 'develop'lambda
Make it possible to use custom database connection parameters See merge request pleroma/pleroma!143
2018-05-05Idempotency: Use special cache, keep for 6 hours.lain
2018-05-04Group def renders here as wellMark Felder
2018-05-04Group def renders together to fix warningMark Felder
2018-05-04Merge branch 'feld-test.secret' into feld-warningsMark Felder
2018-05-04SpelingMark Felder
2018-05-04Fix formattingMark Felder
2018-05-04Group response declarations togetherMark Felder
2018-05-04That last change was stupid. Multiline comments in Elixir don't really exist.Mark Felder
Instead we'll just pad with # intstead of playing stupid games with the compiler.
2018-05-04Dirty hack to remove the warningMark Felder
warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings) lib/pleroma/web/activity_pub/transmogrifier.ex