projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
2020-09-03
Mark Felder
Merge branch 'develop' into media-preview-proxy
tree
|
commitdiff
2020-08-31
Haelwenn
Merge branch 'chat-relation-constraints' into 'develop'
tree
|
commitdiff
2020-08-31
lain
Chats: Add cascading delete on both referenced users.
tree
|
commitdiff
2020-08-30
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
tree
|
commitdiff
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
tree
|
commitdiff
2020-08-27
Haelwenn
Merge branch '2078-list-fixes' into 'develop'
tree
|
commitdiff
2020-08-27
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-08-27
lain
Merge branch '2081-deleted-user-chats' into 'develop'
tree
|
commitdiff
2020-08-27
lain
ChatController: Don't die if the recipient is gone.
tree
|
commitdiff
2020-08-25
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
tree
|
commitdiff
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-08-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
tree
|
commitdiff
2020-08-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-08-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-08-03
lain
Merge branch 'config/default_ok_oldage' into 'develop'
tree
|
commitdiff
2020-07-31
lain
Merge branch 'mrf-silence-2' into 'develop'
tree
|
commitdiff
2020-07-31
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2020-07-30
feld
Merge branch 'fix/configdb-otp-instructions' into ...
tree
|
commitdiff
2020-07-30
Haelwenn
Merge branch 'render-preview-cards-in-chats' into ...
tree
|
commitdiff
2020-07-30
Haelwenn
Merge branch '1993-confirm-users-on-registration' into...
tree
|
commitdiff
2020-07-30
lain
ChatMessageReferenceView: Display preview cards.
tree
|
commitdiff
2020-07-30
lain
Merge branch 'hide-reactions' into 'develop'
tree
|
commitdiff
2020-07-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
tree
|
commitdiff
2020-07-28
Alex Gleason
Let favourites and emoji reactions optionally be hidden
tree
|
commitdiff
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
tree
|
commitdiff
2020-07-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
tree
|
commitdiff
2020-07-23
feld
Merge branch 'feature/add-mrf-related-policies' into...
tree
|
commitdiff
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
tree
|
commitdiff
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
tree
|
commitdiff
2020-07-23
lain
Merge branch '1973-chats-fix-with-restrict-unauthentica...
tree
|
commitdiff
2020-07-23
Ivan Tashkinov
[#2791] AccountView: renamed `:force` option to `:skip_...
tree
|
commitdiff
2020-07-23
lain
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
tree
|
commitdiff
2020-07-23
lain
Merge branch 'issue/1878' into 'develop'
tree
|
commitdiff
2020-07-23
lain
Merge branch 'linkify' into 'develop'
tree
|
commitdiff
2020-07-22
Ivan Tashkinov
[#1973] Fixed accounts rendering in GET /api/v1/pleroma...
tree
|
commitdiff
2020-07-22
lain
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
tree
|
commitdiff
2020-07-21
Mark Felder
Skip the correct plug
tree
|
commitdiff
2020-07-21
Mark Felder
Merge branch 'develop' into fix/pleroma-api-emoji-packs
tree
|
commitdiff
2020-07-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2020-07-18
KokaKiwi
Fix /api/pleroma/emoji/packs index endpoint.
tree
|
commitdiff
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
tree
|
commitdiff
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
tree
|
commitdiff
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
tree
|
commitdiff
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-07-09
Mark Felder
Merge branch 'develop' into fix/csp-for-captcha
tree
|
commitdiff
2020-07-09
lain
Merge branch '1723-token-fixes' into 'develop'
tree
|
commitdiff
2020-07-09
lain
Merge branch 'bugfix/status-deletion' into 'develop'
tree
|
commitdiff
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-07-08
lain
Merge branch '1895-hashtag-timeline-restrict-unauthenti...
tree
|
commitdiff
2020-07-08
Haelwenn
Merge branch '1918-avatar-background-header-reset-2...
tree
|
commitdiff
2020-07-07
lain
AccountController: Remove unused `update_?` routes.
tree
|
commitdiff
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
tree
|
commitdiff
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
tree
|
commitdiff
2020-06-25
feld
Merge branch 'preload-data' into 'develop'
tree
|
commitdiff
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
tree
|
commitdiff
2020-06-23
Roman Chvanikov
Merge develop
tree
|
commitdiff
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
tree
|
commitdiff
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
tree
|
commitdiff
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
tree
|
commitdiff
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
tree
|
commitdiff
2020-06-22
lain
Merge branch 'fix/1825-admin-api-error-codes' into...
tree
|
commitdiff
2020-06-22
rinpatch
Merge branch '1865-media-only' into 'develop'
tree
|
commitdiff
2020-06-22
rinpatch
Merge branch '1883-mrf-chat' into 'develop'
tree
|
commitdiff
2020-06-22
lain
Merge branch 'feature/1854-emoji-pagination' into ...
tree
|
commitdiff
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
tree
|
commitdiff
2020-06-19
Alexander Strizhakov
adding overall count for packs and files
tree
|
commitdiff
2020-06-18
Alexander Strizhakov
emoji pagination for pack show action
tree
|
commitdiff
2020-06-18
Alexander Strizhakov
emoji packs pagination
tree
|
commitdiff
2020-06-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
tree
|
commitdiff
2020-06-13
rinpatch
Merge branch '1851-favorites-pagination' into 'develop'
tree
|
commitdiff
2020-06-12
Mark Felder
Merge branch 'develop' into preload-data
tree
|
commitdiff
2020-06-12
Haelwenn
Merge branch 'recipients-experiments' into 'develop'
tree
|
commitdiff
2020-06-12
lain
Merge branch 'global-status-expiration' into 'develop'
tree
|
commitdiff
2020-06-11
Mark Felder
Merge branch 'develop' into fix/csp-mediaproxy-base-url
tree
|
commitdiff
2020-06-10
rinpatch
Merge branch 'remake-remodel-dms' into 'develop'
tree
|
commitdiff
2020-06-09
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-08
Roman Chvanikov
merge develop
tree
|
commitdiff
2020-06-08
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
tree
|
commitdiff
2020-06-08
lain
Merge branch 'openapi/admin/relay' into 'develop'
tree
|
commitdiff
2020-06-08
lain
Merge branch 'feature/delete-follow-requests-on-user...
tree
|
commitdiff
2020-06-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-08
lain
Merge branch 'activity-pub-use-atoms-as-keys' into...
tree
|
commitdiff
2020-06-08
lain
ChatController: Remove nonsensical pagination.
tree
|
commitdiff
2020-06-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-07
lain
ChatController: Make last_read_id mandatory.
tree
|
commitdiff
2020-06-07
lain
ChatController: Add `last_read_id` option to mark_as_read.
tree
|
commitdiff
2020-06-07
lain
SideEffects: Move streaming of chats to after the trans...
tree
|
commitdiff
2020-06-06
lain
ChatController: Use new oauth scope *:chats.
tree
|
commitdiff
2020-06-06
lain
ChatMessageReference -> Chat.MessageReference
tree
|
commitdiff
2020-06-05
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2020-06-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-05
lain
SideEffects / ChatView: Add an unread cache.
tree
|
commitdiff
2020-06-04
Egor Kislitsyn
Use atoms as keys in `ActivityPub.fetch_*` functions...
tree
|
commitdiff
next