aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-11Transmogrifier: Small readability changes.lain
2020-08-11Merge branch '204-fix' into 'develop'lain
Fix 500 errors when returning :no_content, fixes #2029 Closes #2029 See merge request pleroma/pleroma!2856
2020-08-11Merge branch 'fix/activity-expirations-again' of ↵lain
git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11SideEffects: Handle strange deletion case.lain
2020-08-11added paginate+search for admin/MediaProxy URLsMaksim Pechnikov
2020-08-10Transmogrifier: Remove duplicate code.lain
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-07Merge branch 'develop' into fix/ldap-auth-issuesMark Felder
2020-08-07Make a new function instead of overloading register_changeset/3Mark Felder
2020-08-07Force 204 responses to be empty, fixes #2029Alex Gleason
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
Poll and votes pipeline ingestion Closes #1362 and #1852 See merge request pleroma/pleroma!2635
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-08-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-06[#2025] Defaulted OAuth login scopes choice to all scopes when user selects ↵Ivan Tashkinov
no scopes.
2020-08-06Merge branch 'whole-word-filter-hotfix' into 'develop'lain
Update filter_view.ex to return whole_word actual value See merge request pleroma/pleroma!2851
2020-08-05Apply 1 suggestion(s) to 1 file(s)Alex Gleason
2020-08-05Merge remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason
2020-08-05Speed up instance timeline queryAlex Gleason
2020-08-05Add email to user account only if it exists in LDAPMark Felder
2020-08-05CommonValidations: More refactors.lain
2020-08-05CommonValidations: Refactor `same_domain?`lain
2020-08-05CommonValidations: Extract modification right checkerlain
2020-08-05Permit LDAP users to register without capturing their password hashMark Felder
We don't need it, and local auth fallback has been removed.
2020-08-05Remove fallback to local database when LDAP is unavailable.Mark Felder
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
2020-08-05Remove LDAP mail attribute as a requirement for registering an accountMark Felder
2020-08-05Questions: Move fixes to validators.lain
2020-08-05Apply 1 suggestion(s) to 1 file(s)lain
2020-08-05CommonValidations: Remove superfluous functionlain
The `is_active` functionality was integrated into the presence checker.
2020-08-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-05Update filter_view.ex to return whole_word actual valueMK Fain
2020-08-05templates/layout/app.html.eex: fix link colorKarol Kosek
2020-08-04Merge branch 'deactivated-user-posts' into 'develop'rinpatch
Deactivated user posts Closes #2011 See merge request pleroma/pleroma!2845
2020-08-04Merge branch 'chore/consolidate-rich-media-http' into 'develop'rinpatch
Consolidate construction of Rich Media Parser HTTP requests See merge request pleroma/pleroma!2827
2020-08-04Fix ActivityExpirationPolicyEgor Kislitsyn
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-04question_validator: Allow content to be an empty-string (blank)Haelwenn (lanodan) Monnier
2020-08-04CommonValidations: Treat deactivated users as not present.lain
2020-08-03Consolidate construction of Rich Media Parser HTTP requestsMark Felder
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-03Merge branch 'object-age-fix' into 'develop'lain
MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840
2020-08-03MRF Object Age Policy: Don't break on messages without cc/tolain
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
This reverts merge request !2825
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
This reverts merge request !2820
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
MRF silencing alternative solution See merge request pleroma/pleroma!2820
2020-07-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
2020-07-31[#1985] Prevented force login on registration if account approval and/or ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
Render preview cards in chats See merge request pleroma/pleroma!2816
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 13:20:14 +0000