0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf506b1282a829
3 years ago
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
6c0484d571
AdminAPI: suggest a user through the API
3 years ago
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
3 years ago
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
3 years ago
92a8ff59aa
Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
...
Allow users to remove their emails if instance does not need email to register
See merge request pleroma/pleroma!3522
3 years ago
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
198250dcef
Allow users to remove their emails if instance does not need email to register
3 years ago
4ba0beb60c
Make mrfSimple work with tuples
...
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
3 years ago
5d279a22b1
Merge develop branch upstream
3 years ago
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
3 years ago
43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
3 years ago
be2da95c36
Correctly purge a remote user
3 years ago
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
3 years ago
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
ca79aab0bf
Remove MastoFE settings from users table
3 years ago
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
6a3e75c8e6
Lint
4 years ago
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
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
a51d903e0c
Make sure active_user_count/1 counts only local users
4 years ago
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
bddb01bded
Add tests
4 years ago
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
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
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
4 years ago
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
ebd7d1365b
Make setting user activation status explicit
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
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
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
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
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
4 years ago
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
222312900e
User: Don't allow local users in remote changesets
4 years ago
35ba48494f
Stream follow updates
4 years ago
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
FloatingGhost