summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-07Merge branch 'spoopy-user' into 'develop'lain
2020-08-07Add a note about the proper value for uidMark Felder
2020-08-07Merge branch 'object-age-changelog' into 'develop'rinpatch
2020-08-07Changelog: Add information about the object age policylain
2020-08-07mix.exs: update fast_sanitize to 0.2.0rinpatch
2020-08-07rel me test: fix HTML so broken browsers (and thereforerinpatch
2020-08-07Make Floki use fast_htmlrinpatch
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
2020-08-07Merge branch 'develop' into feature/update-welcome-setting-in-descriptionMaksim Pechnikov
2020-08-07added testMaksim Pechnikov
2020-08-06restricted_nicknames: Add names from MastoAPI endpointsAlex Gleason
2020-08-06Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'lain
2020-08-06[#2025] Defaulted OAuth login scopes choice to all scopes when user selects n...Ivan Tashkinov
2020-08-06Merge branch 'whole-word-filter-hotfix' into 'develop'lain
2020-08-06Merge branch 'command-available-check' into 'develop'lain
2020-08-05changelog for filter whole_word fixMary Kate
2020-08-05update test for whole_word in filterMary Kate
2020-08-05Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pler...Mark Felder
2020-08-05Comments are good when they're precise...Mark Felder
2020-08-05Move checks to application startupRoman Chvanikov
2020-08-05Add email to user account only if it exists in LDAPMark Felder
2020-08-05Merge branch 'develop' into command-available-checkRoman Chvanikov
2020-08-05Merge branch 'migrate-legacy-tags' into 'develop'lain
2020-08-05Merge branch 'refactor/config-get' into 'develop'lain
2020-08-05CommonValidations: More refactors.lain
2020-08-05CommonValidations: Refactor `same_domain?`lain
2020-08-05CommonValidations: Extract modification right checkerlain
2020-08-05MailerTest: Give it some time.lain
2020-08-05Handle non-list keys in Config.fetch/1Roman Chvanikov
2020-08-05Permit LDAP users to register without capturing their password hashMark Felder
2020-08-05Merge branch 'develop' into refactor/config-getRoman Chvanikov
2020-08-05Update clear_config macroRoman Chvanikov
2020-08-05Define default authenticator in the configMark Felder
2020-08-05Fix linting.lain
2020-08-05Remove fallback to local database when LDAP is unavailable.Mark Felder
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-05Apply 1 suggestion(s) to 1 file(s)lain
2020-08-05CommonValidations: Remove superfluous functionlain
2020-08-05Refactor configRoman Chvanikov
2020-08-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/po...lain
2020-08-05Merge branch 'unique-app-id' into 'develop'lain
2020-08-05Merge branch 'fix/incorrect-expirations' into 'develop'lain
2020-08-05Merge branch 'fix-link-color' into 'develop'lain
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-04Add a migration to clean up activity_expirations tableMark Felder
2020-08-04Merge branch 'deactivated-user-posts' into 'develop'rinpatch
2020-08-04Merge branch 'chore/consolidate-rich-media-http' into 'develop'rinpatch