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]
/
lib
/
pleroma
/
conversation.ex
2019-10-29
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-10-28
lain
Merge branch 'refactor/following-relationships' into...
blob
|
commitdiff
|
raw
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'improve-user-info-migration' into 'develop'
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'refactor/db-not-null-constraints-for...
blob
|
commitdiff
|
raw
2019-10-27
kaniini
Merge branch 'readme-pg-contrib' into 'develop'
blob
|
commitdiff
|
raw
2019-10-26
kaniini
Merge branch 'conversation-read-status-for-blocking...
blob
|
commitdiff
|
raw
2019-10-25
eugenijm
Mark the conversations with the blocked user as read...
blob
|
commitdiff
|
raw
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Haelwenn
Merge branch 'fix-prameter-name-of-accounts-update...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
kaniini
Merge branch 'split-masto-api/leftovers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
kaniini
Merge branch 'accept-embedded-announce-object' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
kaniini
Merge branch 'unread-conversation-count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
kaniini
Merge branch 'revert-5c04e817' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-05
kaniini
Revert "Merge branch 'user-info-unread-direct-conversat...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
kaniini
Merge branch 'user-info-unread-direct-conversation...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-03
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-27
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'hotfix/user_unfollow' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-06
lain
Conversation: Rename function to better express what...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
lain
Conversations: Add recipient list to conversation parti...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'ueberauth_config_extension' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'feature/polls-2-electric-boogalo' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-21
rinpatch
Accept question objects for conversations
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
kaniini
Merge branch 'feature/890-add-report-uri' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
feld
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
rinpatch
Merge branch 'conversations-import' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
Mark Felder
Merge branch 'develop' into conversations-import
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'feature/federator-behaviours' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
rinpatch
Merge branch 'fix/unfollows-not-working' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-12
rinpatch
Normalize the object only after ensuring the activity...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-09
lain
Conversations: Import order, import as read.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
lain
Credo fixes.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
lain
Conversations: Add mix task to 'import' old DMs.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
lain
Conversations: Add a function to 'import' old DMs.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next