Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
3 years ago
Alex Gleason
c80b1aaf51
Don't crash when email settings are invalid
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
3 years ago
Alexander Strizhakov
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
4 years ago
Mark Felder
6a3e75c8e6
Lint
4 years ago
Mark Felder
c361440396
Add basic test to validate the registration email is dispatched when the others are disabled
...
Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.
4 years ago
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
Egor Kislitsyn
a51d903e0c
Make sure active_user_count/1 counts only local users
4 years ago
Ivan Tashkinov
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
Egor Kislitsyn
bddb01bded
Add tests
4 years ago
Mark Felder
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
5d344e5c79
Only need to test if unconfirmed users are successfully deleted
...
It's no longer possible to have an active user account with User.is_confirmed == false
4 years ago
Mark Felder
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
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
...
Also cosmetic changes to make the code clearer
4 years ago
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder
ebd7d1365b
Make setting user activation status explicit
4 years ago
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
Mark Felder
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
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/ >;'
4 years ago
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
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'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
4 years ago
lain
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
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