Maksim Pechnikov
|
f6da12f45d
|
fix search media proxy urls
|
2020-08-16 06:54:48 +03:00 |
|
Maksim Pechnikov
|
56470647de
|
Merge branch 'develop' into issue/1936
|
2020-08-13 09:00:25 +03:00 |
|
lain
|
686002164a
|
Merge branch '204-fix' into 'develop'
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
|
2020-08-11 09:18:56 +00:00 |
|
Maksim Pechnikov
|
345ac512e4
|
added paginate+search for admin/MediaProxy URLs
|
2020-08-11 10:30:13 +03:00 |
|
lain
|
11fc90744c
|
Transmogrifier: Remove duplicate code.
|
2020-08-10 15:31:36 +02:00 |
|
lain
|
66122a11b5
|
AccountController: Build the correct update activity.
Will fix federation issues.
|
2020-08-10 10:33:05 +02:00 |
|
Mark Felder
|
54e2af8293
|
Merge branch 'develop' into fix/ldap-auth-issues
|
2020-08-07 14:55:22 -05:00 |
|
Mark Felder
|
474147a67a
|
Make a new function instead of overloading register_changeset/3
|
2020-08-07 14:54:14 -05:00 |
|
Alex Gleason
|
673e8e3ac1
|
Force 204 responses to be empty, fixes #2029
|
2020-08-07 13:02:39 -05:00 |
|
lain
|
34cbe9f44a
|
Merge branch 'features/poll-validation' into 'develop'
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
|
2020-08-07 10:44:06 +00:00 |
|
Ivan Tashkinov
|
135ae4e35a
|
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
|
2020-08-06 16:00:00 +03:00 |
|
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
|
2020-08-06 08:35:39 +00:00 |
|
Mark Felder
|
81126b0142
|
Add email to user account only if it exists in LDAP
|
2020-08-05 11:36:12 -05:00 |
|
lain
|
9d7ce1a6d0
|
CommonValidations: More refactors.
|
2020-08-05 17:56:12 +02:00 |
|
lain
|
3655175639
|
CommonValidations: Refactor same_domain?
|
2020-08-05 17:36:27 +02:00 |
|
lain
|
9c96fc052a
|
CommonValidations: Extract modification right checker
|
2020-08-05 17:26:53 +02:00 |
|
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.
|
2020-08-05 10:07:31 -05:00 |
|
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.
|
2020-08-05 08:18:16 -05:00 |
|
Mark Felder
|
f7146583e5
|
Remove LDAP mail attribute as a requirement for registering an account
|
2020-08-05 08:15:57 -05:00 |
|
lain
|
f889400d05
|
Questions: Move fixes to validators.
|
2020-08-05 14:51:33 +02:00 |
|
lain
|
70522989d9
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-08-05 11:14:58 +00:00 |
|
lain
|
00c4c6a382
|
CommonValidations: Remove superfluous function
The `is_active` functionality was integrated into the presence
checker.
|
2020-08-05 12:24:34 +02:00 |
|
lain
|
19c108170e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
2020-08-05 11:12:14 +02:00 |
|
MK Fain
|
f341a8e142
|
Update filter_view.ex to return whole_word actual value
|
2020-08-05 02:01:27 +00:00 |
|
Karol Kosek
|
577b11167c
|
templates/layout/app.html.eex: fix link color
|
2020-08-05 00:01:30 +02:00 |
|
rinpatch
|
b1b6a7dfa8
|
Merge branch 'deactivated-user-posts' into 'develop'
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
|
2020-08-04 19:17:30 +00:00 |
|
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
|
2020-08-04 19:16:38 +00:00 |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
2020-08-04 18:26:37 +04:00 |
|
lain
|
878c7f3f30
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
2020-08-04 15:28:41 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0f088d8ce3
|
question_validator: Allow content to be an empty-string (blank)
|
2020-08-04 14:29:16 +02:00 |
|
lain
|
1a00713744
|
CommonValidations: Treat deactivated users as not present.
|
2020-08-04 14:17:03 +02:00 |
|
Mark Felder
|
016d8d6c56
|
Consolidate construction of Rich Media Parser HTTP requests
|
2020-08-03 12:37:31 -05:00 |
|
lain
|
56b5b9aa27
|
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
|
2020-08-03 14:22:11 +00:00 |
|
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
|
2020-08-03 12:50:10 +00:00 |
|
lain
|
10c792110e
|
MRF Object Age Policy: Don't break on messages without cc/to
|
2020-08-03 14:12:32 +02:00 |
|
lain
|
4b18a07392
|
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
|
2020-07-31 15:18:04 +00:00 |
|
lain
|
010d77ec85
|
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
|
2020-07-31 15:17:09 +00:00 |
|
lain
|
1ac0969c72
|
Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
|
2020-07-31 14:43:33 +00:00 |
|
Haelwenn (lanodan) Monnier
|
ac2598307d
|
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
|
2020-07-31 13:57:21 +02:00 |
|
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.
|
2020-07-31 14:13:38 +03:00 |
|
lain
|
1dd162a5f7
|
SimplePolicy: Fix problem with DM leaks.
|
2020-07-31 09:57:30 +02:00 |
|
Haelwenn
|
d1cf1108ac
|
Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats
See merge request pleroma/pleroma!2816
|
2020-07-30 20:08:03 +00:00 |
|
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
|
2020-07-30 20:01:04 +00:00 |
|
lain
|
a3c37379e9
|
ChatMessage schema: Add preview cards.
|
2020-07-30 19:57:45 +02:00 |
|
lain
|
781b270863
|
ChatMessageReferenceView: Display preview cards.
|
2020-07-30 19:57:26 +02:00 |
|
Alex Gleason
|
702f0fb822
|
Merge remote-tracking branch 'upstream/develop' into mrf-silence
|
2020-07-29 13:01:16 -05:00 |
|
Alex Gleason
|
93638935d7
|
SimpleMRF: :silence --> :followers_only
|
2020-07-29 12:58:08 -05:00 |
|
Alex Gleason
|
d8a01c9432
|
Merge remote-tracking branch 'upstream/develop' into hide-reactions
|
2020-07-29 12:43:39 -05:00 |
|
lain
|
d9bf2c58df
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
|
2020-07-29 14:42:09 +02:00 |
|
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
|
2020-07-29 12:20:04 +00:00 |
|