projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
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-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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
AdminAPI: show chat
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
AdminAPI: list messages in a chat
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
AdminAPI: list chats for a user
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
AdminAPI: delete a chat message
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-09
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
|
diff to current
2020-09-06
Mark Felder
Merge branch 'develop' of git.pleroma.social:pleroma...
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-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-26
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
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
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
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-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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
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-30
Maksim Pechnikov
Merge branch 'develop' into issue/1933-update-dependency
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
Haelwenn
Merge branch '1996-dont-break-on-chatmessages' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'bugfix/remote-user-atom' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'by-approval' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-27
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
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-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-14
Alex Gleason
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Merge branch 'develop' into fix/csp-for-captcha
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch '1723-token-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch 'bugfix/status-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
lain
Merge branch '1895-hashtag-timeline-restrict-unauthenti...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn
Merge branch '1918-avatar-background-header-reset-2...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn
Merge branch 'fix/twitter-rich-media-preview' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-07
lain
Merge branch 'remove-twitter-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-07
lain
AccountController: Remove unused `update_?` routes.
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
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-07-02
lain
Merge branch 'feature/update-description' into '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
Remove `/statusnet/config`
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-29
lain
Merge branch '1031-parent-visible' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-26
Haelwenn
Merge branch 'block-handling' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-26
Haelwenn
Merge branch '1258-anti-link-spam-exemption' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-26
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-06-25
feld
Merge branch 'preload-data' into 'develop'
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-25
lain
Merge branch 'chore/remove-reference-to-distsn' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'fix_1586_provide_index_md' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-23
Haelwenn
Merge branch 'fix/missing-default-instance_thumbnail_co...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-22
Haelwenn (lanodan...
Add warning against parsing/reusing MastoFE settings...
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-22
lain
Merge branch 'feature/1854-emoji-pagination' 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-20
lain
Merge branch 'feature/support-bot-field-in-update-crede...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-20
lain
Merge branch 'develop' into '1865-media-only'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-19
feld
Merge branch 'issue/1855' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
Mark Felder
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-17
rinpatch
Merge branch 'features/users-raw_bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-15
Maksim Pechnikov
Merge branch 'develop' into issue/1855
blob
|
commitdiff
|
raw
|
diff to current
2020-06-13
rinpatch
Merge branch '1851-favorites-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Mark Felder
Merge branch 'develop' into preload-data
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Haelwenn
Merge branch 'recipients-experiments' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
lain
Merge branch 'global-status-expiration' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-12
Maksim Pechnikov
added admin api for MediaProxy cache invalidation
blob
|
commitdiff
|
raw
|
diff to current
2020-06-11
Mark Felder
Merge branch 'develop' into fix/csp-mediaproxy-base-url
blob
|
commitdiff
|
raw
|
diff to current
2020-06-10
rinpatch
Merge branch 'remake-remodel-dms' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-09
rinpatch
Merge branch 'release/2.0.6' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-09
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'openapi/admin/relay' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-08
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
next