be2da95c36
Correctly purge a remote user
2021-06-29 21:45:38 -05:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
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
2021-05-03 14:43:14 -05:00
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
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
2021-03-25 13:03:40 +03:00
6a3e75c8e6
Lint
2021-02-05 09:00:17 -06:00
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.
2021-02-04 17:56:46 -06:00
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
2021-02-02 18:35:08 +00:00
a51d903e0c
Make sure active_user_count/1 counts only local users
2021-01-28 22:23:10 +04:00
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 .
2021-01-28 19:49:43 +03:00
bddb01bded
Add tests
2021-01-27 18:20:07 +04:00
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
2021-01-26 11:58:43 -06:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
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
2021-01-20 11:26:14 -06:00
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
2021-01-20 11:17:13 -06:00
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
2021-01-15 13:11:51 -06:00
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
ebd7d1365b
Make setting user activation status explicit
2021-01-15 11:37:17 -06:00
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
f7e59c28ed
Change user.approval_pending field to user.is_approved
2021-01-15 10:42:02 -06:00
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
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
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
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
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
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
222312900e
User: Don't allow local users in remote changesets
2020-12-02 12:18:43 +01:00
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
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
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-10-13 19:20:00 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
Alex Gleason