Mark Felder
|
54e2af8293
|
Merge branch 'develop' into fix/ldap-auth-issues
|
4 years ago |
|
Mark Felder
|
474147a67a
|
Make a new function instead of overloading register_changeset/3
|
4 years ago |
|
lain
|
34cbe9f44a
|
Merge branch 'features/poll-validation' into 'develop'
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
|
4 years ago |
|
Ivan Tashkinov
|
135ae4e35a
|
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
|
4 years ago |
|
lain
|
10b0e55acf
|
Merge branch 'whole-word-filter-hotfix' into 'develop'
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
|
4 years ago |
|
Mark Felder
|
81126b0142
|
Add email to user account only if it exists in LDAP
|
4 years ago |
|
lain
|
9d7ce1a6d0
|
CommonValidations: More refactors.
|
4 years ago |
|
lain
|
3655175639
|
CommonValidations: Refactor `same_domain?`
|
4 years ago |
|
lain
|
9c96fc052a
|
CommonValidations: Extract modification right checker
|
4 years ago |
|
Mark Felder
|
2192d1e492
|
Permit LDAP users to register without capturing their password hash
We don't need it, and local auth fallback has been removed.
|
4 years ago |
|
Mark Felder
|
0f9aecbca4
|
Remove fallback to local database when LDAP is unavailable.
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
|
4 years ago |
|
Mark Felder
|
f7146583e5
|
Remove LDAP mail attribute as a requirement for registering an account
|
4 years ago |
|
lain
|
f889400d05
|
Questions: Move fixes to validators.
|
4 years ago |
|
lain
|
70522989d9
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
lain
|
00c4c6a382
|
CommonValidations: Remove superfluous function
The `is_active` functionality was integrated into the presence
checker.
|
4 years ago |
|
lain
|
19c108170e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
4 years ago |
|
MK Fain
|
f341a8e142
|
Update filter_view.ex to return whole_word actual value
|
4 years ago |
|
Karol Kosek
|
577b11167c
|
templates/layout/app.html.eex: fix link color
|
4 years ago |
|
rinpatch
|
b1b6a7dfa8
|
Merge branch 'deactivated-user-posts' into 'develop'
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
|
4 years ago |
|
rinpatch
|
fede37e4c6
|
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
|
4 years ago |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
4 years ago |
|
lain
|
878c7f3f30
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
0f088d8ce3
|
question_validator: Allow content to be an empty-string (blank)
|
4 years ago |
|
lain
|
1a00713744
|
CommonValidations: Treat deactivated users as not present.
|
4 years ago |
|
Mark Felder
|
016d8d6c56
|
Consolidate construction of Rich Media Parser HTTP requests
|
4 years ago |
|
lain
|
56b5b9aa27
|
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
|
4 years ago |
|
lain
|
5876d5123c
|
Merge branch 'object-age-fix' into 'develop'
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
|
4 years ago |
|
lain
|
10c792110e
|
MRF Object Age Policy: Don't break on messages without cc/to
|
4 years ago |
|
lain
|
4b18a07392
|
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
|
4 years ago |
|
lain
|
010d77ec85
|
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
|
4 years ago |
|
lain
|
1ac0969c72
|
Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ac2598307d
|
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
|
4 years ago |
|
Ivan Tashkinov
|
27b0a8b155
|
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.
|
4 years ago |
|
lain
|
1dd162a5f7
|
SimplePolicy: Fix problem with DM leaks.
|
4 years ago |
|
Haelwenn
|
d1cf1108ac
|
Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats
See merge request pleroma/pleroma!2816
|
4 years ago |
|
Haelwenn
|
87fe31fb5c
|
Merge branch '1993-confirm-users-on-registration' into 'develop'
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
|
4 years ago |
|
lain
|
a3c37379e9
|
ChatMessage schema: Add preview cards.
|
4 years ago |
|
lain
|
781b270863
|
ChatMessageReferenceView: Display preview cards.
|
4 years ago |
|
Alex Gleason
|
702f0fb822
|
Merge remote-tracking branch 'upstream/develop' into mrf-silence
|
4 years ago |
|
Alex Gleason
|
93638935d7
|
SimpleMRF: :silence --> :followers_only
|
4 years ago |
|
Alex Gleason
|
d8a01c9432
|
Merge remote-tracking branch 'upstream/develop' into hide-reactions
|
4 years ago |
|
lain
|
d9bf2c58df
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
|
4 years ago |
|
Haelwenn
|
269b61a240
|
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
|
4 years ago |
|
lain
|
de5c7e20a3
|
Merge branch 'bugfix/remote-user-atom' into 'develop'
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
2e27847573
|
feed/user_controller: Return 404 when the user is remote
|
4 years ago |
|
lain
|
79f9ddd8b7
|
Merge branch 'by-approval' into 'develop'
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
|
4 years ago |
|
lain
|
c25c21dd22
|
AccountController: Don't explicitly ask to keep users unconfirmed.
Confirmation is set in User.register_changeset based on the config
settings.
|
4 years ago |
|
lain
|
edf8b6abfe
|
EnsureRePrepended: Don't break on chat messages.
|
4 years ago |
|
Alex Gleason
|
2a99e7df8e
|
SimpleMRF silence: optimize, work okay with nil values in addressing
|
4 years ago |
|
Alex Gleason
|
3c90f7f715
|
SimpleMRF: Let instances be silenced
|
4 years ago |
