summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-14Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'feld
Fix in-db configuration in dev environment See merge request pleroma/pleroma!2764
2020-07-14Merge branch '1940-admin-token-oauthless-auth' into 'develop'feld
[#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760
2020-07-14[#1940] Added `admin_token` param (as `admin_api_params/0`) to existing ↵Ivan Tashkinov
Admin API OpenAPI operations.
2020-07-14Clarify description and suggestionMark Felder
2020-07-14Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into ↵feld
'develop' Transmogrifier: filtering weirdness in address fields Closes #1916 See merge request pleroma/pleroma!2762
2020-07-14Merge branch 'fix/oban-2.0-in-db-config' into 'develop'rinpatch
Migrate in-db config after updating to Oban 2.0 See merge request pleroma/pleroma!2765
2020-07-14Fix in-db configuration in dev environmentrinpatch
Previously, in-db configuration only worked when `warnings_as_errors` was disabled because re-compiling scrubbers on application restart created a warning about module conflicts. This patch fixes that by enabling `ignore_module_conflict` option of the compiler at runtime, and enables `warnings_as_errors` in prod since there is no reason to keep it disabled anymore.
2020-07-14Migrate in-db config after updating to Oban 2.0rinpatch
2020-07-14[#1940] Applied rate limit for requests with bad `admin_token`. Added doc ↵Ivan Tashkinov
warnings on `admin_token` setting.
2020-07-19[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored ↵Ivan Tashkinov
UserIsAdminPlug (freed from checking admin scopes presence).
2020-07-13Transmogrifier: filtering weirdness in address fields=
2020-07-13Merge branch 'config-behaviours-runtime' into 'develop'feld
Config/Docs: Expand behaviour suggestions modules at runtime Closes #1941 See merge request pleroma/pleroma!2755
2020-07-13Merge branch 'features/profile-fields-emojo' into 'develop'feld
user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741
2020-07-13Merge branch 'chore/improve-database-config-docs' into 'develop'feld
Improve database config migration and add documentation See merge request pleroma/pleroma!2756
2020-07-13Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'feld
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http See merge request pleroma/pleroma!2735
2020-07-13LintMark Felder
2020-07-13Show examples for both OTP and sourceMark Felder
2020-07-13Pick up env for both source and OTP installsMark Felder
2020-07-13Merge branch '1937-renaming' into 'develop'Haelwenn
ActivityPub: Don't rename a clashing nickname with the same ap id. Closes #1937 See merge request pleroma/pleroma!2748
2020-07-12Still allow passing the arg, but fallback to MIX_ENVMark Felder
2020-07-12Make the query more preciseMark Felder
2020-07-12Improve database config migration and add documentationMark Felder
2020-07-12Config/Docs: Expand behaviour suggestions at runtimehref
2020-07-12Update types in MRF Keyword groupAngelina Filippova
2020-07-11Merge branch 'feature/upload-filter-exiftool' into 'develop'lain
Add Pleroma.Upload.Filter.Exiftool Closes #1935 See merge request pleroma/pleroma!2744
2020-07-11Merge branch 'patch-3' into 'develop'lain
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths See merge request pleroma/pleroma!2752
2020-07-11docs: API: fix update_credentials endpoints path, clarify ↵Alibek Omarov
update/verify_credentials endpoints paths
2020-07-11Remove :regex from typesAngelina Filippova
2020-07-11Update types for :params, :match_actor and :replace settingsAngelina Filippova
2020-07-10Remove unused @typesMark Felder
2020-07-10Add a moduledocMark Felder
2020-07-10Support Exiftool for stripping EXIF dataMark Felder
We really only want to strip location data anyway, and mogrify strips color profiles.
2020-07-10Merge branch 'issue/1790-updated-oban' into 'develop'feld
[#1790] updated oban to 2.0.0 See merge request pleroma/pleroma!2674
2020-07-10Merge branch 'fix/1924-s3-descriptions' into 'develop'feld
docs and descriptions for s3 settings Closes #1924 See merge request pleroma/pleroma!2745
2020-07-10Merge branch 'chore/should-document-that' into 'develop'feld
Probably worth documenting the MediaProxy fix See merge request pleroma/pleroma!2750
2020-07-10Merge branch 'develop' into issue/1790-updated-obanMark Felder
2020-07-10Switch to the official Oban 2.0.0 releaseMark Felder
2020-07-10Probably worth documenting the MediaProxy fixMark Felder
2020-07-10Merge branch 'proxy-range-and-chunk' into 'develop'feld
ReverseProxy: Streaming and disable encoding if Range Closes #1860 and #1823 See merge request pleroma/pleroma!2749
2020-07-10Credo line length complaintMark Felder
2020-07-10ReverseProxy: Streaming and disable encoding if Rangehref
Fixes #1823 Fixes #1860
2020-07-10ActivityPub: Don't rename a clashing nickname with the same ap id.lain
2020-07-10Merge branch 'chat-federation-information' into 'develop'lain
Add an `accepts_chat_messages` to user, expose in api and federation See merge request pleroma/pleroma!2716
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
chat-federation-information
2020-07-10Merge branch 'bump-fe-2020-07-10' into 'develop'lain
Update frontend See merge request pleroma/pleroma!2747
2020-07-10Update frontendlain
2020-07-10Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'Haelwenn
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated` Closes admin-fe#107 and #1788 See merge request pleroma/pleroma!2554
2020-07-10Merge branch 'mix-tasks-improvement' into 'develop'lain
Mix tasks improvement See merge request pleroma/pleroma!2723
2020-07-10Merge branch 'cluster-test-ci' into 'develop'lain
RE-enable cluster tests on CI See merge request pleroma/pleroma!2743
2020-07-10Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'Haelwenn
# Conflicts: # CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 01:19:06 +0000