summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-19Remove extra bracketraeno
2018-12-19Merge branch 'develop' into oembed_providerraeno
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
2018-12-18Ignore HTML characters in formatter.exrinpatch
2018-12-18Pleroma-API.md: Additionnal endpointsrinpatch
2018-12-18Move to docsHaelwenn (lanodan) Monnier
2018-12-18Documentation: Move generated files to priv/static/doc, add it to endpoint.exHaelwenn (lanodan) Monnier
2018-12-18Merge branch 'feature/new-user-routes' into 'develop'lambda
Use "~" as a route namespace symbol on FE See merge request pleroma/pleroma!530
2018-12-18Merge branch 'new-routes-integration' into 'develop'lambda
update frontend See merge request pleroma/pleroma!573
2018-12-18update frontendlain
2018-12-18Merge branch 'ci-test-fix' into 'develop'lambda
SetUserSessionIdPlugTest: try to fix random ci failures See merge request pleroma/pleroma!570
2018-12-18[#114] Added info on `account_activation_required` setting to config readme.Ivan Tashkinov
2018-12-18Twitter ActivityView: fix crash when activity content is nilhref
2018-12-18[#114] Formatting fix.Ivan Tashkinov
2018-12-18[#114] Added email confirmation resend action. Added testsIvan Tashkinov
for registration, authentication, email confirmation, confirmation resending. Made admin methods create confirmed users.