aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-07Merge branch 'spoopy-user' into 'develop'lain
restricted_nicknames: Add names from MastoAPI endpoints See merge request pleroma/pleroma!2857
2020-08-07Add a note about the proper value for uidMark Felder
2020-08-07Merge branch 'object-age-changelog' into 'develop'rinpatch
Changelog: Add information about the object age policy See merge request pleroma/pleroma!2859
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
lexbor) refuse to parse it like mochiweb does
2020-08-07Make Floki use fast_htmlrinpatch
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 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
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes Closes #2025 See merge request pleroma/pleroma!2855
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-06Merge branch 'command-available-check' into 'develop'lain
#1939 Check command availability for exiftool and git See merge request pleroma/pleroma!2753
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 ↵Mark Felder
Pleroma.Web.Auth.PleromaAuthenticator
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
Migrate legacy tags set by AdminFE to match TagPolicy, #2010 See merge request pleroma/pleroma!2836
2020-08-05Merge branch 'refactor/config-get' into 'develop'lain
Refactor Pleroma.Config.get to return consistent results for nil values Closes #2001 See merge request pleroma/pleroma!2853
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
We don't need it, and local auth fallback has been removed.
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
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-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-05Refactor configRoman Chvanikov
2020-08-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-05Merge branch 'unique-app-id' into 'develop'lain
Add unique index for apps.client_id, fixes #2022 Closes #2022 See merge request pleroma/pleroma!2844
2020-08-05Merge branch 'fix/incorrect-expirations' into 'develop'lain
Add a migration to clean up activity_expirations table See merge request pleroma/pleroma!2848
2020-08-05Merge branch 'fix-link-color' into 'develop'lain
templates/layout/app.html.eex: fix link color See merge request pleroma/pleroma!2850
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
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