summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-11Transmogrifier: Small readability changes.lain
2020-08-11Transmogrifier Tests: Extract Accept handlinglain
2020-08-10Merge branch 'admin-active-filter' into 'develop'feld
Admin API: Filter out unapproved users when the `active` filter is on Closes #2037 See merge request pleroma/pleroma!2872
2020-08-10Admin API: Filter out unapproved users when the `active` filter is onEgor Kislitsyn
2020-08-10Merge branch 'revert-a6d3bb5f' into 'develop'lain
Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868
2020-08-10Merge branch 'remove-unreachable-code' into 'develop'lain
Transmogrifier: Remove duplicate code. See merge request pleroma/pleroma!2871
2020-08-10Merge branch 'develop' into 'develop'lain
docs: add cmake to other installation guides Closes #2039 See merge request pleroma/pleroma!2870
2020-08-10Merge branch '2039-cmake' into 'develop'lain
Docs: Add cmake dependency Closes #2039 See merge request pleroma/pleroma!2869
2020-08-10Transmogrifier: Remove duplicate code.lain
2020-08-10docs: add cmake to other installation guidesAlibek Omarov
2020-08-10Docs: Add cmake dependencylain
2020-08-10Revert "Merge branch 'issue/1023' into 'develop'"lain
This reverts merge request !2763
2020-08-10Merge branch 'fix/flaky-migration-episode-666' into 'develop'rinpatch
20200802170532_fix_legacy_tags: Select only fields the migration needs See merge request pleroma/pleroma!2863
2020-08-10Merge branch '2038-old-update-info' into 'develop'rinpatch
AccountController: Build the correct update activity. Closes #2038 See merge request pleroma/pleroma!2867
2020-08-1020200802170532_fix_legacy_tags: chunk the user queryrinpatch
2020-08-1020200802170532_fix_legacy_tags: Select only fields the migration needsrinpatch
Selecting the full struct will break as soon as a new field is added.
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-09Merge branch 'feat/floki-fast-html-2' into 'develop'lain
Update to fast_html 2 and use it for Floki parsing See merge request pleroma/pleroma!2861
2020-08-09Merge branch 'security-policy' into 'develop'lain
Add security policy for Pleroma backend Closes #1848 See merge request pleroma/pleroma!2862
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
# Conflicts: # config/config.exs
2020-08-08Merge branch 'ensure-expiration-mix-task' into 'develop'lain
Add mix task to add expiration to all local statuses Closes #2020 See merge request pleroma/pleroma!2865
2020-08-08Add mix task to add expiration to all local statusesEgor Kislitsyn
2020-08-07Merge branch 'fix/ldap-auth-issues' into 'develop'lain
Fix LDAP auth issues Closes #1646 See merge request pleroma/pleroma!2852
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-07Add security policy for Pleroma backendrinpatch
Closes #1848
2020-08-07Merge branch 'authenticator-docs' into 'develop'rinpatch
Docs: Remove wrong / confusing auth docs. Closes #2028 See merge request pleroma/pleroma!2860
2020-08-07Docs: Remove wrong / confusing auth docs.lain
2020-08-07CI: install cmake since fast_html now requires itrinpatch
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 19:26:11 +0000