summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-03Credo fixes.lain
2020-06-03Migrations: Add unique index to ChatMessageReferences.lain
2020-06-03ChatMessageReferences: Move testslain
2020-06-03Use AdminAPI.StatusView in api/admin/usersEgor Kislitsyn
2020-06-03ChatMessageReferences: Adjust viewslain
2020-06-03ChatMessageReference: Introduce and switch in chat controller.lain
2020-06-03Merge branch 'patch-3' into 'develop'lain
docs: clients.md: Add Husky See merge request pleroma/pleroma!2626
2020-06-03docs: clients.md: Add HuskyAlibek Omarov
2020-06-02Merge branch 'fix/1794-hashtag-search-results' into 'develop'feld
[#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611
2020-06-02Update OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-06-02Merge branch 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-02encode data properlystwf
2020-06-02Merge branch 'replies-domain-block' into 'develop'lain
Replies domain block Closes #1650 See merge request pleroma/pleroma!2622
2020-06-02Merge branch 'openapi/admin/oauth-apps' into 'develop'lain
Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582
2020-06-02Merge branch 'tagline' into 'develop'lain
Update default instance description See merge request pleroma/pleroma!2600
2020-06-02Merge branch 'openapi/admin/invites' into 'develop'lain
Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585
2020-06-02Merge branch 'feature/embeddable-posts' into 'develop'lain
Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319
2020-06-02Credo fixeslain
2020-06-02Migrations: Add a migration to backfill notification types.lain
2020-06-02Notification: Add function to backfill notification typeslain
2020-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-02Activity: Remove notifications-related functions.lain
2020-06-02NotificationController: Don't return chat_mentions by default.lain
2020-06-02Merge branch 'fix/invisible-repeats' into 'develop'lain
Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620
2020-06-02Notifications: Make notifications save their type.lain
2020-06-02Do not include activities of invisible users unless explicitly requestedrinpatch
Closes #1833
2020-06-02Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2623
2020-06-02Translated using Weblate (Dutch)Fristi
Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
2020-06-02Merge branch 'feature/status-by-id-account-view' into 'develop'lain
another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543
2020-06-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-02replies filtering for blocked domainsAlexander Strizhakov
2020-06-01Merge branch 'user-updates' into 'develop'rinpatch
AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617
2020-06-01Merge branch 'only-creates-in-public-tl' into 'develop'rinpatch
TimelineController: Only return `Create` in public timelines. Closes #1833 and #1821 See merge request pleroma/pleroma!2618
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
Config: Default to Hackney again See merge request pleroma/pleroma!2619
2020-06-01CommonAPI: Newlines -> br for chat messages.lain
2020-06-01Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-06-01Config: Default to Hackney againlain
Gun needs some server setting changes (files) and has problems with OTP 23 (wildcards), so use Hackney as a default again for now.
2020-06-01Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-01TimelineController: Only return `Create` in public timelines.lain
2020-06-01AccountController: Federate user account changes.lain
Hotfixy commit, will be moved to the pipeline.
2020-05-30Merge branch 'chore/bump-hackney' into 'develop'Haelwenn
mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614
2020-05-30Merge branch 'test/fix-config-setting-in-user-test' into 'develop'lain
Fix config setting to not affect other tests See merge request pleroma/pleroma!2615
2020-05-30Fix config setting to not affect other testsRoman Chvanikov
2020-05-30hackney adapter helper: support tlsv1.3 and remove custom optsrinpatch
- partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612
2020-05-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-30CommonAPI: Linkify chat messages.lain
2020-05-30SafeText: Let through basic html.lain
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
Conversation pagination See merge request pleroma/pleroma!2601
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 02:36:17 +0000