summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-27Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'kaniini
Create tombstone instead of object deletion See merge request pleroma/pleroma!593
2018-12-27Merge branch 'reserve-user-names' into 'develop'kaniini
Reserve a few user names See merge request pleroma/pleroma!594
2018-12-27Merge branch 'feature/exclude_reblogs' into 'develop'kaniini
Implement exclude_reblogs and include_rts See merge request pleroma/pleroma!598
2018-12-27[#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version.Ivan Tashkinov
2018-12-27[Fixes #396] Required Elixir ~> 1.7.Ivan Tashkinov
2018-12-27[#471] Prevented rendering of inactive local accounts.Ivan Tashkinov
2018-12-27Treat only true and "true" as trueMaxim Filippov
2018-12-27Set ttl_interval to the seconds_valid timevaartis
2018-12-26Implement exclude_reblogs and include_rtsVyr Cossont
2018-12-27Treat any present value in "no_attachment_links" as trueMaxim Filippov
2018-12-27Up captcha timer to 60 secs again, save used captchas in cachexEkaterina Vaartis
2018-12-26Merge branch 'fix/ci-set-mix-env-globally' into 'develop'Haelwenn
[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in dev env. See merge request pleroma/pleroma!596
2018-12-26[CI] Set MIX_ENV to test in `variables` section instead of specifying it ↵Rin Toshaka
before the command. Fix `mix compile` compiling in the dev env.
2018-12-26Add 'about' to restricted list.lain
And correct pleromaFE config.
2018-12-26Add ~ to the list of restricted names.lain
2018-12-26Expose restricted names in nodeinfo.lain
2018-12-26Add some hard limits on inserted activities.lain
2018-12-25Add test to check /object/:id does not leak the tombstone itselfMaxim Filippov
2018-12-25Reserve a few user nameslain
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25Merge branch 'legal-boilerplate' into 'develop'lambda
Legal boilerplate See merge request pleroma/pleroma!592
2018-12-25FormatMaxim Filippov
2018-12-25Revert unneeded changesMaxim Filippov
2018-12-25Fix Activity testMaxim Filippov
2018-12-25Remove unused testMaxim Filippov
2018-12-25Revert Activity tombstones, add ObjectTombstone structMaxim Filippov
2018-12-25Fix failing testsMaxim Filippov
2018-12-24Capitalize "tombstone"Maxim Filippov
2018-12-24Create tombstone instead of object deletionMaxim Filippov
2018-12-23tests: add legal boilerplateWilliam Pitcock
2018-12-23mix tasks: add legal boilerplateWilliam Pitcock
2018-12-23add license boilerplate to pleroma coreWilliam Pitcock
2018-12-23Merge branch 'bugfix/trans_fix_url_videos' into 'develop'lambda
Fix "url" of Videos in transmogrifier Closes #367 See merge request pleroma/pleroma!459
2018-12-23tests: twitter api: add test proving that peertube videos are correctly handledWilliam Pitcock
2018-12-23twitter api: add "Video" to supported activity types listWilliam Pitcock
2018-12-23tests: twitter api: activity view test: enable tesla mockWilliam Pitcock
2018-12-23twitter api: activity representer: remove peertube hackWilliam Pitcock
2018-12-23tests: mastodon api: add test verifying that peertube videos are correctly ↵William Pitcock
rendered
2018-12-23mastodon api: status view: remove obsolete peertube hackWilliam Pitcock
2018-12-23transmogrifier: significantly rework handling of peertube videos, add testWilliam Pitcock
2018-12-23Merge branch 'hotfix/activity-without-content' into 'develop'lambda
Twitter ActivityView: fix crash with activity without content See merge request pleroma/pleroma!572
2018-12-23transmogrifier: When it’s a Video move "url" to "attachment"Haelwenn (lanodan) Monnier
2018-12-23Merge branch 'feature/hellthread-mitigation' into 'develop'kaniini
implement hellthread mitigation Closes #474 See merge request pleroma/pleroma!588
2018-12-23Implement kaniini's tweaksKaren Konou
2018-12-23Renamed the thingsKaren Konou
2018-12-23Add documentationKaren Konou
2018-12-22Fix formattingKaren Konou
2018-12-22Implement large thread filterKaren Konou
2018-12-22Specifically disable captcha for automatic tests, it makes them failEkaterina Vaartis
2018-12-22Move the encryption out of kocaptcha into general captcha moduleEkaterina Vaartis
That way there won't be a need to reimplement it for other captcha services
2018-12-21Make captcha (kocaptcha) statelessEkaterina Vaartis
Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed