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

3045 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ekaterina Vaartis 336e37d98f 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
 2018-12-21 09:55:47 +03:00
lambda 61a88a6757 Merge branch 'ci-test-fix' into 'develop' 
SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579
 2018-12-20 16:31:08 +00:00
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop' 
[#114] Email confirmation

See merge request pleroma/pleroma!546
 2018-12-20 13:28:36 +00:00
Ivan Tashkinov 851db74f1c [#114] Fixed test. 2018-12-20 15:23:16 +03:00
Ivan Tashkinov 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.
 2018-12-20 14:48:48 +03:00
Ivan Tashkinov f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security. 
Added tests for `confirm_email` action.
 2018-12-20 13:41:30 +03:00
Ivan Tashkinov 8adcd1e80f [#114] Removed flash messages rendering on redirects. 2018-12-20 13:05:42 +03:00
Ivan Tashkinov 501ce34d7f [#114] Stylistic adjustments. 2018-12-20 12:55:12 +03:00
kaniini 8de3138de0 Merge branch 'support/issue_413' into 'develop' 
[#413] fix parse mentions

See merge request pleroma/pleroma!577
 2018-12-20 09:35:01 +00:00
Maksim f1b93b5be7 [#413] fix parse mentions 2018-12-20 09:35:01 +00:00
kaniini c52453fbd6 Merge branch 'fix/readme-md-config-typo' into 'develop' 
Fix config.md path in README

See merge request pleroma/pleroma!581
 2018-12-20 09:06:48 +00:00
rinpatch acfd98689b Fix config.md path in README 2018-12-20 11:29:08 +03:00
rinpatch 6081c44961 Fix config.md path in README 2018-12-20 07:20:13 +03:00
kaniini 2e4f73a9c4 Merge branch 'readme' into 'develop' 
Improve systemd service documentation

See merge request pleroma/pleroma!580
 2018-12-20 04:12:50 +00:00
kaniini fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop' 
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request pleroma/pleroma!571
 2018-12-20 04:01:54 +00:00
Francis Dinh 8c4fa68428 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).
 2018-12-19 16:06:05 -05:00
href adbb265fc6
daaa8cd6 take two 2018-12-19 20:14:33 +01:00
Ivan Tashkinov b520d44b58 [#114] mix format 2018-12-19 19:03:39 +03:00
Ivan Tashkinov 279096228c [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users 
unless requested by admin or moderator.
 2018-12-19 18:56:52 +03:00
Ivan Tashkinov a532ad5d72 [#114] User.register/1 tweak. 2018-12-19 17:24:55 +03:00
Ivan Tashkinov 968d7490b6 [#114] User.Info: renamed confirmation_update to confirmation_changeset. 2018-12-19 16:31:03 +03:00
Ivan Tashkinov 59fc5d15df [#114] User.Info: renamed confirmation_update to confirmation_change. 2018-12-19 16:27:16 +03:00
kaniini f98ee9402f Merge branch 'userless-admin' into 'develop' 
Add a way to use the admin api without a user.

See merge request pleroma/pleroma!576
 2018-12-19 00:12:39 +00:00
lambda a3da8a56b6 Merge branch 'fix/ci-cache-improved' into 'develop' 
Per-branch CI cache with force-recompilation of Pleroma

See merge request pleroma/pleroma!574
 2018-12-18 21:11:40 +00:00
lambda b7f6350107 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
 2018-12-18 20:23:21 +00:00
Rin Toshaka facd30c9e8 Compile pleroma before ecto migrate 2018-12-18 21:20:49 +01:00
lain f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01:00
Rin Toshaka f685351c1e Improve CI cache 2018-12-18 21:06:53 +01:00
Rin Toshaka 196d9c0fd0 Fix tests 2018-12-18 20:30:04 +01:00
rinpatch 8a67677d77 Add test 2018-12-18 22:10:56 +03:00
rinpatch ef318fb8a9 Merge branch 'develop' into fix/formatter-ignore-html-chars 2018-12-18 21:39:36 +03:00
rinpatch 059dd6f681 Ignore HTML characters in formatter.ex 2018-12-18 21:38:15 +03:00
rinpatch d6b133ec51
Pleroma-API.md: Additionnal endpoints 2018-12-18 18:33:39 +01:00
Haelwenn (lanodan) Monnier 6adea5a7b2
Move to docs 2018-12-18 17:16:26 +01:00
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex 2018-12-18 17:05:36 +01:00
lambda 443d59baa0 Merge branch 'feature/new-user-routes' into 'develop' 
Use "~" as a route namespace symbol on FE

See merge request pleroma/pleroma!530
 2018-12-18 15:42:07 +00:00
lambda c9ddcd803b Merge branch 'new-routes-integration' into 'develop' 
update frontend

See merge request pleroma/pleroma!573
 2018-12-18 15:41:38 +00:00
lain 9c4344e16c update frontend 2018-12-18 16:28:13 +01:00
lambda 5177426ec5 Merge branch 'ci-test-fix' into 'develop' 
SetUserSessionIdPlugTest: try to fix random ci failures

See merge request pleroma/pleroma!570
 2018-12-18 15:18:10 +00:00
Ivan Tashkinov 468d472d2b [#114] Added info on account_activation_required setting to config readme. 2018-12-18 17:52:38 +03:00
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