projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
test
/
conversation
/
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
tree
|
commitdiff
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
tree
|
commitdiff
2019-10-27
kaniini
Merge branch 'readme-pg-contrib' into 'develop'
tree
|
commitdiff
2019-10-26
kaniini
Merge branch 'conversation-read-status-for-blocking...
tree
|
commitdiff
2019-10-25
eugenijm
Mark the conversations with the blocked user as read...
tree
|
commitdiff
2019-10-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-24
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-10-24
Maksim Pechnikov
Merge branch 'develop' into issue/1276
tree
|
commitdiff
2019-10-23
feld
Merge branch '1304-user-info-deprecation' into 'develop'
tree
|
commitdiff
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-22
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/push-subject-for-dm' into 'develop'
tree
|
commitdiff
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
tree
|
commitdiff
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
tree
|
commitdiff
2019-10-20
Ivan Tashkinov
[#1304]. Post-merge fixes. Merge branch 'develop' of...
tree
|
commitdiff
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-19
Haelwenn
Merge branch 'feature/mastofe-pwa' into 'develop'
tree
|
commitdiff
2019-10-19
Haelwenn
Merge branch 'mark-all-conversations-as-read' into...
tree
|
commitdiff
2019-10-19
eugenijm
Pleroma API: `POST /api/v1/pleroma/conversations/read...
tree
|
commitdiff
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
tree
|
commitdiff
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
tree
|
commitdiff
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
tree
|
commitdiff
2019-10-18
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
tree
|
commitdiff
2019-10-18
kaniini
Merge branch 'fix-streaming-with-sec-websocket-protocol...
tree
|
commitdiff
2019-10-17
feld
Merge branch 'mark-converstation-as-read-on-new-direct...
tree
|
commitdiff
2019-10-17
eugenijm
Mastodon API: Mark the conversation as read for the...
tree
|
commitdiff
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-10
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-07
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
tree
|
commitdiff
2019-10-07
lain
Merge branch 'misskey-compat' into 'reactions'
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
lain
Merge branch 'develop' into 'reactions'
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
Haelwenn
Merge branch 'fix-prameter-name-of-accounts-update...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'split-masto-api/leftovers' into 'develop'
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'accept-embedded-announce-object' into...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'unread-conversation-count' into 'develop'
tree
|
commitdiff
2019-10-05
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
tree
|
commitdiff
2019-10-05
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'revert-5c04e817' into 'develop'
tree
|
commitdiff
2019-10-05
kaniini
Revert "Merge branch 'user-info-unread-direct-conversat...
tree
|
commitdiff
2019-10-05
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'user-info-unread-direct-conversation...
tree
|
commitdiff
2019-10-03
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
tree
|
commitdiff
2019-08-27
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
tree
|
commitdiff
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
tree
|
commitdiff
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
tree
|
commitdiff
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
tree
|
commitdiff
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
tree
|
commitdiff
2019-08-19
lain
Merge branch 'hotfix/user_unfollow' into 'develop'
tree
|
commitdiff
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
tree
|
commitdiff
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
tree
|
commitdiff
2019-08-14
lain
Conversations: Load relations in one query.
tree
|
commitdiff
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-08-06
lain
Participation: Setting recipients will always add the...
tree
|
commitdiff
2019-08-02
lain
Conversations: Add recipient list to conversation parti...
tree
|
commitdiff
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
tree
|
commitdiff
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
tree
|
commitdiff
2019-06-28
Roman Chvanikov
Resolve conflicts
tree
|
commitdiff
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
tree
|
commitdiff
2019-06-12
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-06-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
tree
|
commitdiff
2019-06-11
kaniini
Merge branch 'change-containment-default' into 'develop'
tree
|
commitdiff
2019-06-11
kaniini
Merge branch 'preload-changes' into 'develop'
tree
|
commitdiff
2019-06-07
lain
Conversations: Fetch users in one query.
tree
|
commitdiff
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
tree
|
commitdiff
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-06-05
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-06-04
Roman Chvanikov
Fix conflict
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
tree
|
commitdiff
2019-06-04
lain
Participations: Filter out participations without activ...
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
tree
|
commitdiff
2019-05-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-05-08
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into 'develop'
tree
|
commitdiff
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
tree
|
commitdiff
2019-05-01
Roman Chvanikov
Fix tests
tree
|
commitdiff
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-04-10
lain
Participations: Add last activity.
tree
|
commitdiff
2019-04-10
lain
Participation: Get for a user.
tree
|
commitdiff
2019-04-10
lain
Conversations: Create or bump on inserting a dm.
tree
|
commitdiff
2019-04-10
lain
Participations: Add marking as read and unread.
tree
|
commitdiff
2019-04-10
lain
Conversation: Add Conversations and Participations.
tree
|
commitdiff