nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3205 commits 2 branches 0 tags 272 MiB
Commit graph

3205 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Tashkinov 3371a45884 [#114] Formatting fix. 2018-12-18 17:30:30 +03:00
Ivan Tashkinov b096e30cff [#114] Added email confirmation resend action. Added tests 
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
 2018-12-18 17:22:46 +03:00
Ivan Tashkinov aed0f90287 [#114] Added pleroma.confirmation_pending to user views, adjusted view tests. 2018-12-18 17:22:45 +03:00
Ivan Tashkinov b86057cc7f [#114] Refactored User.register_changeset to init confirmation data. 
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
 2018-12-18 17:22:42 +03:00
Ivan Tashkinov 1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. 2018-12-18 17:21:05 +03:00
Ivan Tashkinov a05cb10a95 [#114] Email confirmation route, action, node setting, User.Info fields. 2018-12-18 17:18:53 +03:00
Haelwenn (lanodan) Monnier 08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints 2018-12-18 13:58:34 +01:00
href daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures 2018-12-18 13:40:25 +01:00
lambda b6ae412fcd Merge branch 'runtime-static-plug' into 'develop' 
Instance/Runtime static plug

See merge request pleroma/pleroma!567
 2018-12-18 10:42:56 +00:00
href b1860fe85a
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.
 2018-12-17 22:50:59 +01:00
lambda 3879500c87 Merge branch '2018-12-17-update-frontend' into 'develop' 
2018 12 17 update frontend

See merge request pleroma/pleroma!565
 2018-12-17 20:36:21 +00:00
lambda 7d9254fb4a Merge branch 'fix-test' into 'develop' 
Fix uploads test.

See merge request pleroma/pleroma!564
 2018-12-17 20:24:58 +00:00
lain eb2d34eb6c Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend 2018-12-17 21:19:00 +01:00
lambda 3d980daa49 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
 2018-12-17 20:16:15 +00:00
lain 3e1816fcd5 update frontend 2018-12-17 21:13:04 +01:00
lambda ebbe11f33b Merge branch 'support/issue_449' into 'develop' 
[#449] fix text field

See merge request pleroma/pleroma!563
 2018-12-17 20:11:46 +00:00
lain 52bda3b456 Fix uploads test. 2018-12-17 20:55:24 +01:00
Maksim Pechnikov 92a5133c42 fix text field 2018-12-17 22:53:16 +03:00
lambda 52ac7dce5c Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma!550
 2018-12-17 19:45:14 +00:00
lambda c6d5f189d9 Merge branch 'fix-tags' into 'develop' 
Fix tagging problems for existing instances.

See merge request pleroma/pleroma!562
 2018-12-17 19:38:24 +00:00
lambda 98c31deaa9 Merge branch 'test-mix-tasks' into 'develop' 
Add tests for Mix tasks

See merge request pleroma/pleroma!555
 2018-12-17 19:37:05 +00:00
lambda 078b8b6d22 Merge branch 'phoenix14' into 'develop' 
Upgrade to Phoenix 1.4

Closes #451

See merge request pleroma/pleroma!560
 2018-12-17 19:30:05 +00:00
lain 0f67c1d487 don't re-use build 2018-12-17 20:26:48 +01:00
lain e4763cd459 Fix tagging problems for existing instances. 2018-12-17 20:12:01 +01:00
Ekaterina Vaartis de981ac5a2 Alias Kocaptcha in the test 2018-12-17 20:53:42 +03:00
vaartis 35522fef09 Use :ets.match_delete to delete old captchas 2018-12-17 20:35:21 +03:00
href ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged. 2018-12-17 17:28:03 +01:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
href 77b5154c82
Cowboy handler for Mastodon WebSocket 2018-12-17 17:06:18 +01:00
raeno cc87880488 Support both OAuth token record and token string in UserView 2018-12-17 16:02:26 +01:00
lambda 567359790e 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
 2018-12-17 09:19:27 +00:00
vaartis 6e2f64a0a6 minutes->seconds_retained in config.md 2018-12-17 06:41:41 +00:00
Ekaterina Vaartis ef6829382a Clean captchas up periodically, not schedule it after theyre created 2018-12-16 23:53:44 +03:00
Ekaterina Vaartis 73576ab64e Fix captcha tests 2018-12-16 23:01:44 +03:00
Ekaterina Vaartis 3a31fdaf06 Change minutes_retained config to seconds_retained 2018-12-16 22:40:44 +03:00
Ekaterina Vaartis 1d31fd0722 Make the hosted kocaptcha the default value 2018-12-16 22:37:16 +03:00
Ekaterina Vaartis 6062885df6 Add a configurable auto-cleanup for captchas 2018-12-16 22:08:17 +03:00
href 5dcb7aecea
More put_view. 2018-12-16 17:51:22 +01:00
link0ff 22d483d4f7 Use bindings dbuser and dbname in sample_psql.eex 2018-12-16 18:25:31 +02:00
href f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
link0ff 7c235b8874 Add more Mix task tests in relay_test.exs and uploads_test.exs. 
Rename test/tasks/user.exs to test/tasks/user_test.exs.
 2018-12-16 18:08:31 +02:00
scarlett 8fadc1b6a2 Merge branch 'netbsd-script' into 'develop' 
Add an rc.d script for NetBSD.

See merge request pleroma/pleroma!558
 2018-12-16 13:19:27 +00:00
scarlett 4b40e4188c Simplify the NetBSD rc script. 2018-12-16 13:15:37 +00:00
scarlett 9d3eda1959 Add an rc.d script for NetBSD. 2018-12-16 12:33:50 +00:00
Haelwenn 41e3401c5c Merge branch 'develop' into 'develop' 
Added init file for OpenBSD

See merge request pleroma/pleroma!549
 2018-12-16 12:13:32 +00:00
eal 28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop' 
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
 2018-12-16 11:21:26 +00:00
eal 4c783e35c0 Mastodon API: Fix PUT /api/web/settings 2018-12-16 13:15:34 +02:00
eal 8b279aca5f 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
 2018-12-16 11:08:34 +00:00
Rin Toshaka 7c522f38f0 Enable unsecure cookies by default in dev.exs 2018-12-16 08:49:23 +01:00
vaartis 2e72d49e37 Rename captcha_test.ex to exs 2018-12-16 07:35:45 +00:00