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
/
streamer.ex
2020-11-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-17
rinpatch
Import stable commits into develop after releasing...
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
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'features/federation-status' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'restrict-domain' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
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
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
changes after rebase
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
more files renamings
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks-for-1.1...
blob
|
commitdiff
|
raw
2019-10-04
Egor Kislitsyn
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
blob
|
commitdiff
|
raw
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
2019-09-18
feld
Merge branch 'restore-tests' into 'develop'
blob
|
commitdiff
|
raw
2019-09-17
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
2019-09-17
rinpatch
Merge branch 'support/tests' into 'develop'
blob
|
commitdiff
|
raw
2019-09-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
2019-09-16
rinpatch
Merge branch 'fix/develop' into 'develop'
blob
|
commitdiff
|
raw
2019-09-16
Egor Kislitsyn
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
blob
|
commitdiff
|
raw
2019-09-16
kaniini
Merge branch 'revert-4fabf83a' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
kaniini
Revert "Merge branch 'streamer-refactoring' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
kaniini
Merge branch 'streamer-refactoring' into 'develop'
blob
|
commitdiff
|
raw
2019-09-16
Steven Fuchs
Streamer refactoring
blob
|
commitdiff
|
raw
2019-09-14
Roman Chvanikov
Merge branch 'develop' into refactor/subscription
blob
|
commitdiff
|
raw
|
diff to current
2019-09-13
Roman Chvanikov
Separate Subscription Notifications from regular Notifi...
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 'fix/bugfix-blocked-user-follow-reqs'...
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-15
rinpatch
Hide muted theads from home/public timelines unless...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Maxim Filippov
Merge branch 'develop' into 'fix/admin-api-user-deletion'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
rinpatch
Merge branch 'misc-otp-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
stwf
streamline Streamer pings
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
stwf
use default child_specs
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-12
lain
ConversationView: Align parameter names with other...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix-remote-follow-from-ostatus-subscribe...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
lain
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
sadposter
check both item and parent domain blocks
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Sadposter
move domain block check to with block
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Sadposter
honour domain blocks on streaming notifications
blob
|
commitdiff
|
raw
|
diff to current
2019-07-23
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-22
Haelwenn
Merge branch 'hardening/stop-misusing-sharedinbox'...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-22
kaniini
Merge branch 'bugfix/muted-user-notif-streaming' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-22
Sadposter
Bugfix: muted/blocked user notification streaming
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-16
Haelwenn
Merge branch 'fix/sanitize-report-content' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
rinpatch
Merge branch 'issues/570' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
Maksim
[#570] add user:notification stream
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
Merge branch 'issue/941' into 'develop'
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
Maksim Pechnikov
Merge branch 'develop' into issue/941
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
Maksim Pechnikov
add option skip_thread_containment
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-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