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-26Implement exclude_reblogs and include_rtsVyr Cossont
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-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-20Merge branch 'ci-test-fix' into 'develop'lambda
SetUserSessionIdPlugTest: try again to fix random ci failures See merge request pleroma/pleroma!579
2018-12-20Merge branch '114_email_confirmation' into 'develop'kaniini
[#114] Email confirmation See merge request pleroma/pleroma!546
2018-12-20[#114] Fixed test.Ivan Tashkinov
2018-12-20[#114] Allowed unconfirmed users to authenticate if ↵Ivan Tashkinov
:account_activation_required is disabled prior to confirmation. Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
2018-12-20[#114] Added :user_id component to email confirmation path to improve the ↵Ivan Tashkinov
security. Added tests for `confirm_email` action.
2018-12-20[#114] Removed flash messages rendering on redirects.Ivan Tashkinov
2018-12-20[#114] Stylistic adjustments.Ivan Tashkinov
2018-12-20Merge branch 'support/issue_413' into 'develop'kaniini
[#413] fix parse mentions See merge request pleroma/pleroma!577
2018-12-20[#413] fix parse mentionsMaksim
2018-12-20Merge branch 'fix/readme-md-config-typo' into 'develop'kaniini
Fix config.md path in README See merge request pleroma/pleroma!581
2018-12-20Fix config.md path in READMErinpatch