summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-25Merge branch 'legal-boilerplate' into 'develop'lambda
Legal boilerplate See merge request pleroma/pleroma!592
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
2018-12-20Fix config.md path in READMErinpatch
2018-12-20Merge branch 'readme' into 'develop'kaniini
Improve systemd service documentation See merge request pleroma/pleroma!580
2018-12-20Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571
2018-12-19Improve systemd service documentationFrancis Dinh
Use `systemctl` instead of `service` since it's not guaranteed the latter will be on the system (e.g. Arch does not have it).
2018-12-19daaa8cd6 take twohref
2018-12-19[#114] `mix format`Ivan Tashkinov
2018-12-19[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for ↵Ivan Tashkinov
auth-inactive users unless requested by admin or moderator.
2018-12-19[#114] User.register/1 tweak.Ivan Tashkinov
2018-12-19[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.Ivan Tashkinov
2018-12-19[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.Ivan Tashkinov
2018-12-19Merge branch 'userless-admin' into 'develop'kaniini
Add a way to use the admin api without a user. See merge request pleroma/pleroma!576
2018-12-18Merge branch 'fix/ci-cache-improved' into 'develop'lambda
Per-branch CI cache with force-recompilation of Pleroma See merge request pleroma/pleroma!574
2018-12-18Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda
[#441] Fix characters converted to HTML being picked up by hashtag parser See merge request pleroma/pleroma!575
2018-12-18Compile pleroma before ecto migrateRin Toshaka
2018-12-18Add a way to use the admin api without a user.lain
2018-12-18Improve CI cacheRin Toshaka
2018-12-18Fix testsRin Toshaka
2018-12-18Add testrinpatch
2018-12-18Merge branch 'develop' into fix/formatter-ignore-html-charsrinpatch