Commit Graph

788 Commits (7f0787163999fc0ac0c6fcfd0c13f80c5a55266d)

Author SHA1 Message Date
Mark Felder 537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 704eef3c2d Special handling for unconfirmed users based on instance config no longer needed.
4 years ago
Mark Felder 28581e03ad Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder 44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
Mark Felder 2c0fe2ea9e Remove toggle_confirmation; require explicit state change
4 years ago
Mark Felder d36182c088 Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder 6c50ac1d3f Readability
4 years ago
Mark Felder ebd7d1365b Make setting user activation status explicit
4 years ago
Mark Felder cd1e5d76ab Remove User.restrict_deactivated/1
4 years ago
Mark Felder 860b5c7804 Change user.deactivated field to user.is_active
4 years ago
Mark Felder 63923df0a5 Further simplify changeset logic
4 years ago
Mark Felder f7e59c28ed Change user.approval_pending field to user.is_approved
4 years ago
Lain Soykaf 39f3683a06 Pbkdf2: Use it everywhere.
4 years ago
lain 9106048c61 Password: Replace Pbkdf2 with Password.
4 years ago
Haelwenn (lanodan) Monnier c4439c630f
Bump Copyright to 2021
4 years ago
lain e802b48d55 User: Use ObjectID type to validate also-known-as field
4 years ago
Alex Gleason 4200a06340
Aliases: refactor validate_also_known_as/1
4 years ago
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
4 years ago
lain c9d73af74d Cachex: Unify arity of callback function
4 years ago
lain 713612c377 Cachex: Make caching provider switchable at runtime.
4 years ago
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain 477c6c8e55 Merge branch 'auth-improvements' into 'develop'
4 years ago
lain 1436a2fa2d Merge branch 'stream-follow-updates' into 'develop'
4 years ago
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
lain 04af0bbe44 User: Remove left-over (wrong) fix.
4 years ago
lain 222312900e User: Don't allow local users in remote changesets
4 years ago
Egor Kislitsyn 35ba48494f
Stream follow updates
4 years ago
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
Alex Gleason 30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions'
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
Alex Gleason 9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
feld 1204aaa2e3 Merge branch 'feature/autofollowing' into 'develop'
4 years ago
lain 60e379ce0b User: Correctly handle whitespace names.
4 years ago
Mark Felder 1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
4 years ago
Mark Felder fb056ce05b Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Alex Gleason dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
4 years ago
Mark Felder 8bacdc3680 Change user.discoverable field to user.is_discoverable
4 years ago
Mark Felder 9968b7efed Change user.locked field to user.is_locked
4 years ago
Alex Gleason 66e00ace7c
Refactor User.post_register_action/1 emails
4 years ago
Alex Gleason cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
4 years ago
Alex Gleason 6ebec50df6
Refactor User.confirm/1, add more tests
4 years ago
Alex Gleason bb8c0614ef
Move admin approval email logic into User.post_register_action/1
4 years ago
Alex Gleason 521e965884
Registration tests
4 years ago
Alex Gleason 28005563f0
Send approval pending email during registration
4 years ago