projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Mark the conversations with the blocked user as read and update the blocking user...
[akkoma]
/
lib
/
pleroma
/
conversation
/
participation.ex
2019-10-25
eugenijm
Mark the conversations with the blocked user as read...
blob
|
commitdiff
|
raw
2019-10-21
kaniini
Merge branch 'feature/push-subject-for-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
blob
|
commitdiff
|
raw
|
diff to current
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
Haelwenn
Merge branch 'feature/mastofe-pwa' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
Haelwenn
Merge branch 'mark-all-conversations-as-read' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
eugenijm
Pleroma API: `POST /api/v1/pleroma/conversations/read...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
kaniini
Merge branch 'fix-streaming-with-sec-websocket-protocol...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-17
feld
Merge branch 'mark-converstation-as-read-on-new-direct...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-17
eugenijm
Mastodon API: Mark the conversation as read for the...
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-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-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Egor Kislitsyn
Replace `Pleroma.FlakeId` with `flake_id` hex package
blob
|
commitdiff
|
raw
|
diff to current
2019-09-03
Maxim Filippov
Return "total" optionally
blob
|
commitdiff
|
raw
|
diff to current
2019-09-02
Maxim Filippov
Return total from pagination + tests
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
Conversations: Load relations in one query.
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
Participation: Setting recipients will always add the...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-05
lain
Pleroma Conversations API: Add a way to set recipients.
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
lain
CommonAPI: Extend api with conversation replies.
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-31
lain
StatusView: Return direct conversation id.
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-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
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-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'change-containment-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'preload-changes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-07
lain
Conversations: Fetch users in one query.
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Participations: Filter out participations without activ...
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-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-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
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 'mascot/pleroma-tan-shy' into 'develop'
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
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
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Roman Chvanikov
Refactor query to return only 1 message instead of 20
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lain
Conversation: Add accounts to output.
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lain
Conversations: Tidying up.
blob
|
commitdiff
|
raw
|
diff to current