summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-03Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-datastwf
# Conflicts: # lib/pleroma/web/preload/status_net.ex
2020-06-03clean upstwf
2020-06-03add status_net/configstwf
2020-06-03encode data properlystwf
2020-06-03preload data into index.htmlstwf
2020-06-03Notification: Fix notifications backfill for compacted activitieslain
2020-06-03add status_net/configstwf
2020-06-03Changelog: Add chats to changelog.lain
2020-06-03Docs: Add `mark_message_as_read` to docslain
2020-06-03ChatController: Add function to mark single message as read.lain
2020-06-03Merge branch 'openapi/admin/reports' into 'develop'lain
Add OpenAPI spec for AdminAPI.ReportController See merge request pleroma/pleroma!2628
2020-06-03ChatMessageReferenceView: Return read status as `unread`.lain
2020-06-03Add OpenAPI spec for AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Move report actions to AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Streamer, SideEffects: Stream out ChatMessageReferenceslain
Saves us a few calles to fetch things from the DB that we already have.
2020-06-03Merge branch 'openapi/update-admin-api/status' into 'develop'Haelwenn
Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624
2020-06-03FollowingRelationship: Remove meaningless changelain
2020-06-03Migrations: Add chat_id, seen index to ChatMessageReferenceslain
This ensures fast count of unseen messages
2020-06-03Migrations: Fix migration module namelain
2020-06-03Chats: Remove `unread` from the db, calculate from unseen messages.lain
2020-06-03Merge branch 'admin-api/account-view' into 'develop'lain
Use AdminAPI.StatusView in api/admin/users Closes #1836 See merge request pleroma/pleroma!2627
2020-06-03Migration: Remove superfluous importslain
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/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 17:09:05 +0000