aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-07-27Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-26OpenAPI: remove accidentally pasted buffer dataAlibek Omarov
2020-07-26OpenAPI: Replace actor_id by account_id to follow ChatMessage schemaAlibek Omarov
2020-07-25Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn
StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-23Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain
Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758
2020-07-23Merge branch 'issue/1878' into 'develop'lain
[#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751
2020-07-23Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-23Merge branch 'linkify' into 'develop'lain
Fix Linkify See merge request pleroma/pleroma!2792
2020-07-22Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-21Skip the correct plugMark Felder
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
2020-07-21Merge branch 'develop' into fix/pleroma-api-emoji-packsMark Felder
2020-07-21Merge branch 'linkify' into 'develop'lain
AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677
2020-07-21fix credoRoman Chvanikov
2020-07-21Fix config testsRoman Chvanikov
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-18Merge branch 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-18Fix /api/pleroma/emoji/packs index endpoint.KokaKiwi
2020-07-17Merge branch 'fix-1958' into 'develop'Haelwenn
OpenAPI: Add :id to follower/following endpoints, fixes #1958 Closes #1958 See merge request pleroma/pleroma!2772
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-17TOTP length is configurable, so we can't hardcode this here.Mark Felder
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-16Improve TOTP token and recovery input fields in OAuth loginMark Felder
2020-07-15cleanupRoman Chvanikov
2020-07-15Merge developRoman Chvanikov
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-15Merge branch 'features/mrf-reasons' into 'develop'rinpatch
Add rejection reason to our MRFs See merge request pleroma/pleroma!2759
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-15fixesRoman Chvanikov
2020-07-14Merge developRoman Chvanikov
2020-07-14Include port in host for signaturesMaksim Pechnikov
2020-07-14Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'feld
Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754
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-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 'develop' into refactor/fe-bundlesRoman Chvanikov
2020-07-14MRF Policies: Return a {:reject, reason} instead of {:reject, nil}Haelwenn (lanodan) Monnier
2020-07-13Transmogrifier: filtering weirdness in address fields=
2020-07-13Merge branch 'develop' into refactor/notification_settingsMark Felder
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 20:29:59 +0000