aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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-23Implement kaniini's tweaksKaren Konou
2018-12-23Renamed the thingsKaren Konou
2018-12-22Fix formattingKaren Konou
2018-12-22Implement large thread filterKaren Konou
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 '114_email_confirmation' into 'develop'kaniini
[#114] Email confirmation See merge request pleroma/pleroma!546
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-20[#413] fix parse mentionsMaksim
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-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-18Add a way to use the admin api without a user.lain
2018-12-18Merge branch 'develop' into fix/formatter-ignore-html-charsrinpatch
2018-12-18Ignore HTML characters in formatter.exrinpatch
2018-12-18Documentation: Move generated files to priv/static/doc, add it to endpoint.exHaelwenn (lanodan) Monnier
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.
2018-12-18[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.Ivan Tashkinov
2018-12-18[#114] Refactored User.register_changeset to init confirmation data.Ivan Tashkinov
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18[#114] Account confirmation email, registration as unconfirmed ↵Ivan Tashkinov
(config-based), auth prevention for unconfirmed.
2018-12-18[#114] Email confirmation route, action, node setting, User.Info fields.Ivan Tashkinov
2018-12-18Merge branch 'develop' into oembed_providerraeno
2018-12-17Instance/Static runtime plughref
This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.
2018-12-17Merge branch '459_fix_user_profile_crash' into 'develop'lambda
Fix update_profile failing due to OAuth token record in assigns instead of string Closes #459 See merge request pleroma/pleroma!561
2018-12-17fix text fieldMaksim Pechnikov
2018-12-17Merge branch 'captcha' into 'develop'lambda
Captcha See merge request pleroma/pleroma!550
2018-12-17Merge branch 'fix-tags' into 'develop'lambda
Fix tagging problems for existing instances. See merge request pleroma/pleroma!562
2018-12-17Merge branch 'test-mix-tasks' into 'develop'lambda
Add tests for Mix tasks See merge request pleroma/pleroma!555
2018-12-17Merge branch 'phoenix14' into 'develop'lambda
Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
2018-12-17Fix tagging problems for existing instances.lain
2018-12-17Use :ets.match_delete to delete old captchasvaartis
2018-12-17Cowboy handler for Mastodon WebSockethref
2018-12-17Support both OAuth token record and token string in UserViewraeno
2018-12-17Merge branch 'testfix/webfinger-jrd' into 'develop'lambda
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554
2018-12-16Clean captchas up periodically, not schedule it after theyre createdEkaterina Vaartis
2018-12-16Change minutes_retained config to seconds_retainedEkaterina Vaartis
2018-12-16Add a configurable auto-cleanup for captchasEkaterina Vaartis