aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-05Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})Haelwenn
2020-06-04Merge branch 'openapi/admin/config' into 'develop'lain
2020-06-04Fix credoEgor Kislitsyn
2020-06-04Merge branch 'develop' into openapi/admin/configEgor Kislitsyn
2020-06-03Merge branch 'openapi/admin/reports' into 'develop'lain
2020-06-03Add OpenAPI spec for AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Move report actions to AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Merge branch 'openapi/update-admin-api/status' into 'develop'Haelwenn
2020-06-03Merge branch 'admin-api/account-view' into 'develop'lain
2020-06-03Use AdminAPI.StatusView in api/admin/usersEgor Kislitsyn
2020-06-03Merge branch 'patch-3' into 'develop'lain
2020-06-03docs: clients.md: Add HuskyAlibek Omarov
2020-06-02Merge branch 'fix/1794-hashtag-search-results' into 'develop'feld
2020-06-02Update OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-06-02Merge branch 'replies-domain-block' into 'develop'lain
2020-06-02Merge branch 'openapi/admin/oauth-apps' into 'develop'lain
2020-06-02Merge branch 'tagline' into 'develop'lain
2020-06-02Merge branch 'openapi/admin/invites' into 'develop'lain
2020-06-02Merge branch 'feature/embeddable-posts' into 'develop'lain
2020-06-02Merge branch 'fix/invisible-repeats' into 'develop'lain
2020-06-02Do not include activities of invisible users unless explicitly requestedrinpatch
2020-06-02Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
2020-06-02Translated using Weblate (Dutch)Fristi
2020-06-02Merge branch 'feature/status-by-id-account-view' into 'develop'lain
2020-06-02replies filtering for blocked domainsAlexander Strizhakov
2020-06-01Merge branch 'user-updates' into 'develop'rinpatch
2020-06-01Merge branch 'only-creates-in-public-tl' into 'develop'rinpatch
2020-06-01exclude replies on blocked domainsAlexander Strizhakov
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-06-01Merge branch 'default-to-hackney-again' into 'develop'lain
2020-06-01Config: Default to Hackney againlain
2020-06-01TimelineController: Only return `Create` in public timelines.lain
2020-06-01AccountController: Federate user account changes.lain
2020-05-30Merge branch 'chore/bump-hackney' into 'develop'Haelwenn
2020-05-30Merge branch 'test/fix-config-setting-in-user-test' into 'develop'lain
2020-05-30Fix config setting to not affect other testsRoman Chvanikov
2020-05-30hackney adapter helper: support tlsv1.3 and remove custom optsrinpatch
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a t...Ivan Tashkinov
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-s...Ivan Tashkinov
2020-05-29Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
2020-05-29Merge branch 'media-docs' into 'develop'rinpatch
2020-05-30mix.lock: update hackney to 1.16.0rinpatch
2020-05-29Apply suggestion to lib/pleroma/plugs/http_security_plug.exrinpatch
2020-05-29Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'lain
2020-05-29fix unused var warningRoman Chvanikov
2020-05-29Merge branch 'connect-src' into 'develop'rinpatch
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-29Add blob: to connect-src CSPAlex Gleason