[#2497] Fixed merge issue.
[akkoma] / lib / pleroma / web / streamer /
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-02 rinpatchMerge branch 'fetcher-fixes' into 'develop'
2020-07-02 rinpatchMerge branch '1907-fix-announce-streaming' into 'develop'
2020-07-02 lainStreamer: Align announce streaming with polling.
2020-06-23 Roman ChvanikovMerge develop
2020-06-22 lainMerge branch 'feature/1739-account-endpoints' into...
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-17 rinpatchMerge branch 'features/users-raw_bio' into 'develop'
2020-06-13 rinpatchMerge branch '1851-favorites-pagination' into 'develop'
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-12 HaelwennMerge branch 'recipients-experiments' into 'develop'
2020-06-12 lainMerge branch 'global-status-expiration' into 'develop'
2020-06-11 Mark FelderMerge branch 'develop' into fix/csp-mediaproxy-base-url
2020-06-10 rinpatchMerge branch 'remake-remodel-dms' into 'develop'
2020-06-09 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-08 Roman Chvanikovmerge develop
2020-06-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-06 lainChatMessageReference -> Chat.MessageReference
2020-06-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-05 HaelwennMerge branch 'features/apc2s-pagination' into 'develop'
2020-06-05 lainSideEffects / ChatView: Add an unread cache.
2020-06-04 Egor KislitsynMerge branch 'develop' into openapi/admin/config
2020-06-03 lainStreamer, SideEffects: Stream out ChatMessageReferences
2020-06-02 Egor KislitsynMerge branch 'develop' into openapi/admin/relay
2020-06-02 lainMerge branch 'openapi/admin/oauth-apps' into 'develop'
2020-06-02 lainMerge branch 'tagline' into 'develop'
2020-06-02 lainMerge branch 'openapi/admin/invites' into 'develop'
2020-06-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-02 lainMerge branch 'feature/status-by-id-account-view' into...
2020-06-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-06-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-30 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-30 lainMerge branch 'conversation-pagination' into 'develop'
2020-05-30 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-29 rinpatchMerge branch 'bugfix/csp-unproxied' into 'develop'
2020-05-29 rinpatchMerge branch 'media-docs' into 'develop'
2020-05-29 rinpatchMerge branch 'connect-src' into 'develop'
2020-05-29 lainMerge branch 'fix-streaming' into 'develop'
2020-05-29 kPheroxFix argument error in streamer
2020-05-29 lainStreamer: Add a chat message stream.
2020-05-21 lainMerge branch 'issue/749' into 'develop'
2020-05-20 lainMerge branch 'feature/1734-user-deletion' into 'develop'
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-14 rinpatchMerge branch 'feature/database-configuration-whitelist...
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-13 Roman ChvanikovMerge develop
2020-05-13 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-13 lainMerge branch 'openapi/timelines' into 'develop'
2020-05-12 rinpatchMerge branch 'streamer-get-topic' into 'develop'
2020-05-12 hrefExpand and authorize streams in Streamer directly
2020-05-10 lainMerge branch 'shortening-modules-name' into 'develop'
2020-05-08 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-08 lainMerge branch 'fix/privacy-notification' into 'develop'
2020-05-08 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-05-07 HaelwennMerge branch 'feature/restrict-c2s' into 'develop'
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-07 lainMerge branch 'openapi/polls' into 'develop'
2020-05-07 lainMerge branch 'streamer-worker-registry' into 'develop'
2020-05-07 hrefStreamer rework
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-24 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-23 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-23 rinpatchMerge branch 'bugfix/null-scheduled-at' into 'develop'
2020-04-22 lainMerge branch 'bugfix/1629-fav-race-condition' into...
2020-04-22 HaelwennMerge branch 'bugfix/1670-user-count' into 'develop'
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 HaelwennMerge branch 'fix/follow-and-blocks-import' into 'develop'
2020-04-22 HaelwennMerge branch 'bugfix/following-fix-status-code' into...
2020-04-22 HaelwennMerge branch 'bugfix/1543-streaming-boosts' into 'develop'
2020-04-22 lainStreamer: Stream boosts to the boosting user.
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-17 HaelwennMerge branch 'feature/1584-client-captcha-options'...
2020-04-10 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-10 Egor KislitsynMerge branch 'develop' into fix/support-conversations...
2020-04-10 HaelwennMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
2020-04-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-06 lainMerge branch 'featureflag/emoji_reactions' into 'develop'
2020-04-06 lainMerge branch 'remake-remodel-2' into 'develop'
2020-03-30 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-25 rinpatchMerge branch 'benchmark_timeline' into 'develop'
2020-03-25 rinpatchMerge branch '1364-notifications-sending-control' into...
2020-03-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-25 Ivan TashkinovFixed incorrect usage of "relations" as a short form...
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
next