Commit Graph

17 Commits (5453038ce92597fe2d26cb843d48e9aa660d1ee9)

Author SHA1 Message Date
lain e1e7e4d379 Object: Rework how Object.normalize works
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 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 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
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 dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
4 years ago
Alex Gleason c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field
4 years ago
Mark Felder 4ead0d564f Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Alexander Strizhakov 7dffaef479
tests consistency
4 years ago