projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into 'hide-muted-reactions'
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
chat_controller.ex
2020-11-18
minibikini
Merge branch 'develop' into 'hide-muted-reactions'
blob
|
commitdiff
|
raw
2020-11-17
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2020-11-17
Egor Kislitsyn
Merge branch 'develop' into hide-muted-reactions
blob
|
commitdiff
|
raw
2020-11-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
rinpatch
Import stable commits into develop after releasing...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-16
Egor Kislitsyn
Hide reactions from muted and blocked users
blob
|
commitdiff
|
raw
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-11
Egor Kislitsyn
Merge branch 'develop' into frontend-admin-api
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
Haelwenn
Merge branch '2284-voters-count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'hide-muted-chats' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
Egor Kislitsyn
Add `with_muted` param to ChatController.index/2
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-03
lain
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-03
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
Egor Kislitsyn
Hide chats from muted users
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
lain
Merge branch 'bugfix/poll_replies_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
minibikini
Merge branch 'develop' into 'frontend-admin-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-01
feld
Merge branch 'tesla-get-to-pleroma' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-31
feld
Merge branch 'feature/account-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-31
feld
Merge branch 'idempotency-key-optimistic-posting' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-31
eugenijm
Add idempotency_key to the chat_message entity.
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into chore/elixir-1.11
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
feld
Merge branch 'feature/1822-files-consistency' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
alias alphabetically order
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
OAuthScopesPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-10-09
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'filtering-following' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
Mark Felder
Merge branch 'develop' into fix/deprecation-warning...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
rinpatch
Merge branch 'features/incoming-create-exists' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-24
lain
Merge branch 'smol-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
Mark Felder
Merge branch 'develop' into feature/bulk-confirmation
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'issue/2115' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-23
lain
Merge branch 'develop' into 'issue/2115'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Maksim Pechnikov
Merge branch 'develop' into issue/1975
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
lain
Merge branch 'bugfix/federator-actor-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-20
Roman Chvanikov
Merge branch 'develop' into feature/expire-mutes
blob
|
commitdiff
|
raw
|
diff to current
2020-09-18
Maksim Pechnikov
Merge branch 'develop' into issue/2099
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
rinpatch
Merge branch 'stable' into stable-sync/2.1.2
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
rinpatch
Merge branch 'release/2.1.2' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Haelwenn (lanodan...
Fix MRF reject for ChatMessage
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
rinpatch
Merge branch 'bugfix/mrf-ingestion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
lain
Merge branch 'develop' into 'nondiscoverable-user-metadata'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
lain
Merge branch 'chat-moderation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
Refactor with Chat.for_user_query/1
blob
|
commitdiff
|
raw
|
diff to current
2020-09-10
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-09-10
Maksim Pechnikov
added paginate links to headers for /chats/:id/messages
blob
|
commitdiff
|
raw
|
diff to current
2020-09-08
rinpatch
Merge branch 'stable' into stable-sync/2.1.1
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
|
diff to current
2020-08-31
Haelwenn
Merge branch 'chat-relation-constraints' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-31
lain
Chats: Add cascading delete on both referenced users.
blob
|
commitdiff
|
raw
|
diff to current
2020-08-30
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-27
Haelwenn
Merge branch '2078-list-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-27
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-27
lain
Merge branch '2081-deleted-user-chats' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-27
lain
ChatController: Don't die if the recipient is gone.
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
|
diff to current
2020-07-31
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'feature/add-mrf-related-policies' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch '1973-chats-fix-with-restrict-unauthentica...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-22
Ivan Tashkinov
[#1973] Fixed accounts rendering in GET /api/v1/pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history