Rin Toshaka
|
535fddd286
|
Friendship ended with Postgresql now Cachex is my best friend
|
2018-12-30 19:33:36 +01:00 |
|
Rin Toshaka
|
d9f40b05b3
|
Added get_stripped_html_for_object. Renamed a few things
|
2018-12-30 16:51:16 +01:00 |
|
Rin Toshaka
|
19f9889fbe
|
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
|
2018-12-29 17:45:50 +01:00 |
|
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
2018-12-23 20:56:42 +00:00 |
|
lambda
|
005b4194ff
|
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
|
2018-12-23 14:46:58 +00:00 |
|
William Pitcock
|
34a4ed22c4
|
twitter api: add "Video" to supported activity types list
|
2018-12-23 14:00:54 +00:00 |
|
William Pitcock
|
79b51a97fe
|
twitter api: activity representer: remove peertube hack
|
2018-12-23 14:00:50 +00:00 |
|
lambda
|
a3e33fa177
|
Merge branch 'hotfix/activity-without-content' into 'develop'
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
|
2018-12-23 13:17:25 +00: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
|
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
|
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 |
|
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 |
|
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 |
|
raeno
|
cc87880488
|
Support both OAuth token record and token string in UserView
|
2018-12-17 16:02:26 +01:00 |
|
href
|
f672555ad3
|
Upgrade to Phoenix 1.4
|
2018-12-16 17:15:07 +01:00 |
|
Ekaterina Vaartis
|
23549d3952
|
Formatting fixes
|
2018-12-15 22:08:26 +03: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
|
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 |
|
href
|
84b9a9d497
|
TwitterAPI.ActivityView: Ignore unhandled activities
|
2018-12-14 18:09:59 +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
|
331396cbcd
|
Properly disable Web Push if no VAPID key is set
|
2018-12-14 13:05:51 +01: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
|
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 |
|
eal
|
61ad2ce422
|
TwitterAPI: Include favorited post in json
|
2018-12-14 08:24:18 +02: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 |
|
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 |
|