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

2114 commits

Author SHA1 Message Date
Ivan Tashkinov 501ce34d7f [#114] Stylistic adjustments. 2018-12-20 12:55:12 +03:00
Maksim f1b93b5be7 [#413] fix parse mentions 2018-12-20 09:35:01 +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
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
lain f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01: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
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
href f58f20abbb
Twitter ActivityView: fix crash when activity content is nil 2018-12-18 15:34:27 +01: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
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 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
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 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 e4763cd459 Fix tagging problems for existing instances. 2018-12-17 20:12:01 +01:00
vaartis 35522fef09 Use :ets.match_delete to delete old captchas 2018-12-17 20:35:21 +03: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
Ekaterina Vaartis ef6829382a Clean captchas up periodically, not schedule it after theyre created 2018-12-16 23:53:44 +03:00
Ekaterina Vaartis 3a31fdaf06 Change minutes_retained config to seconds_retained 2018-12-16 22:40:44 +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
href f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01: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
Ekaterina Vaartis 8d55a549e6 Replace HTTPoison with Tesla for kocaptha 2018-12-15 22:43:28 +03:00
Ekaterina Vaartis 23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
Ekaterina Vaartis b5518da904 Separate captcha implementation into a behaviour and use it 2018-12-15 22:07:26 +03:00
Haelwenn (lanodan) Monnier cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test 2018-12-15 17:56:12 +01:00
lambda cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' 
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
 2018-12-15 15:23:51 +00:00
Ekaterina Vaartis 28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
href e74f384b68 Merge branch 'fix/issue_433' into 'develop' 
[#433] fix markdown formatting

See merge request pleroma/pleroma!545
 2018-12-14 20:30:35 +00:00
href bfe27c1b55 Merge branch '114_email_invites' into 'develop' 
[#114] Email invites

See merge request pleroma/pleroma!541
 2018-12-14 20:22:24 +00:00
href acec11626d Merge branch 'fix/issue_272' into 'develop' 
[#272] fix tags

See merge request pleroma/pleroma!540
 2018-12-14 20:20:30 +00:00
Maksim Pechnikov ea72ac549b fix case when tags is invalid 2018-12-14 23:16:12 +03:00
Maksim Pechnikov d3ec09bb38 fix tags 2018-12-14 22:09:04 +03:00
href 980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' 
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
 2018-12-14 18:50:44 +00:00
Maksim Pechnikov bc6262d250 fixed typo 2018-12-14 21:21:37 +03:00
href 84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities 2018-12-14 18:09:59 +01:00
href 412df2cd38
Warn if push is disabled.. 2018-12-14 16:19:28 +01:00
Maksim Pechnikov baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
href 91236c60c7 Merge branch 'feature/file-size-checking' into 'develop' 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
 2018-12-14 13:00:24 +00:00
href 0b4c61e8d5
Fix warning 2018-12-14 13:56:42 +01:00
href ec0e613eca
Pleroma.Activity.mastodon_notification_type/1 2018-12-14 13:22:10 +01:00
href 331396cbcd
Properly disable Web Push if no VAPID key is set 2018-12-14 13:05:51 +01:00
href 6822916183
Typos 2018-12-14 13:05:51 +01:00
href b1bcd97a0f
Push: respect alerts settings 2018-12-14 13:05:49 +01:00
href d8984b7bf8
Push: add missing notification_type field 2018-12-14 13:05:48 +01:00
href 7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe 2018-12-14 13:05:47 +01:00
Egor Kislitsyn 324933a0ac
improve push message format (compatibility with mastodon) 2018-12-14 13:05:46 +01:00
Egor Kislitsyn 658edb166f
fix and improve web push; add configuration docs 2018-12-14 13:05:29 +01:00
Ivan Tashkinov 69fd63e248 [#114] Added invitesEnabled to metadata of nodeinfo. 2018-12-14 14:13:13 +03:00
Ivan Tashkinov 66380b0641 [#114] Removed confirm_email action stub (to be addressed in a separate MR). 2018-12-14 14:01:00 +03:00
Ivan Tashkinov 07e93f9940 [#114] Improved tests. 2018-12-14 13:52:04 +03:00
Ivan Tashkinov 9666376f5f [#114] Readded invites_enabled config setting, updated readme. 2018-12-14 12:37:06 +03:00
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Ivan Tashkinov 3cbf16a5fe [#114] Added UserInviteToken creation, adjusted invitation email link to include it. 2018-12-14 12:28:22 +03:00
Ivan Tashkinov cc83d7ffe7 [#114] Naive implementation of email invitations. 2018-12-14 12:28:14 +03:00
href 30dc81667c Merge branch '114_user_registration_emails' into 'develop' 
[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531
 2018-12-14 09:16:03 +00:00
Ivan Tashkinov f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. 2018-12-14 12:09:55 +03:00
lambda 262cc6d44b Merge branch 'fix/double-rt-or-fav' into 'develop' 
Prevent accidental double RTs or favorites

See merge request pleroma/pleroma!542
 2018-12-14 08:26:08 +00:00
eal 61ad2ce422 TwitterAPI: Include favorited post in json 2018-12-14 08:24:18 +02:00
eal 1ca080c862 Prevent accidental double RTs or favorites 2018-12-14 07:56:49 +02:00
Ivan Tashkinov 9e689de063 [#114] Removed email_invite implementation (to be addressed separately). 2018-12-13 16:24:30 +03:00
Ivan Tashkinov 18b9467d1a [#114] Removed email_invite implementation (to be addressed separately). 2018-12-13 16:22:42 +03:00
Ivan Tashkinov 00744c6b03 [#114] Initial implementation of user email invitations. 2018-12-13 14:30:48 +03:00
Ivan Tashkinov 908943352f [#114] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages. 2018-12-13 13:17:49 +03:00
href 7214d57463
Extended nicknames: allow dashes. 2018-12-12 21:48:54 +01:00
href 7d9ddbe689
Allow underscores in usernames. 
Fixes #429.
 2018-12-12 18:57:33 +01:00
Ivan Tashkinov bfff2399ff [#114] Routes and config for confirm_email and email_invite (Twitter API). 2018-12-12 20:15:43 +03:00
Ivan Tashkinov e3a21bcd45 [#114] Addressed warnings. Fix of with statement clause in password_reset. 2018-12-12 17:14:31 +03:00
Ivan Tashkinov f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated). 2018-12-12 17:04:39 +03:00
Ivan Tashkinov 12905ce1ad [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
Ivan Tashkinov 10c156d98f [#114] SMTP deps and config. 2018-12-12 17:01:34 +03:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
scarlett 213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
lain d6bf06ab4f Fix warnings. 2018-12-10 20:49:06 +01:00
lambda 0863ec2737 Merge branch 'fix_empty_bio_crash' into 'develop' 
Fixes #415. Do not crash during registration when hasn't filled bio field

Closes #415

See merge request pleroma/pleroma!529
 2018-12-10 19:08:35 +00:00
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop' 
[#272] fix hashtags in api

See merge request pleroma/pleroma!510
 2018-12-10 19:05:16 +00:00
lambda 6786ad3d98 Merge branch 'fix/theora-detection-read-bytes' into 'develop' 
Fix Theora detection in mime.ex

See merge request pleroma/pleroma!493
 2018-12-10 19:04:06 +00:00
lambda 0554d91dcd Merge branch 'anonymize-filter-text' into 'develop' 
AnonymizeFilename: allow for a pre-defined text instead of random string

See merge request pleroma/pleroma!516
 2018-12-10 19:03:06 +00:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
Maksim Pechnikov e94c3442f4 updates 2018-12-10 13:27:37 +03:00
raeno 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio 2018-12-10 01:01:43 +04:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Maksim Pechnikov 068353ac0b formatting 2018-12-09 11:24:46 +03:00