Mark Felder
|
2c0fe2ea9e
|
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
|
2021-01-15 13:11:51 -06:00 |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
2021-01-15 12:44:41 -06:00 |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
2021-01-13 07:49:50 +01:00 |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
2021-01-04 13:38:31 +01:00 |
|
Alex Gleason
|
80891e83d8
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-12-17 09:05:36 -06:00 |
|
lain
|
477c6c8e55
|
Merge branch 'auth-improvements' into 'develop'
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
|
2020-12-09 15:55:45 +00:00 |
|
lain
|
1436a2fa2d
|
Merge branch 'stream-follow-updates' into 'develop'
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
|
2020-12-09 15:52:31 +00:00 |
|
Ivan Tashkinov
|
a010c5b16a
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
2020-12-06 13:59:35 +03:00 |
|
lain
|
222312900e
|
User: Don't allow local users in remote changesets
|
2020-12-02 12:18:43 +01:00 |
|
Egor Kislitsyn
|
35ba48494f
|
Stream follow updates
|
2020-12-02 00:18:58 +04:00 |
|
Ivan Tashkinov
|
f1b07a2b2b
|
OAuth form user remembering feature. Local MastoFE login / logout fixes.
|
2020-11-28 21:51:06 +03:00 |
|
Alex Gleason
|
9546c1444c
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-11-14 19:48:47 -06:00 |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
2020-11-04 16:51:42 +01:00 |
|
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
2020-10-16 17:36:02 +00:00 |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-15 16:39:01 -05:00 |
|
Alex Gleason
|
dc38dc8472
|
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
|
2020-10-13 22:01:27 -05:00 |
|
Alex Gleason
|
c3112fd13a
|
Merge remote-tracking branch 'upstream/develop' into registration-workflow
|
2020-10-13 19:20:00 -05:00 |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
2020-10-13 09:54:29 -05:00 |
|
Mark Felder
|
4ead0d564f
|
Merge branch 'develop' into refactor/discoverable_user_field
|
2020-10-13 09:54:11 -05:00 |
|
Alexander Strizhakov
|
7dffaef479
|
tests consistency
|
2020-10-13 16:35:09 +03:00 |
|