61a88a6757Merge branch 'ci-test-fix' into 'develop'
lambda
2018-12-20 16:31:08 +00:00
2e2030ada8Merge branch '114_email_confirmation' into 'develop'
kaniini
2018-12-20 13:28:36 +00:00
851db74f1c[#114] Fixed test.
Ivan Tashkinov
2018-12-20 15:23:16 +03:00
7cab7de9ff[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
Ivan Tashkinov
2018-12-20 14:48:48 +03:00
f69cbf4755[#114] Added :user_id component to email confirmation path to improve the security. Added tests for confirm_email action.
Ivan Tashkinov
2018-12-20 13:41:30 +03:00
8adcd1e80f[#114] Removed flash messages rendering on redirects.
Ivan Tashkinov
2018-12-20 13:05:42 +03:00
501ce34d7f[#114] Stylistic adjustments.
Ivan Tashkinov
2018-12-20 12:55:12 +03:00
8de3138de0Merge branch 'support/issue_413' into 'develop'
kaniini
2018-12-20 09:35:01 +00:00
f1b93b5be7[#413] fix parse mentions
Maksim
2018-12-20 09:35:01 +00:00
c52453fbd6Merge branch 'fix/readme-md-config-typo' into 'develop'
kaniini
2018-12-20 09:06:48 +00:00
acfd98689bFix config.md path in README
rinpatch
2018-12-20 11:29:08 +03:00
6081c44961Fix config.md path in README
rinpatch
2018-12-20 07:20:13 +03:00
2e4f73a9c4Merge branch 'readme' into 'develop'
kaniini
2018-12-20 04:12:50 +00:00
fda148a9a2Merge branch 'documentation/copy-pleroma-api' into 'develop'
kaniini
2018-12-20 04:01:54 +00:00
8c4fa68428Improve systemd service documentation
Francis Dinh
2018-12-19 16:06:05 -05:00
652f49d176Remove extra bracket
raeno
2018-12-19 23:06:10 +04:00
7fb3780431Merge branch 'develop' into oembed_provider
raeno
2018-12-19 22:39:44 +04:00
b520d44b58[#114] mix format
Ivan Tashkinov
2018-12-19 19:03:39 +03:00
279096228c[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users unless requested by admin or moderator.
Ivan Tashkinov
2018-12-19 18:56:52 +03:00
a532ad5d72[#114] User.register/1 tweak.
Ivan Tashkinov
2018-12-19 17:24:55 +03:00
968d7490b6[#114] User.Info: renamed confirmation_update to confirmation_changeset.
Ivan Tashkinov
2018-12-19 16:27:16 +03:00
59fc5d15df[#114] User.Info: renamed confirmation_update to confirmation_change.
Ivan Tashkinov
2018-12-19 16:27:16 +03:00
f98ee9402fMerge branch 'userless-admin' into 'develop'
kaniini
2018-12-19 00:12:39 +00:00
a3da8a56b6Merge branch 'fix/ci-cache-improved' into 'develop'
lambda
2018-12-18 21:11:40 +00:00
b7f6350107Merge branch 'fix/formatter-ignore-html-chars' into 'develop'
lambda
2018-12-18 20:23:21 +00:00
facd30c9e8Compile pleroma before ecto migrate
Rin Toshaka
2018-12-18 21:20:49 +01:00
f3eb414e28Add a way to use the admin api without a user.
lain
2018-12-18 21:08:52 +01:00
f685351c1eImprove CI cache
Rin Toshaka
2018-12-18 21:06:53 +01:00
196d9c0fd0Fix tests
Rin Toshaka
2018-12-18 20:30:04 +01:00
8a67677d77Add test
rinpatch
2018-12-18 22:10:56 +03:00
ef318fb8a9Merge branch 'develop' into fix/formatter-ignore-html-chars
rinpatch
2018-12-18 21:39:36 +03:00
059dd6f681Ignore HTML characters in formatter.ex
rinpatch
2018-12-18 21:38:15 +03:00
Twitter ActivityView: fix crash when activity content is nil
href
2018-12-18 15:32:41 +01:00
3371a45884[#114] Formatting fix.
Ivan Tashkinov
2018-12-18 17:30:30 +03:00
b096e30cff[#114] Added email confirmation resend action. Added tests for registration, authentication, email confirmation, confirmation resending. Made admin methods create confirmed users.
Ivan Tashkinov
2018-12-18 17:13:52 +03:00
aed0f90287[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.
Ivan Tashkinov
2018-12-18 14:07:05 +03:00
b86057cc7f[#114] Refactored User.register_changeset to init confirmation data. Introduced User.register/1 to encapsulate User record creation and post-registration actions.
Ivan Tashkinov
2018-12-18 13:13:57 +03:00
1de0aa2f10[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
Ivan Tashkinov
2018-12-17 17:28:58 +03:00
Upgrade to Phoenix 1.4
href
2018-12-16 17:15:07 +01:00
7c235b8874Add more Mix task tests in relay_test.exs and uploads_test.exs. Rename test/tasks/user.exs to test/tasks/user_test.exs.
link0ff
2018-12-16 18:04:31 +02:00
8fadc1b6a2Merge branch 'netbsd-script' into 'develop'
scarlett
2018-12-16 13:19:27 +00:00
4b40e4188cSimplify the NetBSD rc script.
scarlett
2018-12-16 13:11:17 +00:00
9d3eda1959Add an rc.d script for NetBSD.
scarlett
2018-12-16 12:33:50 +00:00
41e3401c5cMerge branch 'develop' into 'develop'
Haelwenn
2018-12-16 12:13:32 +00:00
28478a9c4fMerge branch 'fix/masto-put-settings' into 'develop'
eal
2018-12-16 11:21:26 +00:00
4c783e35c0Mastodon API: Fix PUT /api/web/settings
eal
2018-12-16 13:15:34 +02:00
8b279aca5fMerge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'
eal
2018-12-16 11:08:34 +00:00
7c522f38f0Enable unsecure cookies by default in dev.exs
Rin Toshaka
2018-12-16 08:49:23 +01:00
2e72d49e37Rename captcha_test.ex to exs
vaartis
2018-12-16 07:35:45 +00:00
36f1af232aAdd tests for Mix tasks
link0ff
2018-12-16 02:14:23 +02:00