Merge remote-tracking branch 'origin/develop' into reactions
[akkoma] / lib / pleroma / conversation /
2019-09-03 Maxim FilippovReturn "total" optionally
2019-09-02 Maxim FilippovReturn total from pagination + tests
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-19 lainMerge branch 'hotfix/user_unfollow' into 'develop'
2019-08-18 kaniiniMerge branch 'feature/hide-muted-threads-from-timeline...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-14 lainConversations: Load relations in one query.
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-06 lainParticipation: Setting recipients will always add the...
2019-08-05 lainLinting.
2019-08-05 lainPleroma Conversations API: Add a way to set recipients.
2019-08-02 lainCommonAPI: Extend api with conversation replies.
2019-08-02 lainConversations: Add recipient list to conversation parti...
2019-07-31 lainStatusView: Return direct conversation id.
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-11 lainMerge branch 'feature/rate-limiter' into 'develop'
2019-06-11 kaniiniMerge branch 'change-containment-default' into 'develop'
2019-06-11 kaniiniMerge branch 'preload-changes' into 'develop'
2019-06-07 lainConversations: Fetch users in one query.
2019-06-05 kaniiniMerge branch 'explicit-addressing' into 'develop'
2019-06-05 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-06-04 Roman ChvanikovFix conflict
2019-06-04 HaelwennMerge branch 'remove-tag-warning' into 'develop'
2019-06-04 HaelwennMerge branch 'bugfix/956-activity-id-nil-conversations...
2019-06-04 lainParticipations: Filter out participations without activ...
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-01 Sachin JoshiMerge remote-tracking branch 'upstream/develop' into...
2019-05-29 Roman ChvanikovMerge develop
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-16 kaniiniMerge branch 'feature/890-add-report-uri' into 'develop'
2019-05-16 feldMerge branch 'fix/domain-unblocked-reblogs' into 'develop'
2019-05-16 rinpatchMerge branch 'conversations-import' into 'develop'
2019-05-16 Mark FelderMerge branch 'develop' into conversations-import
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-09 lainConversations: Import order, import as read.
2019-05-08 Roman ChvanikovMerge develop
2019-05-07 kaniiniMerge branch 'docs/MRF-modules' into 'develop'
2019-05-07 lambdaMerge branch 'conversations_three' into 'develop'
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-20 Roman ChvanikovRefactor query to return only 1 message instead of 20
2019-04-15 lainConversation: Add accounts to output.
2019-04-10 lainConversations: Tidying up.