akkoma
5 years agoMake captcha (kocaptcha) stateless
Ekaterina Vaartis [Thu, 20 Dec 2018 21:32:37 +0000 (00:32 +0300)]
Make captcha (kocaptcha) stateless

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

5 years agoMerge branch 'ci-test-fix' into 'develop'
lambda [Thu, 20 Dec 2018 16:31:08 +0000 (16:31 +0000)]
Merge branch 'ci-test-fix' into 'develop'

SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579

5 years agoMerge branch '114_email_confirmation' into 'develop'
kaniini [Thu, 20 Dec 2018 13:28:36 +0000 (13:28 +0000)]
Merge branch '114_email_confirmation' into 'develop'

[#114] Email confirmation

See merge request pleroma/pleroma!546

5 years ago[#114] Fixed test.
Ivan Tashkinov [Thu, 20 Dec 2018 12:23:16 +0000 (15:23 +0300)]
[#114] Fixed test.

5 years ago[#114] Allowed unconfirmed users to authenticate if :account_activation_required...
Ivan Tashkinov [Thu, 20 Dec 2018 11:48:48 +0000 (14:48 +0300)]
[#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.

5 years ago[#114] Added :user_id component to email confirmation path to improve the security.
Ivan Tashkinov [Thu, 20 Dec 2018 10:41:30 +0000 (13:41 +0300)]
[#114] Added :user_id component to email confirmation path to improve the security.
Added tests for `confirm_email` action.

5 years ago[#114] Removed flash messages rendering on redirects.
Ivan Tashkinov [Thu, 20 Dec 2018 10:05:42 +0000 (13:05 +0300)]
[#114] Removed flash messages rendering on redirects.

5 years ago[#114] Stylistic adjustments.
Ivan Tashkinov [Thu, 20 Dec 2018 09:55:12 +0000 (12:55 +0300)]
[#114] Stylistic adjustments.

5 years agoMerge branch 'support/issue_413' into 'develop'
kaniini [Thu, 20 Dec 2018 09:35:01 +0000 (09:35 +0000)]
Merge branch 'support/issue_413' into 'develop'

[#413] fix parse mentions

See merge request pleroma/pleroma!577

5 years ago[#413] fix parse mentions
Maksim [Thu, 20 Dec 2018 09:35:01 +0000 (09:35 +0000)]
[#413] fix parse mentions

5 years agoMerge branch 'fix/readme-md-config-typo' into 'develop'
kaniini [Thu, 20 Dec 2018 09:06:48 +0000 (09:06 +0000)]
Merge branch 'fix/readme-md-config-typo' into 'develop'

Fix config.md path in README

See merge request pleroma/pleroma!581

5 years agoFix config.md path in README
rinpatch [Thu, 20 Dec 2018 08:29:08 +0000 (11:29 +0300)]
Fix config.md path in README

5 years agoFix config.md path in README
rinpatch [Thu, 20 Dec 2018 04:20:13 +0000 (07:20 +0300)]
Fix config.md path in README

5 years agoMerge branch 'readme' into 'develop'
kaniini [Thu, 20 Dec 2018 04:12:50 +0000 (04:12 +0000)]
Merge branch 'readme' into 'develop'

Improve systemd service documentation

See merge request pleroma/pleroma!580

5 years agoMerge branch 'documentation/copy-pleroma-api' into 'develop'
kaniini [Thu, 20 Dec 2018 04:01:54 +0000 (04:01 +0000)]
Merge branch 'documentation/copy-pleroma-api' into 'develop'

Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request pleroma/pleroma!571

5 years agoImprove systemd service documentation
Francis Dinh [Wed, 19 Dec 2018 21:06:05 +0000 (16:06 -0500)]
Improve systemd service documentation

Use `systemctl` instead of `service` since it's not guaranteed the
latter will be on the system (e.g. Arch does not have it).

5 years agodaaa8cd6 take two
href [Wed, 19 Dec 2018 19:14:33 +0000 (20:14 +0100)]
daaa8cd6 take two

5 years ago[#114] `mix format`
Ivan Tashkinov [Wed, 19 Dec 2018 16:03:39 +0000 (19:03 +0300)]
[#114] `mix format`

5 years ago[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive...
Ivan Tashkinov [Wed, 19 Dec 2018 15:56:52 +0000 (18:56 +0300)]
[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
unless requested by admin or moderator.

5 years ago[#114] User.register/1 tweak.
Ivan Tashkinov [Wed, 19 Dec 2018 14:24:55 +0000 (17:24 +0300)]
[#114] User.register/1 tweak.

5 years ago[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
Ivan Tashkinov [Wed, 19 Dec 2018 13:27:16 +0000 (16:27 +0300)]
[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.

5 years ago[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.
Ivan Tashkinov [Wed, 19 Dec 2018 13:27:16 +0000 (16:27 +0300)]
[#114] User.Info: renamed `confirmation_update` to `confirmation_change`.

5 years agoMerge branch 'userless-admin' into 'develop'
kaniini [Wed, 19 Dec 2018 00:12:39 +0000 (00:12 +0000)]
Merge branch 'userless-admin' into 'develop'

Add a way to use the admin api without a user.

See merge request pleroma/pleroma!576

5 years agoMerge branch 'fix/ci-cache-improved' into 'develop'
lambda [Tue, 18 Dec 2018 21:11:40 +0000 (21:11 +0000)]
Merge branch 'fix/ci-cache-improved' into 'develop'

Per-branch CI cache with force-recompilation of Pleroma

See merge request pleroma/pleroma!574

5 years agoMerge branch 'fix/formatter-ignore-html-chars' into 'develop'
lambda [Tue, 18 Dec 2018 20:23:21 +0000 (20:23 +0000)]
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'

[#441] Fix characters converted to HTML being picked up by hashtag parser

See merge request pleroma/pleroma!575

5 years agoCompile pleroma before ecto migrate
Rin Toshaka [Tue, 18 Dec 2018 20:20:49 +0000 (21:20 +0100)]
Compile pleroma before ecto migrate

5 years agoAdd a way to use the admin api without a user.
lain [Tue, 18 Dec 2018 20:08:52 +0000 (21:08 +0100)]
Add a way to use the admin api without a user.

5 years agoImprove CI cache
Rin Toshaka [Tue, 18 Dec 2018 20:06:53 +0000 (21:06 +0100)]
Improve CI cache

5 years agoFix tests
Rin Toshaka [Tue, 18 Dec 2018 19:30:04 +0000 (20:30 +0100)]
Fix tests

5 years agoAdd test
rinpatch [Tue, 18 Dec 2018 19:10:56 +0000 (22:10 +0300)]
Add test

5 years agoMerge branch 'develop' into fix/formatter-ignore-html-chars
rinpatch [Tue, 18 Dec 2018 18:39:36 +0000 (21:39 +0300)]
Merge branch 'develop' into fix/formatter-ignore-html-chars

5 years agoIgnore HTML characters in formatter.ex
rinpatch [Tue, 18 Dec 2018 18:38:15 +0000 (21:38 +0300)]
Ignore HTML characters in formatter.ex

5 years agoPleroma-API.md: Additionnal endpoints
rinpatch [Tue, 18 Dec 2018 17:33:39 +0000 (18:33 +0100)]
Pleroma-API.md: Additionnal endpoints

5 years agoMove to docs
Haelwenn (lanodan) Monnier [Tue, 18 Dec 2018 16:09:01 +0000 (17:09 +0100)]
Move to docs

5 years agoDocumentation: Move generated files to priv/static/doc, add it to endpoint.ex
Haelwenn (lanodan) Monnier [Tue, 18 Dec 2018 16:05:36 +0000 (17:05 +0100)]
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex

5 years agoMerge branch 'feature/new-user-routes' into 'develop'
lambda [Tue, 18 Dec 2018 15:42:07 +0000 (15:42 +0000)]
Merge branch 'feature/new-user-routes' into 'develop'

Use "~" as a route namespace symbol on FE

See merge request pleroma/pleroma!530

5 years agoMerge branch 'new-routes-integration' into 'develop'
lambda [Tue, 18 Dec 2018 15:41:38 +0000 (15:41 +0000)]
Merge branch 'new-routes-integration' into 'develop'

update frontend

See merge request pleroma/pleroma!573

5 years agoupdate frontend
lain [Tue, 18 Dec 2018 15:28:13 +0000 (16:28 +0100)]
update frontend

5 years agoMerge branch 'ci-test-fix' into 'develop'
lambda [Tue, 18 Dec 2018 15:18:10 +0000 (15:18 +0000)]
Merge branch 'ci-test-fix' into 'develop'

SetUserSessionIdPlugTest: try to fix random ci failures

See merge request pleroma/pleroma!570

5 years ago[#114] Added info on `account_activation_required` setting to config readme.
Ivan Tashkinov [Tue, 18 Dec 2018 14:52:38 +0000 (17:52 +0300)]
[#114] Added info on `account_activation_required` setting to config readme.

5 years ago[#114] Formatting fix.
Ivan Tashkinov [Tue, 18 Dec 2018 14:30:30 +0000 (17:30 +0300)]
[#114] Formatting fix.

5 years ago[#114] Added email confirmation resend action. Added tests
Ivan Tashkinov [Tue, 18 Dec 2018 14:13:52 +0000 (17:13 +0300)]
[#114] Added email confirmation resend action. Added tests
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.

5 years ago[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
Ivan Tashkinov [Tue, 18 Dec 2018 11:07:05 +0000 (14:07 +0300)]
[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.

5 years ago[#114] Refactored User.register_changeset to init confirmation data.
Ivan Tashkinov [Tue, 18 Dec 2018 10:13:57 +0000 (13:13 +0300)]
[#114] Refactored User.register_changeset to init confirmation data.
Introduced User.register/1 to encapsulate User record creation and post-registration actions.

5 years ago[#114] Account confirmation email, registration as unconfirmed (config-based), auth...
Ivan Tashkinov [Mon, 17 Dec 2018 14:28:58 +0000 (17:28 +0300)]
[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.

5 years ago[#114] Email confirmation route, action, node setting, User.Info fields.
Ivan Tashkinov [Fri, 14 Dec 2018 13:38:56 +0000 (16:38 +0300)]
[#114] Email confirmation route, action, node setting, User.Info fields.

5 years agoPleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
Haelwenn (lanodan) Monnier [Tue, 18 Dec 2018 12:58:07 +0000 (13:58 +0100)]
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

5 years agoSetUserSessionIdPlugTest: try to fix random ci failures
href [Tue, 18 Dec 2018 12:40:25 +0000 (13:40 +0100)]
SetUserSessionIdPlugTest: try to fix random ci failures

5 years agoMerge branch 'runtime-static-plug' into 'develop'
lambda [Tue, 18 Dec 2018 10:42:56 +0000 (10:42 +0000)]
Merge branch 'runtime-static-plug' into 'develop'

Instance/Runtime static plug

See merge request pleroma/pleroma!567

5 years agoInstance/Static runtime plug
href [Mon, 17 Dec 2018 21:50:59 +0000 (22:50 +0100)]
Instance/Static runtime plug

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.

5 years agoMerge branch '2018-12-17-update-frontend' into 'develop'
lambda [Mon, 17 Dec 2018 20:36:21 +0000 (20:36 +0000)]
Merge branch '2018-12-17-update-frontend' into 'develop'

2018 12 17 update frontend

See merge request pleroma/pleroma!565

5 years agoMerge branch 'fix-test' into 'develop'
lambda [Mon, 17 Dec 2018 20:24:58 +0000 (20:24 +0000)]
Merge branch 'fix-test' into 'develop'

Fix uploads test.

See merge request pleroma/pleroma!564

5 years agoMerge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
lain [Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)]
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend

5 years agoMerge branch '459_fix_user_profile_crash' into 'develop'
lambda [Mon, 17 Dec 2018 20:16:15 +0000 (20:16 +0000)]
Merge branch '459_fix_user_profile_crash' into 'develop'

Fix update_profile failing due to OAuth token record in assigns instead of string

Closes #459

See merge request pleroma/pleroma!561

5 years agoupdate frontend
lain [Mon, 17 Dec 2018 20:13:04 +0000 (21:13 +0100)]
update frontend

5 years agoMerge branch 'support/issue_449' into 'develop'
lambda [Mon, 17 Dec 2018 20:11:46 +0000 (20:11 +0000)]
Merge branch 'support/issue_449' into 'develop'

[#449] fix text field

See merge request pleroma/pleroma!563

5 years agoFix uploads test.
lain [Mon, 17 Dec 2018 19:55:24 +0000 (20:55 +0100)]
Fix uploads test.

5 years agofix text field
Maksim Pechnikov [Mon, 17 Dec 2018 19:41:36 +0000 (22:41 +0300)]
fix text field

5 years agoMerge branch 'captcha' into 'develop'
lambda [Mon, 17 Dec 2018 19:45:14 +0000 (19:45 +0000)]
Merge branch 'captcha' into 'develop'

Captcha

See merge request pleroma/pleroma!550

5 years agoMerge branch 'fix-tags' into 'develop'
lambda [Mon, 17 Dec 2018 19:38:24 +0000 (19:38 +0000)]
Merge branch 'fix-tags' into 'develop'

Fix tagging problems for existing instances.

See merge request pleroma/pleroma!562

5 years agoMerge branch 'test-mix-tasks' into 'develop'
lambda [Mon, 17 Dec 2018 19:37:05 +0000 (19:37 +0000)]
Merge branch 'test-mix-tasks' into 'develop'

Add tests for Mix tasks

See merge request pleroma/pleroma!555

5 years agoMerge branch 'phoenix14' into 'develop'
lambda [Mon, 17 Dec 2018 19:30:05 +0000 (19:30 +0000)]
Merge branch 'phoenix14' into 'develop'

Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560

5 years agodon't re-use build
lain [Mon, 17 Dec 2018 19:26:48 +0000 (20:26 +0100)]
don't re-use build

5 years agoFix tagging problems for existing instances.
lain [Mon, 17 Dec 2018 19:12:01 +0000 (20:12 +0100)]
Fix tagging problems for existing instances.

5 years agoAlias Kocaptcha in the test
Ekaterina Vaartis [Mon, 17 Dec 2018 17:53:42 +0000 (20:53 +0300)]
Alias Kocaptcha in the test

5 years agoUse :ets.match_delete to delete old captchas
vaartis [Mon, 17 Dec 2018 14:19:28 +0000 (17:19 +0300)]
Use :ets.match_delete to delete old captchas

5 years agoSwitch to phoenixframework/phoenix as the needed change is merged.
href [Mon, 17 Dec 2018 16:28:03 +0000 (17:28 +0100)]
Switch to phoenixframework/phoenix as the needed change is merged.

5 years agoIntegration tests for mastodon websocket
href [Mon, 17 Dec 2018 16:09:06 +0000 (17:09 +0100)]
Integration tests for mastodon websocket

5 years agoCowboy handler for Mastodon WebSocket
href [Mon, 17 Dec 2018 13:39:59 +0000 (14:39 +0100)]
Cowboy handler for Mastodon WebSocket

5 years agoSupport both OAuth token record and token string in UserView
raeno [Mon, 17 Dec 2018 15:02:26 +0000 (16:02 +0100)]
Support both OAuth token record and token string in UserView

5 years agoMerge branch 'testfix/webfinger-jrd' into 'develop'
lambda [Mon, 17 Dec 2018 09:19:27 +0000 (09:19 +0000)]
Merge branch 'testfix/webfinger-jrd' into 'develop'

WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request pleroma/pleroma!554

5 years agominutes->seconds_retained in config.md
vaartis [Mon, 17 Dec 2018 06:41:41 +0000 (06:41 +0000)]
minutes->seconds_retained in config.md

5 years agoClean captchas up periodically, not schedule it after theyre created
Ekaterina Vaartis [Sun, 16 Dec 2018 20:41:11 +0000 (23:41 +0300)]
Clean captchas up periodically, not schedule it after theyre created

5 years agoFix captcha tests
Ekaterina Vaartis [Sun, 16 Dec 2018 20:01:44 +0000 (23:01 +0300)]
Fix captcha tests

5 years agoChange minutes_retained config to seconds_retained
Ekaterina Vaartis [Sun, 16 Dec 2018 19:40:44 +0000 (22:40 +0300)]
Change minutes_retained config to seconds_retained

5 years agoMake the hosted kocaptcha the default value
Ekaterina Vaartis [Sun, 16 Dec 2018 19:37:16 +0000 (22:37 +0300)]
Make the hosted kocaptcha the default value

5 years agoAdd a configurable auto-cleanup for captchas
Ekaterina Vaartis [Sun, 16 Dec 2018 19:04:43 +0000 (22:04 +0300)]
Add a configurable auto-cleanup for captchas

5 years agoMore put_view.
href [Sun, 16 Dec 2018 16:49:42 +0000 (17:49 +0100)]
More put_view.

5 years agoUse bindings dbuser and dbname in sample_psql.eex
link0ff [Sun, 16 Dec 2018 16:25:31 +0000 (18:25 +0200)]
Use bindings dbuser and dbname in sample_psql.eex

5 years agoUpgrade to Phoenix 1.4
href [Sun, 16 Dec 2018 16:15:07 +0000 (17:15 +0100)]
Upgrade to Phoenix 1.4

5 years agoAdd more Mix task tests in relay_test.exs and uploads_test.exs.
link0ff [Sun, 16 Dec 2018 16:04:31 +0000 (18:04 +0200)]
Add more Mix task tests in relay_test.exs and uploads_test.exs.
Rename test/tasks/user.exs to test/tasks/user_test.exs.

5 years agoMerge branch 'netbsd-script' into 'develop'
scarlett [Sun, 16 Dec 2018 13:19:27 +0000 (13:19 +0000)]
Merge branch 'netbsd-script' into 'develop'

Add an rc.d script for NetBSD.

See merge request pleroma/pleroma!558

5 years agoSimplify the NetBSD rc script.
scarlett [Sun, 16 Dec 2018 13:11:17 +0000 (13:11 +0000)]
Simplify the NetBSD rc script.

5 years agoAdd an rc.d script for NetBSD.
scarlett [Sun, 16 Dec 2018 12:33:50 +0000 (12:33 +0000)]
Add an rc.d script for NetBSD.

5 years agoMerge branch 'develop' into 'develop'
Haelwenn [Sun, 16 Dec 2018 12:13:32 +0000 (12:13 +0000)]
Merge branch 'develop' into 'develop'

Added init file for OpenBSD

See merge request pleroma/pleroma!549

5 years agoMerge branch 'fix/masto-put-settings' into 'develop'
eal [Sun, 16 Dec 2018 11:21:26 +0000 (11:21 +0000)]
Merge branch 'fix/masto-put-settings' into 'develop'

Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557

5 years agoMastodon API: Fix PUT /api/web/settings
eal [Sun, 16 Dec 2018 11:15:34 +0000 (13:15 +0200)]
Mastodon API: Fix PUT /api/web/settings

5 years agoMerge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'
eal [Sun, 16 Dec 2018 11:08:34 +0000 (11:08 +0000)]
Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'

Enable unsecure cookies by default in dev.exs

See merge request pleroma/pleroma!556

5 years agoEnable unsecure cookies by default in dev.exs
Rin Toshaka [Sun, 16 Dec 2018 07:49:23 +0000 (08:49 +0100)]
Enable unsecure cookies by default in dev.exs

5 years agoRename captcha_test.ex to exs
vaartis [Sun, 16 Dec 2018 07:35:45 +0000 (07:35 +0000)]
Rename captcha_test.ex to exs

5 years agoAdd tests for Mix tasks
link0ff [Sun, 16 Dec 2018 00:14:23 +0000 (02:14 +0200)]
Add tests for Mix tasks

5 years agoUpdate/add OpenBSD config files
nonlinear [Sat, 15 Dec 2018 22:00:00 +0000 (14:00 -0800)]
Update/add OpenBSD config files

5 years agoFix style
Ekaterina Vaartis [Sat, 15 Dec 2018 20:39:23 +0000 (23:39 +0300)]
Fix style

5 years agoAdd a test for kocaptcha
Ekaterina Vaartis [Sat, 15 Dec 2018 20:38:19 +0000 (23:38 +0300)]
Add a test for kocaptcha

5 years agoReplace HTTPoison with Tesla for kocaptha
Ekaterina Vaartis [Sat, 15 Dec 2018 19:43:28 +0000 (22:43 +0300)]
Replace HTTPoison with Tesla for kocaptha

5 years agoAdd a captcha mock for tests
Ekaterina Vaartis [Sat, 15 Dec 2018 19:38:39 +0000 (22:38 +0300)]
Add a captcha mock for tests

5 years agoAdd captcha documentation to config.md
Ekaterina Vaartis [Sat, 15 Dec 2018 19:12:20 +0000 (22:12 +0300)]
Add captcha documentation to config.md

5 years agoFormatting fixes
Ekaterina Vaartis [Sat, 15 Dec 2018 19:08:26 +0000 (22:08 +0300)]
Formatting fixes

5 years agoSeparate captcha implementation into a behaviour and use it
Ekaterina Vaartis [Sat, 15 Dec 2018 19:06:44 +0000 (22:06 +0300)]
Separate captcha implementation into a behaviour and use it

5 years agoWebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
Haelwenn (lanodan) Monnier [Sat, 15 Dec 2018 16:34:37 +0000 (17:34 +0100)]
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test